From a569a7bb683bb01edb14be508e123ba556305f9f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 26 十二月 2025 14:00:40 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(曹操所有技能;增加触发方式50-敌方受控时(硬控);)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 517f921..bb79c0f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -248,7 +248,16 @@
     #受控时
     if curBuffState and IsControlledHardState(curBuffState):
         TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_BeControlledHard, tagObj=buffOwner, connSkill=buffSkill, connBuff=buff)
-        
+        batObjMgr = BattleObj.GetBatObjMgr()
+        ownerBatLineup = buffOwner.GetBatLineup()
+        for lineupObjID in ownerBatLineup.posObjIDDict.values():
+            lineupObj = batObjMgr.getBatObj(lineupObjID)
+            if not lineupObj.IsAlive():
+                continue
+            # 敌方被控时
+            if lineupObj.GetFaction() != batObj.GetFaction():
+                TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_EnemyBeControlledHard, batObj, connSkill=buffSkill)
+                
     return buff
 
 def IsControlledHardState(state):
@@ -631,6 +640,9 @@
             effID = effect.GetEffectID()
             if effID not in ChConfig.AttrIDList:
                 continue
+            if effect.GetTriggerWay():
+                # 有需要触发才生效的属性在buff中不生效,由触发规则决定
+                continue
             if not (not effect.GetTriggerSrc() or effect.GetTriggerBuffEnable()):
                 # buff时,不配默认有效,或仅buff有效
                 continue

--
Gitblit v1.8.0