From 2ea1a4e59aeb084e0033d1a2ea9c26171955985c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 18 十一月 2024 16:55:12 +0800
Subject: [PATCH] 10261 【越南】【砍树】【英文】【tqxbqy】【btgotq】头像框,头像(补充跨服榜单Value3、Value4,包含古神参与、召集、积分榜,boss历练活动榜、古宝养成活动榜、骑宠养成活动榜、仙匣秘境活动榜;)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py                                                |    8 ++++++--
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossBattlefield.py                       |    2 ++
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBattlefield.py                                          |   12 +++++++-----
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py |    8 +++++++-
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActXianXiaMJ.py                                                |    8 ++++++--
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActHorsePetTrain.py                                            |    8 ++++++--
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActGubao.py                                                    |    8 ++++++--
 7 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBattlefield.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBattlefield.py
index c2d5655..529b514 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBattlefield.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBattlefield.py
@@ -653,6 +653,8 @@
     openMinute = msgData["openMinute"]
     faction = msgData["faction"]
     serverOnly = msgData.get("serverOnly", 0)
+    face = msgData.get("face", 0)
+    facePic = msgData.get("facePic", 0)
     
     hmNum = GetHMNum(openHour, openMinute)
     
@@ -682,7 +684,7 @@
         type2, value1, value2 = job, realmLV, 0
         cmpValue = buyOpenCountWeek + 1
         if cmpValue >= billboardCallCountLimit:
-            CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_BattlefieldWCall, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue)            
+            CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_BattlefieldWCall, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue, value3=face, value4=facePic)            
         
         # 通知子服
         serverGroupIDList = [serverGroupID]
@@ -750,7 +752,7 @@
     type2, value1, value2 = job, realmLV, 0
     cmpValue = buyOpenCountWeek + 1
     if cmpValue >= billboardCallCountLimit:
-        CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_BattlefieldWCall, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue)
+        CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_BattlefieldWCall, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue, value3=face, value4=facePic)
         
     for otherBuyPlayerID, otherRec in buyPlayerInfo.items():
         if otherBuyPlayerID == playerID:
@@ -903,7 +905,7 @@
     syncPlayerDataInfo = {}
     winnerPlayerIDList, loserPlayerIDList = [], []
     for playerInfo in battlePlayerList:
-        playerID, job, realmLV, name, \
+        playerID, job, face, facePic, realmLV, name, \
             isWinner, faction, rank, score, highScoreToday, highScoreWeekTotal, enterCountWeek, teamID, \
             isCallOpen, isCalled, killCnt, ckillCntInfo, killBossCnt, killScoreKing, killGuardCnt, auraScore, superItemAwardCnt, \
             factionBuffCollCnt, personBuffCollCnt, crystalCollCnt, wallCollCnt \
@@ -933,14 +935,14 @@
         enterCountWeek += 1
         cmpValue = enterCountWeek
         if cmpValue >= billboardEnterCountLimit:
-            CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_BattlefieldWJoin, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue)
+            CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_BattlefieldWJoin, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue, value3=face, value4=facePic)
             
         # 更新周高分榜单
         if score > highScoreToday:
             highScoreWeekTotal += (score - highScoreToday)
             highScoreToday = score
             cmpValue = highScoreWeekTotal
-            CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_BattlefieldWScore, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue)
+            CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_BattlefieldWScore, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue, value3=face, value4=facePic)
             
         GameWorld.Log("    战场阵营玩家: faction=%s,isWinner=%s,rank=%s,playerID=%s,score=%s,highScoreToday=%s,highScoreWeekTotal=%s,enterCountWeek=%s,teamID=%s,isCallOpen=%s,isCalled=%s" 
                       % (faction, isWinner, rank, playerID, score, highScoreToday, highScoreWeekTotal, enterCountWeek, teamID, isCallOpen, isCalled), fbPropertyID)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py
index 17ac49a..6be7dd4 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActBossTrial.py
@@ -271,6 +271,8 @@
     accID = curPlayer.GetAccID()
     playerName = curPlayer.GetName()
     job = curPlayer.GetJob()
+    face = curPlayer.GetFace()
+    facePic = curPlayer.GetFacePic()
     realmLV = curPlayer.GetOfficialRank()
     familyID = curPlayer.GetFamilyID()
     submitCount, updSubmitCount = dataMsg
@@ -286,7 +288,7 @@
         
     #同步跨服
     playerInfo = {"playerID":playerID, "playerName":playerName, "accID":accID, "job":job, "realmLV":realmLV,
-                  "playerSubmitTotal":updSubmitCount}
+                  "playerSubmitTotal":updSubmitCount, "face":face, "facePic":facePic}
     SyncBossTrialSubmitToCrossServer(curPlayer, playerInfo, familyBillInfo)
     return
 
@@ -467,13 +469,15 @@
     accID = playerInfo["accID"]
     realmLV = playerInfo["realmLV"]
     playerSubmitTotal = playerInfo["playerSubmitTotal"]
+    face = playerInfo.get("face", 0)
+    facePic = playerInfo.get("facePic", 0)
     
     groupValue1 = zoneID
     
     if playerSubmitTotal >= personlLimit:
         name2, type2, value1, value2 = accID, job, realmLV, 0
         CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_BossTrialSubmit, groupValue1, playerID, playerName, 
-                                         name2, type2, value1, value2, playerSubmitTotal)
+                                         name2, type2, value1, value2, playerSubmitTotal, value3=face, value4=facePic)
         
     if familyInfo and familyInfo.get("familySubmitTotal", 0) >= familyLimit:
         familySubmitTotal = familyInfo["familySubmitTotal"]
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActGubao.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActGubao.py
index cf08de3..2c7442c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActGubao.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActGubao.py
@@ -176,6 +176,8 @@
     accID = curPlayer.GetAccID()
     playerName = curPlayer.GetName()
     job = curPlayer.GetJob()
+    face = curPlayer.GetFace()
+    facePic = curPlayer.GetFacePic()
     realmLV = curPlayer.GetOfficialRank()
     _, updScore, isRelationCrossAct = dataMsg
     
@@ -184,7 +186,7 @@
     if isRelationCrossAct:
         #同步跨服
         playerInfo = {"playerID":playerID, "playerName":playerName, "accID":accID, "job":job, "realmLV":realmLV,
-                      "playerScore":updScore}
+                      "playerScore":updScore, "face":face, "facePic":facePic}
         SyncGubaoToCrossServer(curPlayer, playerInfo)
     return
 
@@ -236,13 +238,15 @@
     accID = playerInfo["accID"]
     realmLV = playerInfo["realmLV"]
     playerScore = playerInfo["playerScore"]
+    face = playerInfo.get("face", 0)
+    facePic = playerInfo.get("facePic", 0)
     
     groupValue1 = zoneID
     
     if playerScore >= personlLimit:
         name2, type2, value1, value2 = accID, job, realmLV, 0
         CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_GubaoScore, groupValue1, playerID, playerName, 
-                                         name2, type2, value1, value2, playerScore, autoSort=False)
+                                         name2, type2, value1, value2, playerScore, autoSort=False, value3=face, value4=facePic)
     return
 
 def OnCrossActIDChange(cfgID, zoneID, ipyData, state):
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActHorsePetTrain.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActHorsePetTrain.py
index f4f4961..715b4e2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActHorsePetTrain.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActHorsePetTrain.py
@@ -175,6 +175,8 @@
     accID = curPlayer.GetAccID()
     playerName = curPlayer.GetName()
     job = curPlayer.GetJob()
+    face = curPlayer.GetFace()
+    facePic = curPlayer.GetFacePic()
     realmLV = curPlayer.GetOfficialRank()
     _, updScore, isRelationCrossAct = dataMsg
     
@@ -183,7 +185,7 @@
     if isRelationCrossAct:
         #同步跨服
         playerInfo = {"playerID":playerID, "playerName":playerName, "accID":accID, "job":job, "realmLV":realmLV,
-                      "playerScore":updScore}
+                      "playerScore":updScore, "face":face, "facePic":facePic}
         SyncHorsePetTrainToCrossServer(curPlayer, playerInfo)
     return
 
@@ -235,13 +237,15 @@
     accID = playerInfo["accID"]
     realmLV = playerInfo["realmLV"]
     playerScore = playerInfo["playerScore"]
+    face = playerInfo.get("face", 0)
+    facePic = playerInfo.get("facePic", 0)
     
     groupValue1 = zoneID
     
     if playerScore >= personlLimit:
         name2, type2, value1, value2 = accID, job, realmLV, 0
         CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_HorsePetTrainScore, groupValue1, playerID, playerName, 
-                                         name2, type2, value1, value2, playerScore, autoSort=False)
+                                         name2, type2, value1, value2, playerScore, autoSort=False, value3=face, value4=facePic)
     return
 
 def OnCrossActIDChange(cfgID, zoneID, ipyData, state):
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActXianXiaMJ.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActXianXiaMJ.py
index 042e119..81f8908 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActXianXiaMJ.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerActXianXiaMJ.py
@@ -175,6 +175,8 @@
     accID = curPlayer.GetAccID()
     playerName = curPlayer.GetName()
     job = curPlayer.GetJob()
+    face = curPlayer.GetFace()
+    facePic = curPlayer.GetFacePic()
     realmLV = curPlayer.GetOfficialRank()
     _, updLotteryScore, isRelationCrossAct = dataMsg
     
@@ -183,7 +185,7 @@
     if isRelationCrossAct:
         #同步跨服
         playerInfo = {"playerID":playerID, "playerName":playerName, "accID":accID, "job":job, "realmLV":realmLV,
-                      "playerLotteryScore":updLotteryScore}
+                      "playerLotteryScore":updLotteryScore, "face":face, "facePic":facePic}
         SyncXianXiaMJToCrossServer(curPlayer, playerInfo)
     return
 
@@ -235,13 +237,15 @@
     accID = playerInfo["accID"]
     realmLV = playerInfo["realmLV"]
     playerLotteryScore = playerInfo["playerLotteryScore"]
+    face = playerInfo.get("face", 0)
+    facePic = playerInfo.get("facePic", 0)
     
     groupValue1 = zoneID
     
     if playerLotteryScore >= personlLimit:
         name2, type2, value1, value2 = accID, job, realmLV, 0
         CrossBillboard.UpdCrossBillboard(ShareDefine.Def_CBT_XianXiaMJScore, groupValue1, playerID, playerName, 
-                                         name2, type2, value1, value2, playerLotteryScore, autoSort=False)
+                                         name2, type2, value1, value2, playerLotteryScore, autoSort=False, value3=face, value4=facePic)
     return
 
 def OnCrossActIDChange(cfgID, zoneID, ipyData, state):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py
index 7933bf5..1448a6f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py
@@ -377,6 +377,8 @@
         self.factionObj = None
         self.accID = ""
         self.job = 1
+        self.face = 0
+        self.facePic = 0
         self.realmLV = 0
         self.fightPower = 0
         
@@ -637,6 +639,8 @@
     fightPower = PlayerControl.GetFightPower(curPlayer)
     battleObj = GetBattlePlayerObj(playerID)
     battleObj.job = curPlayer.GetJob()
+    battleObj.face = curPlayer.GetFace()
+    battleObj.facePic = curPlayer.GetFacePic()
     battleObj.accID = curPlayer.GetAccID()
     battleObj.name = curPlayer.GetPlayerName()
     battleObj.realmLV = curPlayer.GetOfficialRank()
@@ -1757,6 +1761,8 @@
             playerID = battleObj.playerID
             score = battleObj.score
             job = battleObj.job
+            face = battleObj.face
+            facePic = battleObj.facePic
             realmLV = battleObj.realmLV
             name = battleObj.name
             highScoreToday = battleObj.highScoreToday
@@ -1781,7 +1787,7 @@
                 battleObj.auraScore, battleObj.superItemAwardCnt, battleObj.factionBuffCollCnt, battleObj.personBuffCollCnt, \
                 battleObj.crystalCollCnt, battleObj.wallCollCnt
                 
-            playerInfo = [playerID, job, realmLV, name,
+            playerInfo = [playerID, job, face, facePic, realmLV, name,
                           isWinner, faction, rank, score, highScoreToday, highScoreWeekTotal, enterCountWeek, teamID,
                           isCallOpen, isCalled, killCnt, ckillCntInfo, killBossCnt, killScoreKing, killGuardCnt, auraScore, superItemAwardCnt,
                           factionBuffCollCnt, personBuffCollCnt, crystalCollCnt, wallCollCnt]
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossBattlefield.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossBattlefield.py
index 9a5b9b6..2616a57 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossBattlefield.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossBattlefield.py
@@ -146,6 +146,8 @@
                "playerID":playerID,
                "playerName":CrossRealmPlayer.GetCrossPlayerName(curPlayer),
                "playerJob":curPlayer.GetJob(),
+               "face":curPlayer.GetFace(),
+               "facePic":curPlayer.GetFacePic(),
                "playerLV":curPlayer.GetLV(),
                "realmLV":curPlayer.GetOfficialRank(),
                "fightPower":PlayerControl.GetFightPower(curPlayer),

--
Gitblit v1.8.0