From 795870b7c5c8d026272a3b70e11e0ab1a437601a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 21 一月 2025 18:55:06 +0800
Subject: [PATCH] 10263 【越南】【英文】【BT】【砍树】后端支持NPC仿真实玩家战斗和快速战斗(优化不创建战斗PK时玩家自身镜像数据同步;)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py |   72 ++++++++++++++++++++----------------
 1 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
index 58dc777..400a510 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
@@ -154,30 +154,6 @@
         
     return
 
-def __CheckFightPowerBillboard():
-    ## 由于战力修改为支持超过20E,所以需要处理下战力相关榜单,原 cmpValue 值移动到 cmpValue2
-    
-    eventKey = "FightPowerBillboardMoveValue"
-    if PlayerDBGSEvent.GetDBGSTrig_ByKey(eventKey):
-        return
-    PlayerDBGSEvent.SetDBGSTrig_ByKey(eventKey, 1)
-    GameWorld.Log("处理战力榜超过20E支持!")
-    
-    billboardList = [ShareDefine.Def_BT_FightPower] + ShareDefine.JobFightPowerBillboardDict.values()
-    for billboardType in billboardList:
-        billboard = GameWorld.GetBillboard().FindBillboard(billboardType)
-        if not billboard:
-            continue
-        GameWorld.Log("    billboardType=%s,count=%s" % (billboardType, billboard.GetCount()))
-        for index in xrange(billboard.GetCount()):
-            billBoardData = billboard.At(index)
-            if not billBoardData:
-                continue
-            billBoardData.SetCmpValue2(billBoardData.GetCmpValue())
-            billBoardData.SetCmpValue(0)
-            
-    return
-
 def SortServerBillboard():
     ##排序所有排行榜
     billboardMgr = GameWorld.GetBillboard()
@@ -187,7 +163,6 @@
         #排序一次排行榜
         billBoard.Sort()
         
-    __CheckFightPowerBillboard()
     return
 
 def CopyBillboard(newBillboardIndex, oldBillboardIndex):
@@ -642,11 +617,10 @@
 
 def GetBillboardOperateInfo(curPlayer):
     # 排行榜中所保存的运营商相关信息
-    return curPlayer.GetFace()
-#    platform = curPlayer.GetAccID()
-#    if platform in ["tencent"]:
-#        return curPlayer.GetOperateInfo()
-#    return platform
+    platform = curPlayer.GetAccID()
+    if platform in ["tencent"]:
+        return curPlayer.GetOperateInfo()
+    return platform
 
 def UpdateFamilyBillboard(bType, familyBillInfo, cmpValue, cmpValue2=0):
     ## 更新仙盟排行榜
@@ -675,6 +649,8 @@
     playerJob = 0
     playerName = ""
     playerRealmLV = 0
+    face = 0
+    facePic = 0
     
     if curPlayer:
         playerID = curPlayer.GetID()
@@ -682,12 +658,16 @@
         playerName = curPlayer.GetName()
         playerRealmLV = curPlayer.GetOfficialRank()
         playerOpInfo = GetBillboardOperateInfo(curPlayer)
+        face = curPlayer.GetFace()
+        facePic = curPlayer.GetFacePic()
     else:
         socialPlayer = PyDataManager.GetPersonalSocialManager().GetSocialPlayer(playerID)
         if socialPlayer:
             playerJob = socialPlayer.playerInfo.Job
             playerName = socialPlayer.playerInfo.PlayerName
             playerRealmLV = socialPlayer.playerInfo.RealmLV
+            face = socialPlayer.playerInfo.Face
+            facePic = socialPlayer.playerInfo.FacePic
         else:
             curCache = PlayerViewCache.FindViewCache(playerID)
             if curCache:
@@ -695,6 +675,8 @@
                 playerJob = cacheDict["Job"]
                 playerName = cacheDict["Name"]
                 playerRealmLV = cacheDict["RealmLV"]
+                face = cacheDict.get("Face", 0)
+                facePic = cacheDict.get("FacePic", 0)
                 
     if not playerName and playerID < 10000:
         playerJob = random.choice([1, 2])
@@ -711,7 +693,7 @@
     if autoSort:
         gameWorld.SetDict(Def_Key_BillboardSortTick % bType, tick)
         
-    UpdatePlayerBillboard(playerID, playerName, playerOpInfo, bType, playerJob, value1, value2, cmpValue, autoSort, cmpValue2, cmpValue3)
+    UpdatePlayerBillboard(playerID, playerName, playerOpInfo, bType, playerJob, value1, value2, cmpValue, autoSort, cmpValue2, cmpValue3, value3=face, value4=facePic)
     return
 
 #---------------------------------------------------------------------
@@ -975,6 +957,8 @@
     
     billboardMgr = GameWorld.GetBillboard()
     for billboardIndex in ShareDefine.BillboardTypeList:
+        if billboardIndex in ShareDefine.FamilyBillboardList:
+            continue
         billBoard = billboardMgr.FindBillboard(billboardIndex)
         if not billBoard:
             #找不到这类型排行榜
@@ -985,6 +969,30 @@
             #该玩家没有在排行榜上
             continue
         
-        playerBillBoardData.SetName2(str(curFace))
+        playerBillBoardData.SetValue3(curFace)
+        
+    return
+
+def UpdateBillboardFacePic(curPlayer):
+    ## 更新排行榜中的玩家头像
+    
+    curPlayerID = curPlayer.GetID()
+    curFacePic = curPlayer.GetFacePic()
+    
+    billboardMgr = GameWorld.GetBillboard()
+    for billboardIndex in ShareDefine.BillboardTypeList:
+        if billboardIndex in ShareDefine.FamilyBillboardList:
+            continue
+        billBoard = billboardMgr.FindBillboard(billboardIndex)
+        if not billBoard:
+            #找不到这类型排行榜
+            continue
+        
+        playerBillBoardData = billBoard.FindByID(curPlayerID)
+        if not playerBillBoardData:
+            #该玩家没有在排行榜上
+            continue
+        
+        playerBillBoardData.SetValue4(curFacePic)
         
     return

--
Gitblit v1.8.0