From e61dddb2d0ab55b2d45d622afdfe6d54ec6e54e0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 04 三月 2025 18:11:01 +0800
Subject: [PATCH] 10350 【GM】【越南】【英文】【BT】【砍树】跨服竞技场优化（C001 C015增加同步玩家ServerID）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py | 1 +
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossChampionship.py | 1 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 22 ++++++++++++++++++----
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 22 ++++++++++++++++++----
4 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 3bffc00..b38411f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -17378,6 +17378,7 @@
RealmLV = 0 #(WORD RealmLV)
Face = 0 #(DWORD Face)//基本脸型
FacePic = 0 #(DWORD FacePic)//头像框
+ ServerID = 0 #(DWORD ServerID)
data = None
def __init__(self):
@@ -17396,6 +17397,7 @@
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.ServerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -17409,6 +17411,7 @@
self.RealmLV = 0
self.Face = 0
self.FacePic = 0
+ self.ServerID = 0
return
def GetLength(self):
@@ -17421,6 +17424,7 @@
length += 4
length += 4
length += 2
+ length += 4
length += 4
length += 4
@@ -17438,6 +17442,7 @@
data = CommFunc.WriteWORD(data, self.RealmLV)
data = CommFunc.WriteDWORD(data, self.Face)
data = CommFunc.WriteDWORD(data, self.FacePic)
+ data = CommFunc.WriteDWORD(data, self.ServerID)
return data
def OutputString(self):
@@ -17451,7 +17456,8 @@
FightPowerEx:%d,
RealmLV:%d,
Face:%d,
- FacePic:%d
+ FacePic:%d,
+ ServerID:%d
'''\
%(
self.PlayerID,
@@ -17463,7 +17469,8 @@
self.FightPowerEx,
self.RealmLV,
self.Face,
- self.FacePic
+ self.FacePic,
+ self.ServerID
)
return DumpString
@@ -17772,6 +17779,7 @@
FacePic = 0 #(DWORD FacePic)//头像框
FightPower = 0 #(DWORD FightPower)//战力，求余亿部分
FightPowerEx = 0 #(DWORD FightPowerEx)//战力，整除亿部分
+ ServerID = 0 #(DWORD ServerID)
data = None
def __init__(self):
@@ -17790,6 +17798,7 @@
self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPower,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPowerEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.ServerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -17803,6 +17812,7 @@
self.FacePic = 0
self.FightPower = 0
self.FightPowerEx = 0
+ self.ServerID = 0
return
def GetLength(self):
@@ -17813,6 +17823,7 @@
length += 1
length += 2
length += 2
+ length += 4
length += 4
length += 4
length += 4
@@ -17832,6 +17843,7 @@
data = CommFunc.WriteDWORD(data, self.FacePic)
data = CommFunc.WriteDWORD(data, self.FightPower)
data = CommFunc.WriteDWORD(data, self.FightPowerEx)
+ data = CommFunc.WriteDWORD(data, self.ServerID)
return data
def OutputString(self):
@@ -17845,7 +17857,8 @@
Face:%d,
FacePic:%d,
FightPower:%d,
- FightPowerEx:%d
+ FightPowerEx:%d,
+ ServerID:%d
'''\
%(
self.PlayerID,
@@ -17857,7 +17870,8 @@
self.Face,
self.FacePic,
self.FightPower,
- self.FightPowerEx
+ self.FightPowerEx,
+ self.ServerID
)
return DumpString
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossChampionship.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossChampionship.py
index 6caac90..fceab63 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossChampionship.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossChampionship.py
@@ -3020,6 +3020,7 @@
playerPack.RealmLV = batPlayer.realmLV
playerPack.Face = batPlayer.face
playerPack.FacePic = batPlayer.facePic
+ playerPack.ServerID = GameWorld.GetAccIDServerID(batPlayer.accID)
clientPack.PlayerList.append(playerPack)
clientPack.PlayerCount = len(clientPack.PlayerList)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
index 5fe4e8d..4c70133 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
@@ -851,6 +851,7 @@
matchPlayer.FacePic = cacheDict.get("FacePic", 0)
matchPlayer.FightPower = cacheDict.get("FightPower", 0) % ChConfig.Def_PerPointValue
matchPlayer.FightPowerEx = cacheDict.get("FightPower", 0) / ChConfig.Def_PerPointValue
+ matchPlayer.ServerID = GameWorld.GetAccIDServerID(cacheDict.get("AccID", ""))
#matchOKPack.MatchPlayer.append(matchPlayer)
matchOKPack.MatchPlayerCount = len(matchOKPack.MatchPlayer)
NetPackCommon.SendFakePack(curPlayer, matchOKPack)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 3bffc00..b38411f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -17378,6 +17378,7 @@
RealmLV = 0 #(WORD RealmLV)
Face = 0 #(DWORD Face)//基本脸型
FacePic = 0 #(DWORD FacePic)//头像框
+ ServerID = 0 #(DWORD ServerID)
data = None
def __init__(self):
@@ -17396,6 +17397,7 @@
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.ServerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -17409,6 +17411,7 @@
self.RealmLV = 0
self.Face = 0
self.FacePic = 0
+ self.ServerID = 0
return
def GetLength(self):
@@ -17421,6 +17424,7 @@
length += 4
length += 4
length += 2
+ length += 4
length += 4
length += 4
@@ -17438,6 +17442,7 @@
data = CommFunc.WriteWORD(data, self.RealmLV)
data = CommFunc.WriteDWORD(data, self.Face)
data = CommFunc.WriteDWORD(data, self.FacePic)
+ data = CommFunc.WriteDWORD(data, self.ServerID)
return data
def OutputString(self):
@@ -17451,7 +17456,8 @@
FightPowerEx:%d,
RealmLV:%d,
Face:%d,
- FacePic:%d
+ FacePic:%d,
+ ServerID:%d
'''\
%(
self.PlayerID,
@@ -17463,7 +17469,8 @@
self.FightPowerEx,
self.RealmLV,
self.Face,
- self.FacePic
+ self.FacePic,
+ self.ServerID
)
return DumpString
@@ -17772,6 +17779,7 @@
FacePic = 0 #(DWORD FacePic)//头像框
FightPower = 0 #(DWORD FightPower)//战力，求余亿部分
FightPowerEx = 0 #(DWORD FightPowerEx)//战力，整除亿部分
+ ServerID = 0 #(DWORD ServerID)
data = None
def __init__(self):
@@ -17790,6 +17798,7 @@
self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPower,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FightPowerEx,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.ServerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -17803,6 +17812,7 @@
self.FacePic = 0
self.FightPower = 0
self.FightPowerEx = 0
+ self.ServerID = 0
return
def GetLength(self):
@@ -17813,6 +17823,7 @@
length += 1
length += 2
length += 2
+ length += 4
length += 4
length += 4
length += 4
@@ -17832,6 +17843,7 @@
data = CommFunc.WriteDWORD(data, self.FacePic)
data = CommFunc.WriteDWORD(data, self.FightPower)
data = CommFunc.WriteDWORD(data, self.FightPowerEx)
+ data = CommFunc.WriteDWORD(data, self.ServerID)
return data
def OutputString(self):
@@ -17845,7 +17857,8 @@
Face:%d,
FacePic:%d,
FightPower:%d,
- FightPowerEx:%d
+ FightPowerEx:%d,
+ ServerID:%d
'''\
%(
self.PlayerID,
@@ -17857,7 +17870,8 @@
self.Face,
self.FacePic,
self.FightPower,
- self.FightPowerEx
+ self.FightPowerEx,
+ self.ServerID
)
return DumpString
--
Gitblit v1.8.0