From 6ccc82cff0bc5ecd2734253d4c5ef1ae2bb748da Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 17 九月 2020 12:24:13 +0800
Subject: [PATCH] 8483 【后端】【主干】【changwei】【bt】协助方和被协助方任何模式不会互相造成伤害(优化协助同一玩家的情况)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py
index 48e2308..d5b4a43 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_801.py
@@ -23,20 +23,23 @@
 ## 添加BUFF后的逻辑
 #  @param None
 #  @return None
-def DoAddBuffOver(curObj, addBuff, curEffect, tick):
+def DoAddBuffOver(curObj, addBuff, curEffect, tick, buffOwner):
     # SetValue1用于当前吸收值
-    addBuff.SetValue(GameObj.GetMaxHP(curObj)*curEffect.GetEffectValue(0)/ChConfig.Def_MaxRateValue) # 吸收上限
+    addBuff.SetValue(GameObj.GetMaxHP(curObj)*curEffect.GetEffectValue(1)/ChConfig.Def_MaxRateValue) # 吸收上限
     return
 
 
 
 def OnBuffDisappear(curObj, curSkill, curBuff, curEffect, tick):
+    skillID = curEffect.GetEffectValue(2)
+    if not skillID:
+        return
     boomValue = curBuff.GetValue1()
     # 剩余护盾值用于爆炸
     if boomValue == 0:
         return
     
-    skillData = GameWorld.GetGameData().GetSkillBySkillID(curEffect.GetEffectValue(2))
+    skillData = GameWorld.GetGameData().GetSkillBySkillID(skillID)
     if not skillData:
         return
     # 存储起来用于伤害
@@ -48,6 +51,6 @@
         return
     curObj.SetDict(ChConfig.Def_PlayerKey_MoreHurtValue, boomValue)
     
-    SkillShell.Trigger_UseSkill(curObj, None, curSkill, tick, curObj.GetPosX(), curObj.GetPosY())
+    SkillShell.Trigger_UseSkill(curObj, None, skillData, tick, curObj.GetPosX(), curObj.GetPosY())
     curObj.SetDict(ChConfig.Def_PlayerKey_MoreHurtValue, 0)
     return

--
Gitblit v1.8.0