From f7a8b9973ec7ca6625b922520a3eef092b7a2d2e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 22 十二月 2025 09:43:24 +0800
Subject: [PATCH] 1111 后台转让会长支持;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 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 c41b9f9..6845f8b 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效果
@@ -268,8 +281,16 @@
             isRefreshAttr = True
             
     if refreshType and buffSkill and buffOwner:
-        TurnPassive.OnTriggerPassiveEffect(turnFight, buffOwner, ChConfig.TriggerWay_BuffAddByOwner, connSkill=buffSkill, connBuff=curBuff)
-        
+        TurnPassive.OnTriggerPassiveEffect(turnFight, buffOwner, ChConfig.TriggerWay_BuffAddByOwner, tagObj=batObj, connSkill=buffSkill, connBuff=curBuff)
+        # 判断是否有额外属性的
+        if not isRefreshAttr:
+            effExDict = curBuff.GetEffectExDict()
+            for effCalcInfo in effExDict.keys():
+                effID = effCalcInfo[0]
+                if effID in ChConfig.AttrIDList:
+                    isRefreshAttr = True
+                    break
+                
     if isRefreshAttr:
         RefreshBuffAttr(batObj)
         
@@ -491,7 +512,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()
@@ -537,10 +558,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)
     
@@ -558,6 +579,9 @@
             effID = effect.GetEffectID()
             if effID not in ChConfig.AttrIDList:
                 continue
+            if effect.GetTriggerWay():
+                # 需要触发才有效的不算
+                continue
             if effect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill]:
                 # 技能属性仅技能时有效
                 continue

--
Gitblit v1.8.0