From 2bcc092eaf3d04df4934b6493847086929f988a0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 17 十一月 2025 15:21:42 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(增加每大回合每武将最大反击次数限制;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/TurnFight.py |  139 ++++++++++++++++++++++++++++++---------------
 1 files changed, 92 insertions(+), 47 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 a989353..9458607 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
@@ -17,6 +17,7 @@
 
 import ChConfig
 import GameWorld
+import ChPyNetPack
 import ChPyNetSendPack
 import NetPackCommon
 import TurnAttack
@@ -32,13 +33,15 @@
 #  @remarks 函数详细说明.
 def OnExec(curPlayer, msgList):
     if not msgList:
+        GameWorld.DebugAnswer(curPlayer, "发起战斗: TurnFight mapID [lineID 玩家ID]")
         GameWorld.DebugAnswer(curPlayer, "设置属性: TurnFight a 属性ID 值 [阵营 位置] ")
         GameWorld.DebugAnswer(curPlayer, "击杀目标: TurnFight k 阵营 [位置 ...] ")
-        GameWorld.DebugAnswer(curPlayer, "添加buff: TurnFight b 阵营  位置 buff技能ID")
+        GameWorld.DebugAnswer(curPlayer, "添加buff: TurnFight b 阵营  位置 buff归属阵营 位置 技能ID [ID ...]")
         GameWorld.DebugAnswer(curPlayer, "输出明细: TurnFight p [阵营 位置] ")
         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 ...]")
         return
     
     value = msgList[0]
@@ -50,18 +53,38 @@
         __doAddBuff(curPlayer, msgList)
     elif value == "p":
         __printInfo(curPlayer, msgList)
-        
+    elif value == "f":
+        __doFightTest(curPlayer, msgList)
+    elif value > 0 and value != ChConfig.Def_FBMapID_Main:
+        __reqTurnFight(curPlayer, msgList)
+    return
+
+def __reqTurnFight(curPlayer, msgList):
+    mapID = msgList[0]
+    funcLineID = msgList[1] if len(msgList) > 1 else 0
+    tagPlayerID = msgList[2] if len(msgList) > 2 else 0
+    clientData = ChPyNetPack.tagCMTurnFight()
+    clientData.MapID = mapID
+    clientData.FuncLineID = funcLineID
+    clientData.TagType = 0 if not tagPlayerID else 1
+    clientData.TagID = tagPlayerID
+    index = curPlayer.GetIndex()
+    tick = GameWorld.GetGameWorld().GetTick()
+    if not TurnAttack.OnTurnFight(index, clientData, tick):
+        GameWorld.DebugAnswer(curPlayer, "请求失败,详见服务器日志!")
     return
 
 def __doSetAttr(curPlayer, msgList):
     ## 设置属性
     attrID = msgList[1] if len(msgList) > 1 else 1
-    attrValue = msgList[2] if len(msgList) > 2 else 1
-    faction = msgList[3] if len(msgList) > 3 else 1
-    posNum = msgList[4] if len(msgList) > 4 else 1
+    attrValue = msgList[2] if len(msgList) > 2 else 1    
+    faction = msgList[3] if len(msgList) > 3 else 0
+    pNum = msgList[4] if len(msgList) > 4 else 0
     
-    if faction not in FactionList:
-        GameWorld.DebugAnswer(curPlayer, "阵营: 1-左边;2-右边")
+    factionList = [faction] if faction else FactionList
+    
+    if attrID not in ChConfig.AttrIDList:
+        GameWorld.DebugAnswer(curPlayer, "不存在该属性ID:%s" % (attrID))
         return
     
     mainFightMgr = TurnAttack.GetMainFightMgr(curPlayer)
@@ -69,34 +92,35 @@
     if not turnFight.isInFight():
         GameWorld.DebugAnswer(curPlayer, "主线非战斗中")
         return
-    batFaction = turnFight.getBatFaction(faction)
-    batLineup = batFaction.getBatlineup(1)
-    objID = batLineup.posObjIDDict.get(posNum)
-    batObj = None
+    
+    GameWorld.DebugAnswer(curPlayer, "----- 设置属性 -----")
+    
     batObjMgr = BattleObj.GetBatObjMgr()
-    if objID:
-        batObj = batObjMgr.getBatObj(objID)
-    if not batObj:
-        GameWorld.DebugAnswer(curPlayer, "不存在该战斗对象:阵营:%s,位置:%s" % (faction, posNum))
-        return
-    if not batObj.IsAlive():
-        GameWorld.DebugAnswer(curPlayer, "该对象已被击杀:阵营:%s,位置:%s" % (faction, posNum))
-        return
-    
-    if attrID not in ChConfig.AttrIDList:
-        GameWorld.DebugAnswer(curPlayer, "不存在该属性ID:%s" % (attrID))
-        return
-    
-    objName = TurnAttack.GetObjName(batObj)
-    GameWorld.DebugAnswer(curPlayer, "%s" % (objName))
-    batObj.GMSetBatAttr(attrID, attrValue)
-    if attrID == ChConfig.AttrID_HP:
-        GameWorld.DebugAnswer(curPlayer, "设置生命:%s/%s" % (batObj.GetHP(), batObj.GetMaxHP()))
-    elif attrID == ChConfig.AttrID_XP:
-        GameWorld.DebugAnswer(curPlayer, "设置怒气:%s" % (batObj.GetXP()))
-    else:
-        GameWorld.DebugAnswer(curPlayer, "设置属性ID:%s,V=%s" % (attrID, attrValue))
-        
+    for faction in factionList:
+        if faction not in FactionList:
+            GameWorld.DebugAnswer(curPlayer, "阵营: 1-左边;2-右边")
+            continue
+        batFaction = turnFight.getBatFaction(faction)
+        batLineup = batFaction.getBatlineup(1)
+        posNumList = [pNum] if pNum else batLineup.posObjIDDict.keys()
+        for posNum in posNumList:
+            objID = batLineup.posObjIDDict.get(posNum)
+            batObj = batObjMgr.getBatObj(objID)
+            if not batObj:
+                GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (faction, posNum))
+                continue
+            if not batObj.IsAlive():
+                GameWorld.DebugAnswer(curPlayer, "对象已阵亡:阵营:%s,位置:%s" % (faction, posNum))
+                continue
+            objName = TurnAttack.GetObjName(batObj)
+            GameWorld.DebugAnswer(curPlayer, "%s" % (objName))
+            batObj.GMSetBatAttr(attrID, attrValue)
+            if attrID == ChConfig.AttrID_HP:
+                GameWorld.DebugAnswer(curPlayer, "设置生命:%s/%s" % (batObj.GetHP(), batObj.GetMaxHP()))
+            elif attrID == ChConfig.AttrID_XP:
+                GameWorld.DebugAnswer(curPlayer, "设置怒气:%s" % (batObj.GetXP()))
+            else:
+                GameWorld.DebugAnswer(curPlayer, "设置属性ID:%s,V=%s" % (attrID, attrValue))
     return
 
 def __doKillObj(curPlayer, msgList):
@@ -122,10 +146,10 @@
             continue
         batObj = batObjMgr.getBatObj(objID)
         if not batObj:
-            GameWorld.DebugAnswer(curPlayer, "不存在该战斗对象:阵营:%s,位置:%s" % (faction, posNum))
+            GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (faction, posNum))
             continue
         if not batObj.IsAlive():
-            GameWorld.DebugAnswer(curPlayer, "该对象已被击杀:阵营:%s,位置:%s" % (faction, posNum))
+            GameWorld.DebugAnswer(curPlayer, "对象已阵亡:阵营:%s,位置:%s" % (faction, posNum))
             continue
         GameWorld.DebugAnswer(curPlayer, "击杀: %s" % TurnAttack.GetObjName(batObj))
         TurnAttack.SetObjKilled(turnFight, batObj)
@@ -139,7 +163,9 @@
 def __doAddBuff(curPlayer, msgList):
     faction = msgList[1] if len(msgList) > 1 else 2
     posNum = msgList[2] if len(msgList) > 2 else 1
-    skillID = msgList[3] if len(msgList) > 3 else 0
+    ownerFaction = msgList[3] if len(msgList) > 3 else faction
+    ownerPosNum = msgList[4] if len(msgList) > 4 else posNum
+    skillIDList = msgList[5:]
     if faction not in FactionList:
         GameWorld.DebugAnswer(curPlayer, "阵营: 1-左边;2-右边")
         return
@@ -155,17 +181,29 @@
     objID = batLineup.posObjIDDict.get(posNum)
     batObj = batObjMgr.getBatObj(objID)
     if not batObj:
-        GameWorld.DebugAnswer(curPlayer, "不存在该战斗对象:阵营:%s,位置:%s" % (faction, posNum))
+        GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (faction, posNum))
         return
     if not batObj.IsAlive():
-        GameWorld.DebugAnswer(curPlayer, "该对象已被击杀:阵营:%s,位置:%s" % (faction, posNum))
+        GameWorld.DebugAnswer(curPlayer, "对象已阵亡:阵营:%s,位置:%s" % (faction, posNum))
         return
     
-    addBuff = TurnBuff.DoAddBuffBySkillID(turnFight, batObj, skillID)
-    if addBuff:
-        GameWorld.DebugAnswer(curPlayer, "添加buff成功! buffID=%s" % addBuff.GetBuffID())    
-    else:
-        GameWorld.DebugAnswer(curPlayer, "添加buff失败")
+    ownerFaction = turnFight.getBatFaction(ownerFaction)
+    ownerLineup = ownerFaction.getBatlineup(1)
+    ownerID = ownerLineup.posObjIDDict.get(ownerPosNum)
+    buffOwner = batObjMgr.getBatObj(ownerID)
+    if not buffOwner:
+        GameWorld.DebugAnswer(curPlayer, "对象不存在:阵营:%s,位置:%s" % (ownerFaction, ownerPosNum))
+        return
+    if not buffOwner.IsAlive():
+        GameWorld.DebugAnswer(curPlayer, "对象已阵亡:阵营:%s,位置:%s" % (ownerFaction, ownerPosNum))
+        return
+    
+    for skillID in skillIDList:
+        addBuff = TurnBuff.DoAddBuffBySkillID(turnFight, batObj, skillID, buffOwner)
+        if addBuff:
+            GameWorld.DebugAnswer(curPlayer, "添加buff成功!skillID=%s,buffID=%s" % (skillID, addBuff.GetBuffID()))    
+        else:
+            GameWorld.DebugAnswer(curPlayer, "添加buff失败!skillID=%s" % (skillID))
     return
 
 def __printInfo(curPlayer, msgList):
@@ -195,7 +233,8 @@
             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()))
+            GameWorld.DebugAnswer(curPlayer, "HP:%s/%s" % (batObj.GetHP(), batObj.GetMaxHP()))
+            GameWorld.DebugAnswer(curPlayer, "攻:%s,防:%s,怒:%s" % (batObj.GetAtk(), batObj.GetDef(), batObj.GetXP()))
             attrDict = batObj.GetBatAttrDict()
             GameWorld.DebugAnswer(curPlayer, "属性:%s" % attrDict)
             skillMgr = batObj.GetSkillManager()
@@ -205,11 +244,17 @@
             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" 
+                GameWorld.DebugAnswer(curPlayer, "ID:%s,SkillID:%s,回合:%s,层:%s,V:%s,来源:%s,光环:%s" 
                                       % (buff.GetBuffID(), buff.GetSkillID(), buff.GetRemainTime(), buff.GetLayer(), 
-                                         [buff.GetValue1(), buff.GetValue2(), buff.GetValue3()]
+                                         [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