From 1a9aa08e61a036b6c051cb072f7b4c8c746662b3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 03 十二月 2025 19:55:26 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(优化战斗与结算逻辑分离;优化战斗结果同步及战报;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py
index 67867c2..976a785 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py
@@ -31,13 +31,12 @@
     
     return True, funcLineID
 
-def OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg):
-    ## 回合战斗结束
-    
+def OnTurnFightAward(curPlayer, guid, mapID, funcLineID, winFaction, statMsg, dateStr, reqData, awardDict):
+    ## 回合战斗结算奖励
     if not curPlayer:
         return
     
-    isWin = turnFight.isWin
+    isWin = winFaction == ChConfig.Def_FactionA
     
     if not isWin:
         return
@@ -48,20 +47,7 @@
     
     itemList = FBCommon.GetPassAwardList(mapID, funcLineID)
     GameWorld.DebugLog("过关奖励: mapID=%s,funcLineID=%s,itemList=%s" % (mapID, funcLineID, itemList))
-    overMsg.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList)})
-    
-    turnFight.awardData = [itemList]
-    return
-
-def OnTurnFightAward(curPlayer, turnFight, mapID, funcLineID, awardData):
-    ## 回合战斗结算奖励
-    if not curPlayer:
-        return
-    
-    if not awardData:
-        return
-    
-    itemList = awardData[0]
+    awardDict.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList)})
     
     # 首通不扣次数
     FBCommon.AddEnterFBCount(curPlayer, mapID, isFree=True)

--
Gitblit v1.8.0