From 5243a83a1f4d66dd88d54f76f9cab5d66384c8d0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 06 十一月 2024 16:32:18 +0800
Subject: [PATCH] 10261 【越南】【砍树】【英文】【tqxbqy】头像框,头像(补充通知:C001、C005、B207; 0320宗门扫荡结算助战玩家头像信息; A003王者仙盟徽章;)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
index 44c7dd4..40adc1f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
@@ -45,6 +45,8 @@
         self.playerName = ""
         self.playerJob = 0
         self.playerLV = 0
+        self.face = 0
+        self.facePic = 0
         self.maxHP = 0
         self.maxProDef = 0
         self.fightPower = 0
@@ -152,7 +154,7 @@
         billboardList = billboardList[:len(syncBillboardList)] # 直接用本服以后的排行数据实例clear后覆盖更新,不足的创建新实例
         orderDict = {} # 排行信息重新更新
         for i, syncData in enumerate(syncBillboardList):
-            playerID, playerName, job, fightPower, realmLV, pkScore, danLV, billTime, order = syncData
+            playerID, playerName, job, face, facePic, fightPower, realmLV, pkScore, danLV, billTime, order = syncData
             if i < len(billboardList):
                 billboardData = billboardList[i]
                 billboardData.clear()
@@ -164,6 +166,8 @@
             billboardData.PlayerID = playerID
             billboardData.PlayerName = playerName
             billboardData.Job = job
+            billboardData.Face = face
+            billboardData.FacePic = facePic
             billboardData.FightPower = fightPower
             billboardData.RealmLV = realmLV
             billboardData.PKScore = pkScore
@@ -295,6 +299,8 @@
         billboardData.PlayerID = playerID
         billboardData.PlayerName = pkPlayer.playerName
         billboardData.Job = pkPlayer.playerJob
+        billboardData.Face = pkPlayer.face
+        billboardData.FacePic = pkPlayer.facePic
         billboardData.FightPower = pkPlayer.fightPower
         billboardData.RealmLV = pkPlayer.realmLV
         billboardData.PKScore = pkPlayer.pkScore
@@ -468,13 +474,15 @@
         playerID = billboardData.PlayerID
         playerName = billboardData.PlayerName
         job = billboardData.Job
+        face = billboardData.Face
+        facePic = billboardData.FacePic
         fightPower = billboardData.FightPower
         realmLV = billboardData.RealmLV
         pkScore = billboardData.PKScore
         danLV = billboardData.DanLV
         billTime = billboardData.Time
         order = orderDict.get(playerID, 0)
-        syncBillboardList.append([playerID, playerName, job, fightPower, realmLV, pkScore, danLV, billTime, order])
+        syncBillboardList.append([playerID, playerName, job, face, facePic, fightPower, realmLV, pkScore, danLV, billTime, order])
         
     syncInfo = [zoneID, seasonID, syncBillboardList, exData, isFinalBillboardData]
     CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKSyncBillboard, syncInfo, serverGroupIDList)
@@ -521,6 +529,8 @@
         billboardInfoData.PlayerName = billboardData.PlayerName
         billboardInfoData.NameLen = len(billboardInfoData.PlayerName)
         billboardInfoData.Job = billboardData.Job
+        billboardInfoData.Face = billboardData.Face
+        billboardInfoData.FacePic = billboardData.FacePic
         billboardInfoData.FightPower = billboardData.FightPower
         billboardInfoData.RealmLV = billboardData.RealmLV
         billboardInfoData.PKScore = billboardData.PKScore
@@ -889,6 +899,8 @@
     playerID = playerInfoDict["playerID"] # 角色ID
     playerName = playerInfoDict["playerName"] # 玩家名
     job = playerInfoDict["playerJob"] # 职业
+    face = playerInfoDict["face"]
+    facePic = playerInfoDict["facePic"]
     playerLV = playerInfoDict["playerLV"] # 职业
     maxHP = playerInfoDict["maxHP"] # 职业
     maxProDef = playerInfoDict["maxProDef"] # 护盾
@@ -920,6 +932,8 @@
     pkPlayer.playerName = playerName
     pkPlayer.playerJob = job
     pkPlayer.playerLV = playerLV
+    pkPlayer.face = face
+    pkPlayer.facePic = facePic
     pkPlayer.maxHP = maxHP
     pkPlayer.maxProDef = maxProDef
     pkPlayer.pkScore = pkScore
@@ -1150,7 +1164,7 @@
             pkZoneID = roomPlayer.pkZoneID
             roomGroupIDList.append(roomPlayer.serverGroupID)
             readyMemberDict[roomPlayerID] = {"ServerGroupID":roomPlayer.serverGroupID, "Name":roomPlayer.playerName, "Number":num,
-                                             "Job":roomPlayer.playerJob, "LV":roomPlayer.playerLV, "MaxHP":roomPlayer.maxHP, "MaxProDef":roomPlayer.maxProDef}
+                                             "Job":roomPlayer.playerJob, "Face":roomPlayer.face, "FacePic":roomPlayer.facePic, "LV":roomPlayer.playerLV, "MaxHP":roomPlayer.maxHP, "MaxProDef":roomPlayer.maxProDef}
                     
         if not isAllReady:
             continue
@@ -1817,6 +1831,8 @@
     playerID = playerInfoDict["playerID"]
     playerName = playerInfoDict["playerName"]
     playerJob = playerInfoDict["playerJob"]
+    face = playerInfoDict.get("face", 0)
+    facePic = playerInfoDict.get("facePic", 0)
     fightPower = playerInfoDict["fightPower"]
     realmLV = playerInfoDict["realmLV"]
     pkScore = playerInfoDict["pkScore"]
@@ -1834,6 +1850,8 @@
     pkPlayer.playerID = playerID
     pkPlayer.playerName = playerName
     pkPlayer.playerJob = playerJob
+    pkPlayer.face = face
+    pkPlayer.facePic = facePic
     pkPlayer.pkScore = pkScore
     pkPlayer.danLV = danLV
     pkPlayer.fightPower = fightPower
@@ -2064,6 +2082,8 @@
                     matchPlayer.NameLen = len(matchPlayer.PlayerName)
                     matchPlayer.Job = readyPlayerInfo["Job"]
                     matchPlayer.LV = readyPlayerInfo["LV"]
+                    matchPlayer.Face = readyPlayerInfo["Face"]
+                    matchPlayer.FacePic = readyPlayerInfo["FacePic"]
                     matchPlayer.MaxHP = readyPlayerInfo["MaxHP"] % ShareDefine.Def_PerPointValue
                     matchPlayer.MaxHPEx = readyPlayerInfo["MaxHP"] / ShareDefine.Def_PerPointValue
                     matchPlayer.MaxProDef = readyPlayerInfo["MaxProDef"]

--
Gitblit v1.8.0