From e4125f3649b63d5602f06b4d0268463f08bff5fe Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 22 十二月 2025 19:50:48 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(修复反弹伤害攻防双方关系错误bug;)

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
index 5430e6d..13a686b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -242,7 +242,20 @@
         SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)
         
     RefreshBuffEffect(turnFight, batObj, buff, buffSkill, buffOwner, refreshType=1)
+    
+    #受控时
+    if curBuffState and IsControlledHardState(curBuffState):
+        TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_BeControlledHard, tagObj=buffOwner, connSkill=buffSkill, connBuff=buff)
+        
     return buff
+
+def IsControlledHardState(state):
+    stateGroup = "1"
+    buffStateGroupDict = IpyGameDataPY.GetFuncEvalCfg("BuffStateGroup", 1, {})
+    if stateGroup not in buffStateGroupDict:
+        return
+    return state in buffStateGroupDict[stateGroup]
+    
 
 def RefreshBuffEffect(turnFight, batObj, curBuff, buffSkill=None, buffOwner=None, refreshType=0):
     ## 刷新buff效果
@@ -439,6 +452,15 @@
     if haveBuffPassiveEff:
         batObj.GetPassiveEffManager().DelBuffPassiveEffect(buffID)
         
+    # 判断是否有额外属性的
+    if not isRefreshAttr:
+        effExDict = curBuff.GetEffectExDict()
+        for effCalcInfo in effExDict.keys():
+            effID = effCalcInfo[0]
+            if effID in ChConfig.AttrIDList:
+                isRefreshAttr = True
+                break
+            
     if isRefreshAttr and not noRefreshAttr:
         RefreshBuffAttr(batObj)
         
@@ -499,7 +521,7 @@
     isRefreshAttr = False
     objID = batObj.GetID()
     buffMgr = batObj.GetBuffManager()
-    for index in range(buffMgr.GetBuffCount()):
+    for index in range(buffMgr.GetBuffCount())[::-1]:
         buff = buffMgr.GetBuffByIndex(index)
         buffID = buff.GetBuffID()
         skillID = buff.GetSkillID()
@@ -545,10 +567,10 @@
     
     objID = batObj.GetID()
     
-    batAttrDict = batObj.ResetBattleEffect()
-    
     befHP = batObj.GetHP()
     befMaxHP = batObj.GetMaxHP()
+    
+    batAttrDict = batObj.ResetBattleEffect()
     GameWorld.DebugLogEx("RefreshBuffAttr ID:%s,atk=%s,def=%s,hp=%s/%s,batAttrDict=%s", 
                          objID, batObj.GetAtk(), batObj.GetDef(), befHP, befMaxHP, batAttrDict)
     

--
Gitblit v1.8.0