From b100e60651bd69472519d964f2e225148cfe7774 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 20 一月 2026 18:27:05 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(命格青龙、白虎调整为光环技能;优化光环技能支持层级;增加出发方式60-冰冻目标时;优化触发方式受控时、敌方受控时触发时机,解决受控触发被动导致的技能标签嵌套顺序问题;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TurnFight.py |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TurnFight.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TurnFight.py
index ca0a153..80940c1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TurnFight.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TurnFight.py
@@ -106,9 +106,10 @@
             continue
         batFaction = turnFight.getBatFaction(faction)
         batLineup = batFaction.getBatlineup(1)
-        posNumList = [pNum] if pNum else batLineup.posObjIDDict.keys()
+        posObjIDDict = batLineup.getPosObjIDDict()
+        posNumList = [pNum] if pNum else posObjIDDict.keys()
         for posNum in posNumList:
-            objID = batLineup.posObjIDDict.get(posNum)
+            objID = posObjIDDict.get(posNum)
             batObj = batObjMgr.getBatObj(objID)
             if not batObj:
                 GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (faction, posNum))
@@ -144,8 +145,9 @@
     batObjMgr = BattleObj.GetBatObjMgr()
     batFaction = turnFight.getBatFaction(faction)
     batLineup = batFaction.getBatlineup(1)
+    posObjIDDict = batLineup.getPosObjIDDict()
     for posNum in posNumList:
-        objID = batLineup.posObjIDDict.get(posNum)
+        objID = posObjIDDict.get(posNum)
         if not objID:
             continue
         batObj = batObjMgr.getBatObj(objID)
@@ -182,7 +184,7 @@
     batObjMgr = BattleObj.GetBatObjMgr()
     batFaction = turnFight.getBatFaction(faction)
     batLineup = batFaction.getBatlineup(1)
-    objID = batLineup.posObjIDDict.get(posNum)
+    objID = batLineup.getPosObjIDDict().get(posNum)
     batObj = batObjMgr.getBatObj(objID)
     if not batObj:
         GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (faction, posNum))
@@ -193,7 +195,7 @@
     
     ownerFaction = turnFight.getBatFaction(ownerFaction)
     ownerLineup = ownerFaction.getBatlineup(1)
-    ownerID = ownerLineup.posObjIDDict.get(ownerPosNum)
+    ownerID = ownerLineup.getPosObjIDDict().get(ownerPosNum)
     buffOwner = batObjMgr.getBatObj(ownerID)
     if not buffOwner:
         GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (ownerFaction, ownerPosNum))
@@ -237,9 +239,19 @@
             skillMgr = mgObj.GetSkillManager()
             skillIDList = skillMgr.GetSkillIDList()
             GameWorld.DebugAnswer(curPlayer, "技能: %s,%s" % (len(skillIDList), skillIDList))
-            
+            buffMgr = mgObj.GetBuffManager()
+            GameWorld.DebugAnswer(curPlayer, "Buff: %s" % buffMgr.GetBuffCount())
+            for index in range(buffMgr.GetBuffCount()):
+                buff = buffMgr.GetBuffByIndex(index)
+                buffName = GameWorld.CodeToGbk(buff.GetSkillData().GetSkillName())
+                GameWorld.DebugAnswer(curPlayer, "ID:%s,%s(%s),回合:%s,层:%s,V:%s,来源:%s,光环:%s" 
+                                      % (buff.GetBuffID(), buffName, buff.GetSkillID(), buff.GetRemainTime(), buff.GetLayer(), 
+                                         [buff.GetValue1(), buff.GetValue2(), buff.GetValue3()], buff.GetOwnerID(), buff.GetHaloObjIDList()
+                                         ))
+                
+        posObjIDDict = batLineup.getPosObjIDDict()
         for posNum in posNumList:
-            objID = batLineup.posObjIDDict.get(posNum)
+            objID = posObjIDDict.get(posNum)
             if not objID:
                 continue
             batObj = batObjMgr.getBatObj(objID)

--
Gitblit v1.8.0