From 2838ace78267ff0f7681f424fa939449061ae781 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 23 九月 2025 10:55:08 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(庞统技能;增加触发方式被连击18,被追击19;增加buff状态限制管理支持,写死硬控中无法格挡、闪避、行动;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
index 2fc113a..c96bb09 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
@@ -317,7 +317,7 @@
     def GetEffectByID(self, effID, triggerWay=0): return self._effDict.get((effID, triggerWay), None)
     def GetConnSkill(self): return self._ipyData.GetConnSkill()
     def GetCoolDownTime(self): return self._ipyData.GetCoolDownTime()
-    def GetIgnoreStates(self): return self._ipyData.GetIgnoreStates() # 无视限制列表
+    def GetBuffStateLimit(self): return self._ipyData.GetBuffStateLimit()
     def GetCurBuffState(self): return self._ipyData.GetCurBuffState()
     def GetLastTime(self): return self._ipyData.GetLastTime() # 持续时间
     def GetLayerCnt(self): return self._ipyData.GetLayerCnt()
@@ -549,7 +549,7 @@
     def GetEffectByID(self, effID, triggerWay=0): return self._skillData.GetEffectByID(effID, triggerWay)
     def GetConnSkill(self): return self._skillData.GetConnSkill()
     def GetCoolDownTime(self): return self._skillData.GetCoolDownTime()
-    def GetIgnoreStates(self): return self._skillData.GetIgnoreStates() # 无视限制列表
+    def GetBuffStateLimit(self): return self._skillData.GetBuffStateLimit()
     def GetCurBuffState(self): return self._skillData.GetCurBuffState()
     def GetLastTime(self): return self._skillData.GetLastTime() # 持续时间
     def GetLayerCnt(self): return self._skillData.GetLayerCnt()
@@ -827,18 +827,25 @@
                 return True
         return False
     
-    def IsInControlled(self):
-        ## 是否被控制中
-        for state in ChConfig.InControlledStateList:
+    def IsInControlled(self): return self.IsInBuffStateGroup(1) or self.IsInBuffStateGroup(2) # 是否被控制中
+    def IsInControlledHard(self): return self.IsInBuffStateGroup(1) # 是否被硬控中
+    def IsInBuffStateGroup(self, buffStateGroup):
+        '''是否在某个状态组中
+                        已定义的组: 1 - 硬控组;2 - 软控组;3 - 限制普攻组;4 - 限制怒技组;5 - 限制被动动态组
+        '''
+        buffStateGroupDict = IpyGameDataPY.GetFuncEvalCfg("BuffStateGroup", 1, {})
+        if buffStateGroup not in buffStateGroupDict:
+            return
+        for state in buffStateGroupDict[buffStateGroup]:
             if self._buffMgr.IsInBuffState(state):
-                return True
-        return False
+                return state
+        return
     
     def CanAction(self):
         ## 是否可以行动
         if not self.IsAlive():
             return False
-        if self.IsInControlled():
+        if self.IsInControlledHard():
             return False
         return True
     

--
Gitblit v1.8.0