From 4d99299a4e4279fe368f43fd06d3e493fcc419ee Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 12 九月 2024 17:01:43 +0800
Subject: [PATCH] 10050 【后端】角色（部分封包同步Face信息）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py | 1
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 44 ++++++++++++++++++----
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 44 ++++++++++++++++++----
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py | 4 ++
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldSkyTower.py | 1
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerRequest.py | 4 +
6 files changed, 81 insertions(+), 17 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 48d2430..dd7d938 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -1179,6 +1179,7 @@
LV = 0 #(WORD LV)// 玩家等级
Job = 0 #(BYTE Job)// 玩家职业
RealmLV = 0 #(WORD RealmLV)// 玩家境界等级
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -1196,6 +1197,7 @@
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -1209,6 +1211,7 @@
self.LV = 0
self.Job = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -1220,6 +1223,7 @@
length += 2
length += 1
length += 2
+ length += 4
return length
@@ -1232,6 +1236,7 @@
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -1242,7 +1247,8 @@
Name:%s,
LV:%d,
Job:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.Head.OutputString(),
@@ -1251,7 +1257,8 @@
self.Name,
self.LV,
self.Job,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -5247,6 +5254,7 @@
LV = 0 #(DWORD LV)//等级
Job = 0 #(BYTE Job)
RealmLV = 0 #(WORD RealmLV)//境界
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -5260,6 +5268,7 @@
self.LV,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -5268,6 +5277,7 @@
self.LV = 0
self.Job = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -5277,6 +5287,7 @@
length += 4
length += 1
length += 2
+ length += 4
return length
@@ -5287,6 +5298,7 @@
data = CommFunc.WriteDWORD(data, self.LV)
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -5295,14 +5307,16 @@
Name:%s,
LV:%d,
Job:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.ID,
self.Name,
self.LV,
self.Job,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -5382,6 +5396,7 @@
Job = 0 #(BYTE Job)
LV = 0 #(WORD LV)//等级
RealmLV = 0 #(WORD RealmLV)//境界
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -5395,6 +5410,7 @@
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -5403,6 +5419,7 @@
self.Job = 0
self.LV = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -5412,6 +5429,7 @@
length += 1
length += 2
length += 2
+ length += 4
return length
@@ -5422,6 +5440,7 @@
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -5430,14 +5449,16 @@
PlayerName:%s,
Job:%d,
LV:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.PlayerID,
self.PlayerName,
self.Job,
self.LV,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -9271,6 +9292,7 @@
Name = "" #(char Name[33])
LV = 0 #(WORD LV)
RealmLV = 0 #(WORD RealmLV)//境界等级
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -9286,6 +9308,7 @@
self.Name,_pos = CommFunc.ReadString(_lpData, _pos,33)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -9297,6 +9320,7 @@
self.Name = ""
self.LV = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -9306,6 +9330,7 @@
length += 33
length += 2
length += 2
+ length += 4
return length
@@ -9316,6 +9341,7 @@
data = CommFunc.WriteString(data, 33, self.Name)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -9324,14 +9350,16 @@
AskID:%d,
Name:%s,
LV:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.Head.OutputString(),
self.AskID,
self.Name,
self.LV,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldSkyTower.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldSkyTower.py
index c68faa4..db63e2a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldSkyTower.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldSkyTower.py
@@ -226,6 +226,7 @@
playerInfo.Job = cacheDict.get("Job", 1)
playerInfo.LV = cacheDict.get("LV", 1)
playerInfo.RealmLV = cacheDict.get("RealmLV", 0)
+ playerInfo.Face = cacheDict.get("Face", 0)
passPlayerList.append(playerInfo)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
index b30be55..0a354b1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
@@ -3742,6 +3742,7 @@
clientPack.LV = curPlayer.GetLV()
clientPack.Job = curPlayer.GetJob()
clientPack.RealmLV = curPlayer.GetOfficialRank()
+ clientPack.Face = curPlayer.GetFace()
NetPackCommon.SendFakePack(tagPlayer, clientPack)
GameWorld.DebugLog("邀请传功: tagPlayerID=%s, %s" % (tagPlayerID, PyGameData.g_chuangongPlayerDict), playerID)
return
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
index fd8589d..2b5adfb 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
@@ -126,6 +126,7 @@
askFriendPack.Name = curPlayer.GetName()
askFriendPack.LV = curPlayer.GetLV()
askFriendPack.RealmLV = curPlayer.GetOfficialRank()
+ askFriendPack.Face = curPlayer.GetFace()
NetPackCommon.SendFakePack(tagPlayer, askFriendPack)
@@ -658,6 +659,7 @@
rceFriendsData.LV = tagPlayer.GetLV()
rceFriendsData.Job = tagPlayer.GetJob()
rceFriendsData.RealmLV = tagPlayer.GetOfficialRank()
+ rceFriendsData.Face = tagPlayer.GetFace()
sendPack.FriendsList.append(rceFriendsData)
#GameWorld.DebugLog("Client_RecommendFriends:%s"%sendPack.FriendsList)
@@ -717,6 +719,8 @@
rceFriendsData.Name = tagPlayer.GetName()
rceFriendsData.LV = tagPlayer.GetLV()
rceFriendsData.Job = tagPlayer.GetJob()
+ rceFriendsData.RealmLV = tagPlayer.GetOfficialRank()
+ rceFriendsData.Face = tagPlayer.GetFace()
sendPack.FriendsList.append(rceFriendsData)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerRequest.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerRequest.py
index d37a6ec..f0db17a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerRequest.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerRequest.py
@@ -115,7 +115,8 @@
PyGameData.g_playerRequests[curTagPlayerID][(curPlayer.GetID(), requestType)] = [curPlayer.GetName(),
curPlayer.GetLV(),
- curPlayer.GetOfficialRank()]
+ curPlayer.GetOfficialRank(),
+ curPlayer.GetFace()]
return
@@ -157,6 +158,7 @@
askFriendPack.Name = playerInfo[0]
askFriendPack.LV = playerInfo[1]
askFriendPack.RealmLV = playerInfo[2]
+ askFriendPack.Face = playerInfo[3]
NetPackCommon.SendFakePack(curPlayer, askFriendPack)
return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 48d2430..dd7d938 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -1179,6 +1179,7 @@
LV = 0 #(WORD LV)// 玩家等级
Job = 0 #(BYTE Job)// 玩家职业
RealmLV = 0 #(WORD RealmLV)// 玩家境界等级
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -1196,6 +1197,7 @@
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -1209,6 +1211,7 @@
self.LV = 0
self.Job = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -1220,6 +1223,7 @@
length += 2
length += 1
length += 2
+ length += 4
return length
@@ -1232,6 +1236,7 @@
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -1242,7 +1247,8 @@
Name:%s,
LV:%d,
Job:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.Head.OutputString(),
@@ -1251,7 +1257,8 @@
self.Name,
self.LV,
self.Job,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -5247,6 +5254,7 @@
LV = 0 #(DWORD LV)//等级
Job = 0 #(BYTE Job)
RealmLV = 0 #(WORD RealmLV)//境界
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -5260,6 +5268,7 @@
self.LV,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -5268,6 +5277,7 @@
self.LV = 0
self.Job = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -5277,6 +5287,7 @@
length += 4
length += 1
length += 2
+ length += 4
return length
@@ -5287,6 +5298,7 @@
data = CommFunc.WriteDWORD(data, self.LV)
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -5295,14 +5307,16 @@
Name:%s,
LV:%d,
Job:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.ID,
self.Name,
self.LV,
self.Job,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -5382,6 +5396,7 @@
Job = 0 #(BYTE Job)
LV = 0 #(WORD LV)//等级
RealmLV = 0 #(WORD RealmLV)//境界
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -5395,6 +5410,7 @@
self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -5403,6 +5419,7 @@
self.Job = 0
self.LV = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -5412,6 +5429,7 @@
length += 1
length += 2
length += 2
+ length += 4
return length
@@ -5422,6 +5440,7 @@
data = CommFunc.WriteBYTE(data, self.Job)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -5430,14 +5449,16 @@
PlayerName:%s,
Job:%d,
LV:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.PlayerID,
self.PlayerName,
self.Job,
self.LV,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
@@ -9271,6 +9292,7 @@
Name = "" #(char Name[33])
LV = 0 #(WORD LV)
RealmLV = 0 #(WORD RealmLV)//境界等级
+ Face = 0 #(DWORD Face)//基本脸型
data = None
def __init__(self):
@@ -9286,6 +9308,7 @@
self.Name,_pos = CommFunc.ReadString(_lpData, _pos,33)
self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
return _pos
def Clear(self):
@@ -9297,6 +9320,7 @@
self.Name = ""
self.LV = 0
self.RealmLV = 0
+ self.Face = 0
return
def GetLength(self):
@@ -9306,6 +9330,7 @@
length += 33
length += 2
length += 2
+ length += 4
return length
@@ -9316,6 +9341,7 @@
data = CommFunc.WriteString(data, 33, self.Name)
data = CommFunc.WriteWORD(data, self.LV)
data = CommFunc.WriteWORD(data, self.RealmLV)
+ data = CommFunc.WriteDWORD(data, self.Face)
return data
def OutputString(self):
@@ -9324,14 +9350,16 @@
AskID:%d,
Name:%s,
LV:%d,
- RealmLV:%d
+ RealmLV:%d,
+ Face:%d
'''\
%(
self.Head.OutputString(),
self.AskID,
self.Name,
self.LV,
- self.RealmLV
+ self.RealmLV,
+ self.Face
)
return DumpString
--
Gitblit v1.8.0