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_MainLevelBoss.py | 31 +++++--------------------------
1 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.py
index 52ba12f..06f3eef 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevelBoss.py
@@ -81,24 +81,19 @@
return npcLineupIDList, strongerLV, difficulty
-def OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg):
- ## 回合战斗结束
+def OnTurnFightAward(curPlayer, guid, mapID, funcLineID, winFaction, statMsg, dateStr, reqData, awardDict):
+ ## 回合战斗结算奖励
+
if not curPlayer:
return
playerID = curPlayer.GetPlayerID()
- #winFaction = turnFight.winFaction
- isWin = turnFight.isWin
+ isWin = winFaction == ChConfig.Def_FactionA
chapterID, levelNum, _ = PlayerControl.GetMainLevelPassInfo(curPlayer)
if not isWin:
nowValue = PlayerControl.GetMainLevelNowValue(curPlayer)
GameWorld.DebugLog("主线boss战斗失败！保持当前刷怪波进度不变! nowValue=%s" % nowValue, playerID)
- return
-
- if turnFight.haveNextLineup():
- GameWorld.DebugLog("主线boss小队战斗胜利，有下一小队! chapterID=%s,levelNum=%s,lineupIndex=%s,lineupIDList=%s"
- % (chapterID, levelNum, turnFight.lineupIndex, turnFight.lineupIDList), playerID)
return
isAllPass = False # 是否通关
@@ -122,23 +117,7 @@
levelIpyData = IpyGameDataPY.GetIpyGameData("MainLevel", chapterID, levelNum)
itemList = levelIpyData.GetAwardItemList() if levelIpyData else []
GameWorld.DebugLog("过关奖励: chapterID=%s,levelNum=%s,itemList=%s" % (chapterID, levelNum, itemList), playerID)
- overMsg.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList)})
-
- turnFight.awardData = [nextChapterID, nextLevelNum, isAllPass, itemList]
- return
-
-def OnTurnFightAward(curPlayer, turnFight, mapID, funcLineID, awardData):
- ## 回合战斗结算奖励
- if not curPlayer:
- return
-
- if not awardData:
- return
-
- playerID = curPlayer.GetPlayerID()
-
- nextChapterID, nextLevelNum, isAllPass, itemList = awardData
- GameWorld.DebugLog("处理奖励数据: nextChapterID=%s,nextLevelNum=%s,isAllPass=%s,itemList=%s" % (nextChapterID, nextLevelNum, isAllPass, itemList))
+ awardDict.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList)})
updPassValue = PlayerControl.SetMainLevelPassInfo(curPlayer, nextChapterID, nextLevelNum, 0)
if isAllPass:
--
Gitblit v1.8.0