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/FBLogic.py |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
index 65e75c9..20c26fb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
@@ -2258,7 +2258,7 @@
     
     return callFunc(curPlayer, mapID, funcLineID)
 
-def GetFBNPCInitAttr(curPlayer, turnFight, npcObj):
+def GetFBNPCInitAttr(turnFight, npcObj):
     ## 获取副本指定NPC初始化属性
     do_FBLogic_ID = __GetFBLogic_MapID(turnFight.mapID)
     
@@ -2266,9 +2266,9 @@
     if callFunc == None:
         return
     
-    return callFunc(curPlayer, turnFight, npcObj)
+    return callFunc(turnFight, npcObj)
 
-def OnFBNPCKilledBefore(curPlayer, turnFight, gameObj, killer=None, useSkill=None):
+def OnFBNPCKilledBefore(turnFight, gameObj, killer=None, useSkill=None):
     ## 副本NPC被击杀前处理,一般用于处理一些不被击杀的副本NPC逻辑
     # @return: 可否被正常击杀
     do_FBLogic_ID = __GetFBLogic_MapID(turnFight.mapID)
@@ -2278,7 +2278,7 @@
         # 不需要逻辑时默认可被正常击杀
         return True
     
-    return callFunc(curPlayer, turnFight, gameObj, killer, useSkill)
+    return callFunc(turnFight, gameObj, killer, useSkill)
 
 def OnPlayerLineupAttackResult(curPlayer, atkObj, killObjList, useSkill, mapID, funcLineID):
     ## 回合战斗主动发起的玩家阵容攻击结果额外处理 ,一般处理副本相关的掉落、奖励等
@@ -2291,7 +2291,7 @@
         
     return
 
-def OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg):
+def OnTurnFightOver(turnFight, mapID, funcLineID, overMsg):
     ## 回合战斗结束
     
     do_FBLogic_ID = __GetFBLogic_MapID(mapID)
@@ -2301,9 +2301,9 @@
     if callFunc == None:
         return
     
-    return callFunc(curPlayer, turnFight, mapID, funcLineID, overMsg)
+    return callFunc(turnFight, mapID, funcLineID, overMsg)
 
-def OnTurnFightAward(curPlayer, turnFight, mapID, funcLineID, awardData):
+def OnTurnFightAward(curPlayer, guid, mapID, funcLineID, winFaction, statMsg, dateStr, reqData, awardDict):
     ## 回合战斗结算奖励
     
     do_FBLogic_ID = __GetFBLogic_MapID(mapID)
@@ -2313,4 +2313,4 @@
     if callFunc == None:
         return
     
-    return callFunc(curPlayer, turnFight, mapID, funcLineID, awardData)
+    return callFunc(curPlayer, guid, mapID, funcLineID, winFaction, statMsg, dateStr, reqData, awardDict)

--
Gitblit v1.8.0