From 7d6425827901a98ff9f47b25718542bd81dbbfac Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 08 三月 2021 14:43:41 +0800
Subject: [PATCH] 8807 【BT2】【后端】Part1 14、投资返利送充值券(增加登录投资9、等级投资10、boss投资11;优化永久投资、周卡投资逻辑 同步主干);

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py
index 3f81376..78c605d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1314.py
@@ -21,6 +21,7 @@
 import SkillShell
 import GameObj
 import IPY_GameWorld
+import AttackCommon
 
 def ProcessBuff(tagObj, curBuff, curEffect, processBuffTick, tick):
     Attack(tagObj, curBuff, tick)
@@ -76,7 +77,7 @@
     BaseAttack.SwordStormAttack(tagObj, srcPosX, srcPosY, curSkill, skillPer, 
                                 skillEnhance, skillMatrix, tick)
     PassiveBuffEffMng.OnPassiveBuffTrigger(tagObj, None, curSkill, ChConfig.TriggerType_Buff_AttackSubLayer, tick)
-    if GameObj.GetHP(tagObj) > 0:
+    if GameObj.GetHP(tagObj) > 0 and not AttackCommon.GetIsDead(tagObj):
         if tagObj.GetDictByKey(ChConfig.Def_PlayerKey_1314HurtCount):
             # 需要时间配合,不然会导致伤害还没计算完毕 buff提前消失了
             curBuff.SetValue(curBuff.GetValue() + 1)
@@ -96,7 +97,7 @@
 ## 添加BUFF后的逻辑
 #  @param None
 #  @return None
-def DoAddBuffOver(curObj, addBuff, curEffect, tick):
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
     Attack(curObj, addBuff, tick)   #立即执行一次攻击
     if GameObj.GetHP(curObj) != 0:
         addBuff.SetProcessInterval(tick)

--
Gitblit v1.8.0