From a99b65c9ca7569dcaa24fef933e913e400fa9fef Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 25 十二月 2025 20:18:29 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(行商地板价后砍价随机范围开配置;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py |   42 +++++++++++++++++++++++++++---------------
 1 files changed, 27 insertions(+), 15 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 6845f8b..517f921 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -85,12 +85,14 @@
     ownerID = buffOwner.GetID()
     
     skillType = buffSkill.GetSkillType()
-    #无敌免疫持续减益buff、控制类buff
-    if skillType in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_Action] \
-        and batObj.CheckInState(ChConfig.BatObjState_Wudi):
-        GameWorld.DebugLogEx("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s", curID, skillID, ownerID, relatedSkillID)
-        return
-    
+    #免疫减益buff、控制类buff
+    if skillType in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_DepBuff, ChConfig.Def_SkillType_Action]:
+        if batObj.CheckInState(ChConfig.BatObjState_Wudi):
+            GameWorld.DebugLogEx("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s", curID, skillID, ownerID, relatedSkillID)
+            return
+        if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneControlDepBuff, buffSkill):
+            return
+        
     #被动触发免疫控制buff
     if skillType == ChConfig.Def_SkillType_Action:
         if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneControlBuff, buffSkill):
@@ -282,15 +284,16 @@
             
     if refreshType and buffSkill and buffOwner:
         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 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)
         
@@ -452,6 +455,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)
         

--
Gitblit v1.8.0