From 225c3a53759d5739989272549203d4676c666e9f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 30 一月 2026 14:08:01 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(命格buff改为只给命格自身添加;命格buff基础属性加成支持计算到武将身上;命格战斗属性支持计算到武将战斗中;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TurnFight.py |   70 +++++++++++++++-------------------
 1 files changed, 31 insertions(+), 39 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 80940c1..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
@@ -235,20 +235,8 @@
         mgObj = batLineup.getMinggeObj()
         if mgObj:
             objName = "命格 ID:%s" % mgObj.GetID()
-            GameWorld.DebugAnswer(curPlayer, "--- %s" % objName)
-            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()
-                                         ))
-                
+            __printObj(curPlayer, mgObj, objName)
+            
         posObjIDDict = batLineup.getPosObjIDDict()
         for posNum in posNumList:
             objID = posObjIDDict.get(posNum)
@@ -256,31 +244,35 @@
                 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" % (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()
-                                         ))
-                
+            __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):

--
Gitblit v1.8.0