From 0458fc4fe34e9b1816781ad91cd1cc3b963d0bc6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 09 十二月 2025 11:19:38 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（个人战报ServerID改为玩家账号ServerID）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 82998ef..f18bcbc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -177,7 +177,7 @@
def __init__(self, guid, mapID=0, funcLineID=0, reqPlayerID=0, reqServerID=0):
self.guid = guid # 某场战斗的唯一guid，可用于存储记录如战报等
self._reqPlayerID = reqPlayerID # 可能为0，系统后台自动处理的战斗时为0，某个玩家发起则为发起玩家ID，同个玩家ID可能同时存在多场战斗，如主线+其他
- self._reqServerID = reqServerID
+ self._reqServerID = reqServerID # 可能是玩家的服务器ID，或者请求的ServerID
self.curPlayer = None
self.mapID = mapID
self.funcLineID = funcLineID
@@ -1064,6 +1064,7 @@
return
reqPlayerID = playerID
+ playerServerID = GameWorld.GetPlayerServerID(curPlayer)
guid = GameWorld.GetGUID()
atkLineupInfo = GetPlayerLineupInfo(curPlayer, atkLineupID)
@@ -1089,7 +1090,7 @@
lineupDictA = {1:atkLineupInfo}
lineupDictB = {1:defLineupInfo}
- AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, reqData=[tagType, tagID, valueList])
+ AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, reqData=[tagType, tagID, valueList])
# NPC
else:
@@ -1117,11 +1118,11 @@
lineupDictA = {1:atkLineupInfo}
lineupDictB = None
- AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, npcLineupIDList, strongerLV, difficulty)
+ AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, npcLineupIDList, strongerLV, difficulty)
return True
-def AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID=0, npcLineupIDList=[], strongerLV=0, difficulty=0, reqData=None):
+def AddToBattleQueue(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID=0, playerServerID=0, npcLineupIDList=[], strongerLV=0, difficulty=0, reqData=None):
'''添加进战斗请求队列，这里做战斗分发处理，由当前服务器根据当前服务器情况分配到本机子的其他战斗地图，或直接本地图处理
@param lineupDictA: 阵营A所有阵容{阵容编号:{阵容信息}, ...}
@param lineupDictB: 阵营B所有阵容{阵容编号:{阵容信息}, ...}，pvp时用
@@ -1139,8 +1140,8 @@
# pvp 或 pve 必须要满足其中一种
return
- reqServerID = GameWorld.GetGameWorld().GetServerID()
- reqInfo = [guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, npcLineupIDList, strongerLV, difficulty, reqData]
+ fromServerID = GameWorld.GetGameWorld().GetServerID()
+ reqInfo = [guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, npcLineupIDList, strongerLV, difficulty, reqData]
multiMapSet = IpyGameDataPY.GetFuncCfg("TurnFightProcess", 1)
# 多地图战斗 0-本地图处理；1-多地图处理；2-debug模式默认本地图处理，非debug默认多地图处理
isMultiMap = False
@@ -1153,17 +1154,17 @@
if isMultiMap:
CrossServerPackLogic.SendToBattleServer(ShareDefine.SSMsg_BattleRequest, reqInfo, reqPlayerID)
else:
- SSMsg_BattleRequest(reqInfo, reqServerID)
+ SSMsg_BattleRequest(reqInfo, fromServerID)
return
def SSMsg_BattleRequest(reqInfo, fromServerID):
## 请求执行战斗，由本地图或其他服务器地图分配过来的战斗请求
- guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, npcLineupIDList, strongerLV, difficulty, reqData = reqInfo
+ guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID, npcLineupIDList, strongerLV, difficulty, reqData = reqInfo
if npcLineupIDList:
- turnFight = DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, fromServerID, lineupDictA, npcLineupIDList, strongerLV, difficulty)
+ turnFight = DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, playerServerID, lineupDictA, npcLineupIDList, strongerLV, difficulty)
else:
- turnFight = DoTurnFightPVP(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, fromServerID)
+ turnFight = DoTurnFightPVP(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID, playerServerID)
winFaction = None
statMsg = {}
@@ -1211,14 +1212,14 @@
return
-def DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, reqServerID, playerLineupDict, npcLineupIDList, strongerLV, difficulty):
+def DoTurnFightPVE(guid, mapID, funcLineID, reqPlayerID, playerServerID, playerLineupDict, npcLineupIDList, strongerLV, difficulty):
'''执行PVE战斗，支持多小队
'''
turnMax = GetTurnMax(mapID)
tfMgr = GetTurnFightMgr()
- turnFight = tfMgr.addTurnFight(guid, mapID, funcLineID, reqPlayerID, reqServerID)
+ turnFight = tfMgr.addTurnFight(guid, mapID, funcLineID, reqPlayerID, playerServerID)
guid = turnFight.guid
turnFight.setTurnFight(mapID, funcLineID, turnMax, True)
@@ -1243,7 +1244,7 @@
tfMgr.delTurnFight(guid)
return turnFight if saveOK else None
-def DoTurnFightPVP(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID=0, reqServerID=0):
+def DoTurnFightPVP(guid, mapID, funcLineID, lineupDictA, lineupDictB, reqPlayerID=0, playerServerID=0):
'''执行PVP战斗，只处理战斗，不关心功能及curPlayer相关
@param lineupDictA: 阵营A所有阵容{阵容编号:{阵容信息}, ...}
@param lineupDictB: 阵营B所有阵容{阵容编号:{阵容信息}, ...}
@@ -1253,7 +1254,7 @@
turnMax = GetTurnMax(mapID)
tfMgr = GetTurnFightMgr()
- turnFight = tfMgr.addTurnFight(guid, mapID, funcLineID, reqPlayerID, reqServerID)
+ turnFight = tfMgr.addTurnFight(guid, mapID, funcLineID, reqPlayerID, playerServerID)
guid = turnFight.guid
turnFight.setTurnFight(mapID, funcLineID, turnMax, True)
@@ -2101,7 +2102,7 @@
pass
saveFilePath = os.path.join(ReportDir, "%s.tfr" % guid)
- GameWorld.DebugLog("__saveBatBuffer=%s" % saveFilePath)
+ GameWorld.DebugLog("战报路径=%s" % saveFilePath)
try:
clientPack = ChPyNetSendPack.tagSCTurnFightReport()
--
Gitblit v1.8.0