From 891f4b056a19ff205eb9997873c7bb24588c7f9b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 23 十二月 2025 10:57:45 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(修复被动触发的怒气追击时怒气溢出值无效bug;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
index ed4d6c5..002d94a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -138,7 +138,7 @@
         angerOverflow = max(curXP - maxXP, 0)
         curBatObj.SetAngerOverflow(angerOverflow)
         GameWorld.DebugLogEx("怒气溢出值: curXP=%s/%s,angerOverflow=%s", curXP, maxXP, angerOverflow)
-    if batType == ChConfig.TurnBattleType_Enhance:
+    elif batType == ChConfig.TurnBattleType_Enhance:
         pass
     else:
         curBatObj.SetAngerOverflow(0)        
@@ -2674,12 +2674,12 @@
         return
     
     GameWorld.DebugLogEx("    反弹伤害=%s,%s/%s, damBackPer=%s", bounceHP, atkObj.GetHP(), atkObj.GetMaxHP(), damBackPer)
-    bounceHP, _, immuneHurt = CalcHurtWithBuff(turnFight, atkObj, defObj, bounceHP)
+    bounceHP, _, immuneHurt = CalcHurtWithBuff(turnFight, defObj, atkObj, bounceHP)
     if bounceHP <= 0:
         GameWorld.DebugLogEx("        bounceHP=%s", bounceHP)
         return
     hurtObj.SetBounceHP(bounceHP)
-    DoLostHP(turnFight, atkObj, defObj, bounceHP, curSkill, "Bounce", hpCanNegative=True, immuneHurt=immuneHurt) # 反弹后生命允许负值
+    DoLostHP(turnFight, defObj, atkObj, bounceHP, curSkill, "Bounce", hpCanNegative=True, immuneHurt=immuneHurt) # 反弹后生命允许负值
     return
 
 def CalcSuckBlood(turnFight, atkObj, defObj, hurtObj, curSkill):

--
Gitblit v1.8.0