From c280ced8be799a899efc78b21cc807d435ab6609 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 19:34:03 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(退出公会时间根据当前是否互通取对应的本服或跨服时间;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TurnFight.py |   78 ++++++++++++++++++++++++++++-----------
 1 files changed, 56 insertions(+), 22 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 f89ad1e..c062c76 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
@@ -41,6 +41,8 @@
         GameWorld.DebugAnswer(curPlayer, "阵营: 1-左边;2-右边")
         GameWorld.DebugAnswer(curPlayer, "位置: 1~6号位")
         GameWorld.DebugAnswer(curPlayer, "属性ID: 6-攻,7-防,8-HPMax,9-HP,12-怒")
+        GameWorld.DebugAnswer(curPlayer, "测试战斗: TurnFight f 是否满技能 [武将ID ...]")
+        GameWorld.DebugAnswer(curPlayer, "测试战斗: TurnFight fp [playerID]")
         return
     
     value = msgList[0]
@@ -52,6 +54,11 @@
         __doAddBuff(curPlayer, msgList)
     elif value == "p":
         __printInfo(curPlayer, msgList)
+    elif value == "f":
+        __doFightTest(curPlayer, msgList)
+    elif value == "fp":
+        costTime = TurnAttack.GMTestPVP(curPlayer, msgList[1] if len(msgList) > 1 else 0)
+        GameWorld.DebugAnswer(curPlayer, "GMTestPVP: %s" % costTime)
     elif value > 0 and value != ChConfig.Def_FBMapID_Main:
         __reqTurnFight(curPlayer, msgList)
     return
@@ -99,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))
@@ -137,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)
@@ -175,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))
@@ -186,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))
@@ -223,28 +232,53 @@
         GameWorld.DebugAnswer(curPlayer, "---------- 【阵营%s】 ----------" % faction)
         batFaction = turnFight.getBatFaction(faction)
         batLineup = batFaction.getBatlineup(1)
+        mgObj = batLineup.getMinggeObj()
+        if mgObj:
+            objName = "命格 ID:%s" % mgObj.GetID()
+            __printObj(curPlayer, mgObj, objName)
+            
+        posObjIDDict = batLineup.getPosObjIDDict()
         for posNum in posNumList:
-            objID = batLineup.posObjIDDict.get(posNum)
+            objID = posObjIDDict.get(posNum)
             if not objID:
                 continue
             batObj = batObjMgr.getBatObj(objID)
             objName = TurnAttack.GetObjName(batObj)
-            GameWorld.DebugAnswer(curPlayer, "--- %s%s" % (objName, "" if batObj.IsAlive() else " [被击杀]"))
-            GameWorld.DebugAnswer(curPlayer, "HP:%s/%s, Atk:%s, Def:%s" % (batObj.GetHP(), batObj.GetMaxHP(), batObj.GetAtk(), batObj.GetDef()))
-            attrDict = batObj.GetBatAttrDict()
-            GameWorld.DebugAnswer(curPlayer, "属性:%s" % attrDict)
-            skillMgr = batObj.GetSkillManager()
-            skillIDList = skillMgr.GetSkillIDList()
-            GameWorld.DebugAnswer(curPlayer, "技能: %s,%s" % (len(skillIDList), skillIDList))
-            buffMgr = batObj.GetBuffManager()
-            GameWorld.DebugAnswer(curPlayer, "Buff: %s" % buffMgr.GetBuffCount())
-            for index in range(buffMgr.GetBuffCount()):
-                buff = buffMgr.GetBuffByIndex(index)
-                GameWorld.DebugAnswer(curPlayer, "ID:%s,SkillID:%s,回合:%s,层:%s,V:%s" 
-                                      % (buff.GetBuffID(), buff.GetSkillID(), buff.GetRemainTime(), buff.GetLayer(), 
-                                         [buff.GetValue1(), buff.GetValue2(), buff.GetValue3()]
-                                         ))
-                
+            __printObj(curPlayer, batObj, objName)
+            
     return
 
+def __printObj(curPlayer, batObj, objName):
+    GameWorld.DebugAnswer(curPlayer, "--- %s%s" % (objName, "" if batObj.IsAlive() else " [被击杀]"))
+    GameWorld.DebugAnswer(curPlayer, "HP:%s/%s" % (batObj.GetHP(), batObj.GetMaxHP()))
+    GameWorld.DebugAnswer(curPlayer, "攻:%s,防:%s,怒:%s" % (batObj.GetAtk(), batObj.GetDef(), batObj.GetXP()))
+    attrStr = ""
+    attrDict = batObj.GetBatAttrDict()
+    attrIDList = attrDict.keys()
+    attrIDList.sort()
+    for attrID in attrIDList:
+        attrValue = attrDict[attrID]
+        if attrValue:
+            attrStr += "%s=%s;" % (attrID, attrValue)
+    GameWorld.DebugAnswer(curPlayer, "属性:%s" % attrStr)
+    skillMgr = batObj.GetSkillManager()
+    skillIDList = skillMgr.GetSkillIDList()
+    GameWorld.DebugAnswer(curPlayer, "技能: %s,%s" % (len(skillIDList), skillIDList))
+    buffMgr = batObj.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()
+                                 ))
+    return
+
+def __doFightTest(curPlayer, msgList):
+    ## 测试战斗: TurnFight f 是否满技能 [位置1武将ID ...]
+    isAllSkill = msgList[1] if len(msgList) > 1 else 1
+    heroIDList = msgList[2:]
+    TurnAttack.GMTestFight(curPlayer, heroIDList, isAllSkill)
+    return
 

--
Gitblit v1.8.0