From 36ca116422692e921945cec810d36fc5c0951a93 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 04 九月 2025 11:51:18 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(满最大幸运时重置幸运为0)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
index 01ef967..8858954 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -35,6 +35,7 @@
 import TurnPassive
 import TurnSkill
 import TurnBuff
+import CommFunc
 import ObjPool
 import FBLogic
 
@@ -393,7 +394,9 @@
             headStr = "%02x%02x" % (clientPack.Cmd, clientPack.SubCmd)
         if self.isNeedReport:
             packBuff = clientPack.GetBuffer()
-            GameWorld.DebugLog("回合战斗过程封包: %s" % (headStr))
+            buffLen = len(packBuff)
+            GameWorld.DebugLog("回合战斗过程封包: %s, len:%s" % (headStr, buffLen))
+            self.batBuffer += CommFunc.WriteWORD("", buffLen)
             self.batBuffer += packBuff
             ObjPool.GetPoolMgr().release(clientPack)
         else:
@@ -998,11 +1001,15 @@
         ## 关卡boss是一次性处理完的,一般不可能走到这里,这边做下防范
         return
     
+    if not turnFight.isInFight():
+        __doMainLevelWave(curPlayer, True)
+        return
+    
     winFaction = turnFight.winFaction
     if winFaction:
         nextLineupID = turnFight.nextLineupID()
         if nextLineupID:
-            GameWorld.DebugLog("---开始进入下一小队: lineupIndex=%s,nextLineupID=%s,%s" % (turnFight.lineupIndex, nextLineupID, turnFight.npcLineupIDList))
+            GameWorld.DebugLog("---开始进入下一小队: lineupIndex=%s,nextLineupID=%s,%s" % (turnFight.lineupIndex, nextLineupID, turnFight.lineupIDList))
             
             turnFight.nextTurnFight()
             # 切换小队时,玩家阵容不需要处理,保留状态

--
Gitblit v1.8.0