From f6fb3e2809aefd007e9113194257c0c511c18ac4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 03 十二月 2020 15:52:17 +0800
Subject: [PATCH] 4869 【主干】【长尾】【BT】运营活动支持在没配置开服/合服定制配置时,日期/周的配置不受开服/合服定制天影响,可开启;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_900.py |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_900.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_900.py
index 6ab1447..e908781 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_900.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_900.py
@@ -13,8 +13,9 @@
 #
 #---------------------------------------------------------------------
 #导入
-import PlayerYinji
+import PlayerControl
 import ChConfig
+import GameWorld
 #---------------------------------------------------------------------
 
 ## buff线性增加属性
@@ -25,7 +26,11 @@
 def OnCalcBuffEx(defender, curEffect, calcDict, curBuff):
     attrType = curEffect.GetEffectValue(0)
 
-    calcDict[attrType] = calcDict.get(attrType, 0) + curEffect.GetEffectValue(1)*min(curBuff.GetValue(), curEffect.GetEffectValue(2))
+    cnt = curBuff.GetValue()
+    if curEffect.GetEffectValue(2):
+        cnt = min(curBuff.GetValue(), curEffect.GetEffectValue(2))
+    
+    calcDict[attrType] = calcDict.get(attrType, 0) + curEffect.GetEffectValue(1)*cnt
     return
 
 
@@ -43,8 +48,7 @@
 # @param curEffect 当前技能效果1
 # @return 总值
 def CalcBuffValue(attacker, defender, curSkill, changeBuffValueDict):
-    
-    return [PlayerYinji.GetYinjiCnt(defender)]
+    return [PlayerControl.GetYinjiCnt(attacker)]
 
 
 

--
Gitblit v1.8.0