From ea6dff19b5877d55473d445788e1a2ff5789f6b9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 17 三月 2026 10:01:57 +0800
Subject: [PATCH] 526 【挑战】PVP群英榜-后端(战斗日志Value1增加存储ServerID;群英榜单10的UserData增加Json格式存储FightPower;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py |  177 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 116 insertions(+), 61 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
index 55895ad..2891192 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
@@ -18,6 +18,8 @@
 import ChConfig
 import GameWorld
 import PyMongoMain
+import CrossPlayer
+import PlayerFamily
 import PlayerControl
 import NetPackCommon
 import ChPyNetSendPack
@@ -30,6 +32,7 @@
 import ShareDefine
 import TurnAttack
 import DBDataMgr
+import CrossMsg
 
 import random
 import time
@@ -54,18 +57,31 @@
     
     return
 
+def OnCrossPlayerLogout(crossPlayer):
+    playerID = crossPlayer.GetPlayerID()
+    viewCacheMgr = DBDataMgr.GetPlayerViewCacheMgr()
+    curCache = viewCacheMgr.GetPlayerViewCache(playerID)
+    if not curCache:
+        return
+    
+    if not IsSaveDBViewCache(curCache):
+        viewCacheMgr.DelPlayerViewCache(playerID)
+        return
+    
+    return
+
 def DelOutofTimeViewCacheData():
     ## 删除过期的查看缓存数据
     
-    playerManager = GameWorld.GetPlayerManager()
+    crossPlayerMgr = CrossPlayer.GetCrossPlayerMgr()
     viewCacheMgr = DBDataMgr.GetPlayerViewCacheMgr()
     for index in range(viewCacheMgr.GetCount())[::-1]: # 有删除需倒序遍历
         viewCache = viewCacheMgr.At(index)
         playerID = viewCache.GetPlayerID()
         if playerID < ShareDefine.RealPlayerIDStart:
             continue
-        curPlayer = playerManager.FindPlayerByID(playerID)
-        if curPlayer:
+        crossPlayer = crossPlayerMgr.FindCrossPlayer(playerID)
+        if crossPlayer:
             continue
         if IsSaveDBViewCache(viewCache):
             continue
@@ -82,14 +98,18 @@
     if playerID < ShareDefine.RealPlayerIDStart:
         #非真实玩家不入库
         return False
+        
+    isCrossServer = GameWorld.IsCrossServer()
     
     #某个功能中不能删除的
-    #...
     
+    if PlayerFamily.IsFamilyNeedViewPlayer(playerID):
+        return True
     
     #排行版上的默认保留
     billboardMgr = DBDataMgr.GetBillboardMgr()
-    for bType in ShareDefine.BillboardTypeAllList:
+    billboardTypeList = ShareDefine.CrossBillboardTypeList if isCrossServer else ShareDefine.BillboardTypeList
+    for bType in billboardTypeList:
         if bType in ShareDefine.FamilyBillboardList:
             continue
         groupList = billboardMgr.GetBillboardGroupList(bType)
@@ -139,8 +159,8 @@
         if updCache:
             curCache = updCache
             
-    # 真实玩家
-    elif playerID >= ShareDefine.RealPlayerIDStart:
+    # 真实玩家,仅游戏服更新,跨服直接使用游戏服同步的简要信息,需要详细信息的时候直接去玩家所在服查询
+    elif playerID >= ShareDefine.RealPlayerIDStart and GameWorld.IsMainServer():
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
         # 本服在线玩家,直接生成新数据
         if curPlayer:
@@ -155,8 +175,7 @@
         # 跨服玩家
         else:
             pass
-            # 跨服玩家,去子服拉取数据,理论上也一定有,但是如果需要拉数据,有一定延迟
-            # 逻辑待扩展
+            # 跨服玩家,游戏服不处理,仅跨服服务器支持获取基础信息,游戏服如果要查看跨服玩家,直接去玩家所在服查询
             
     # 机器人
     #elif ShareDefine.RobotIDStart <= playerID <= ShareDefine.RobotIDMax:
@@ -227,7 +246,7 @@
         return
     
     familyID = curPlayer.GetFamilyID()
-    family = DBDataMgr.GetFamilyMgr().FindFamily(familyID) if familyID else None
+    #familyBase = DBDataMgr.GetFamilyMgr().GetFamilyViewBase(familyID)
     
     tick = GameWorld.GetGameWorld().GetTick()
     curPlayer.SetDict(Key_UpdViewCacheTick, tick)
@@ -243,14 +262,14 @@
     curCache.SetEquipShowSwitch(curPlayer.GetEquipShowSwitch())
     curCache.SetTitleID(PlayerControl.GetTitleID(curPlayer))
     curCache.SetFamilyID(familyID)
-    curCache.SetFamilyName(family.GetName() if family else "")
-    curCache.SetFamilyEmblemID(family.GetEmblemID() if family else 0)
-    curCache.SetFamilyEmblemWord(family.GetEmblemWord() if family else "")
+    #公会信息由公会刷新更新,玩家常规更新不更新公会信息
+    #curCache.SetFamilyName(familyBase.GetName())
+    #curCache.SetFamilyEmblemID(familyBase.GetEmblemID())
+    #curCache.SetFamilyEmblemWord(familyBase.GetEmblemWord())
     curCache.SetFightPowerTotal(PlayerControl.GetFightPower(curPlayer))
     curCache.SetServerID(GameWorld.GetPlayerServerID(curPlayer))
-    if isOffline:
-        curCache.SetOffTime(int(time.time()))
-        
+    curCache.SetOffTime(int(time.time()) if isOffline else 0)
+    
     # 装备
     equipDict = {}
     equipPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
@@ -340,14 +359,25 @@
     curCache.SetEquipShowSwitch(dbPlayer.EquipShowSwitch)
     curCache.SetTitleID(dbPlayer.ExAttr3)
     curCache.SetFamilyID(familyID)
-    family = DBDataMgr.GetFamilyMgr().FindFamily(familyID) if familyID else None
-    curCache.SetFamilyName(family.GetName() if family else "")
-    curCache.SetFamilyEmblemID(family.GetEmblemID() if family else 0)
-    curCache.SetFamilyEmblemWord(family.GetEmblemWord() if family else "")
+    #familyBase = DBDataMgr.GetFamilyMgr().GetFamilyViewBase(familyID)
+    #curCache.SetFamilyName(familyBase.GetName())
+    #curCache.SetFamilyEmblemID(familyBase.GetEmblemID())
+    #curCache.SetFamilyEmblemWord(familyBase.GetEmblemWord())
     curCache.SetFightPowerTotal(dbPlayer.FightPowerEx * ChConfig.Def_PerPointValue + dbPlayer.FightPower)
     curCache.SetServerID(GameWorld.GetAccIDServerID(dbPlayer.AccID))
     curCache.SetOffTime(GameWorld.ChangeTimeStrToNum(dbPlayer.LogoffTime) if dbPlayer.LogoffTime else 0)
     return curCache
+
+def UpdPlayerViewFamilyInfo(playerID, familyID, familyName, emblemID, emblemWord):
+    ## 玩家公会刷新时更新,兼容本服或跨服回传回来更新,跨服自己也更新,本服也更新
+    curCache = DBDataMgr.GetPlayerViewCacheMgr().GetPlayerViewCache(playerID)
+    if not curCache:
+        return
+    curCache.SetFamilyID(familyID)
+    curCache.SetFamilyName(familyName)
+    curCache.SetFamilyEmblemID(emblemID)
+    curCache.SetFamilyEmblemWord(emblemWord)
+    return
 
 def GetPlayerBaseViewInfo(playerID, curPlayer=None):
     ## 获取玩家基础查看信息
@@ -363,6 +393,7 @@
                     "Face":curPlayer.GetFace(),
                     "FacePic":curPlayer.GetFacePic(),
                     "TitleID":PlayerControl.GetTitleID(curPlayer),
+                    "FamilyID":curPlayer.GetFamilyID(),
                     "ServerID":GameWorld.GetPlayerServerID(curPlayer),
                     "FightPower":PlayerControl.GetFightPower(curPlayer),
                     }
@@ -377,10 +408,30 @@
                         "Face":viewCache.GetFace(),
                         "FacePic":viewCache.GetFacePic(),
                         "TitleID":viewCache.GetTitleID(),
+                        "FamilyID":viewCache.GetFamilyID(),
                         "ServerID":viewCache.GetServerID(),
                         "FightPower":viewCache.GetFightPowerTotal(),
                         }
     return baseInfo
+
+def UpdPlayerBaseViewInfo(playerID, baseInfo, isOffline):
+    ## 更新玩家基础查看信息,一般跨服服务器用,由游戏服同步过来
+    viewCacheMgr = DBDataMgr.GetPlayerViewCacheMgr()
+    curCache = viewCacheMgr.GetPlayerViewCache(playerID)
+    if not curCache:
+        curCache = viewCacheMgr.AddPlayerViewCache(playerID)
+    curCache.SetPlayerName(baseInfo.get("Name", curCache.GetPlayerName()))
+    curCache.SetLV(baseInfo.get("LV", curCache.GetLV()))
+    curCache.SetJob(baseInfo.get("Job", curCache.GetJob()))
+    curCache.SetRealmLV(baseInfo.get("RealmLV", curCache.GetRealmLV()))
+    curCache.SetFace(baseInfo.get("Face", curCache.GetFace()))
+    curCache.SetFacePic(baseInfo.get("FacePic", curCache.GetFacePic()))
+    curCache.SetTitleID(baseInfo.get("TitleID", curCache.GetTitleID()))
+    curCache.SetFamilyID(baseInfo.get("FamilyID", curCache.GetFamilyID()))
+    curCache.SetServerID(baseInfo.get("ServerID", curCache.GetServerID()))
+    curCache.SetFightPowerTotal(baseInfo.get("FightPower", curCache.GetFightPowerTotal()))
+    curCache.SetOffTime(int(time.time()) if isOffline else 0)
+    return curCache
 
 def GetRobotByViewCache(curCache):
     ## 根据缓存内容获取机器人数据
@@ -401,36 +452,31 @@
                  }
     return robotDict
 
-def LoadRobot():
-    ## 加载机器人缓存,在服务器启动、重读配置时加载
-    robotFPSortList = []
-    viewCacheMgr = DBDataMgr.GetPlayerViewCacheMgr()
-    ipyDataMgr = IpyGameDataPY.IPY_Data()
-    for index in range(ipyDataMgr.GetRobotCount()):
-        ipyData = ipyDataMgr.GetRobotByIndex(index)
-        robotPlayerID = ipyData.GetID()
-        curCache = viewCacheMgr.GetPlayerViewCache(robotPlayerID)
-        if not curCache:
-            curCache = viewCacheMgr.AddPlayerViewCache(robotPlayerID)
-        if not curCache:
-            continue
-        UpdRobotViewCache(curCache, robotPlayerID, ipyData)
-        robotFPSortList.append([curCache.GetFightPowerTotal(), robotPlayerID])
-    robotFPSortList.sort(reverse=True) # 战力倒序排序
-    IpyGameDataPY.SetConfigEx("robotFPSortList", robotFPSortList)
-    GameWorld.Log("加载机器人战力排序: %s, %s" % (len(robotFPSortList), robotFPSortList))
-    return robotFPSortList
-
-def GetRobotFightPowerSortList():
+def GetRobotFightPowerSortList(tempNum=0):
     ## 机器人战力倒序排序列表
     # @return: 倒序排序列表 [[战力, 机器人ID], ...],外部使用可随机修改,不会打乱原始排序
-    sortList = []
-    robotFPSortList = IpyGameDataPY.GetConfigEx("robotFPSortList")
+    robotFPSortList = IpyGameDataPY.GetConfigEx("robotFPSortList%s" % tempNum)
     if not robotFPSortList:
-        robotFPSortList = LoadRobot()
-    if robotFPSortList:
-        sortList += robotFPSortList
-    return sortList
+        robotFPSortList = []
+        viewCacheMgr = DBDataMgr.GetPlayerViewCacheMgr()
+        ipyDataMgr = IpyGameDataPY.IPY_Data()
+        for index in range(ipyDataMgr.GetRobotCount()):
+            ipyData = ipyDataMgr.GetRobotByIndex(index)
+            if ipyData.GetTempNum() != tempNum:
+                continue
+            robotPlayerID = ipyData.GetID()
+            curCache = viewCacheMgr.GetPlayerViewCache(robotPlayerID)
+            if not curCache:
+                curCache = viewCacheMgr.AddPlayerViewCache(robotPlayerID)
+            if not curCache:
+                continue
+            UpdRobotViewCache(curCache, robotPlayerID, ipyData)
+            robotFPSortList.append([curCache.GetFightPowerTotal(), robotPlayerID])
+        robotFPSortList.sort(reverse=True) # 战力倒序排序
+        IpyGameDataPY.SetConfigEx("robotFPSortList%s" % tempNum, robotFPSortList)
+        GameWorld.Log("加载机器人战力排序: tempNum=%s,%s, %s" % (tempNum, len(robotFPSortList), robotFPSortList))
+        
+    return robotFPSortList
 
 def UpdRobotViewCache(curCache, robotID, robotIpyData=None):
     ## 更新机器人查看缓存
@@ -444,11 +490,11 @@
         return
     
     #curCache.SetAccID(dbPlayer.AccID)
-    
+    realmLV = robotIpyData.GetRealmLV()
     curCache.SetPlayerName(GameWorld.GbkToCode(robotIpyData.GetRobotName()))
     curCache.SetLV(robotInfo.get("LV", 1))
     curCache.SetJob(robotInfo.get("Job", 1))
-    curCache.SetRealmLV(robotInfo.get("RealmLV", 0))
+    curCache.SetRealmLV(realmLV if realmLV else robotInfo.get("RealmLV", 0))
     curCache.SetFace(robotInfo.get("Face", 0))
     curCache.SetFacePic(robotInfo.get("FacePic", 0))
     curCache.SetTitleID(robotInfo.get("TitleID", 0))
@@ -471,30 +517,34 @@
 #{
 #    tagHead        Head;
 #    DWORD        PlayerID;
-#    BYTE        EquipClassLV;    //大于0为查看指定境界阶装备信息,  0为查看默认信息
+#    DWORD        ServerID;        //玩家服务器ID,发0默认本服玩家
 #};
 def OnCMViewPlayerInfo(index, clientPack, tick):
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+    playerID = curPlayer.GetPlayerID()
     
-    findPlayerID = clientPack.PlayerID
-    #equipClassLV = clientPack.EquipClassLV
+    tagPlayerID = clientPack.PlayerID
+    tagServerID = clientPack.ServerID
     
-    clientPack = GetPack_ViewCache(findPlayerID)
-    if clientPack:
-        NetPackCommon.SendFakePack(curPlayer, clientPack)
-        return
-    if GameWorld.GetDBPlayerAccIDByID(findPlayerID):
-        PlayerControl.NotifyCode(curPlayer, "ViewPlayer_OffLine")
+    # 本服或主服是本服
+    if not tagServerID or tagServerID == GameWorld.GetGameWorld().GetServerID() or playerID < ShareDefine.RealPlayerIDStart:
+        NetPackCommon.SendFakePack(curPlayer, GetPack_ViewCache(tagPlayerID))
         return
     
-    # 跨服玩家发送跨服查询,待扩展...
-    
+    # 直接去目标服务器查询
+    CrossMsg.SendToServer(ShareDefine.S2S_ViewTagPlayer, {"tagPlayerID":tagPlayerID}, [tagServerID], ShareDefine.dirType_All, playerID)
+    return
+
+def S2S_ViewTagPlayer(dataMsg, fromServerID, playerID):
+    tagPlayerID = dataMsg["tagPlayerID"]
+    CrossPlayer.SendFakePackByID(playerID, GetPack_ViewCache(tagPlayerID), fromServerID)
     return
 
 def GetPack_ViewCache(playerID):
     ## 获取同步封包 - 玩家查看缓存
     curCache = FindViewCache(playerID)
     if not curCache:
+        GameWorld.ErrLog("查看玩家找不到目标! playerID=%s" % playerID)
         return
     clientPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
     clientPack.PlayerID = curCache.GetPlayerID()
@@ -510,10 +560,15 @@
     clientPack.ServerID = curCache.GetServerID()
     clientPack.FightPower = curCache.GetFightPower()
     clientPack.FightPowerEx = curCache.GetFightPowerEx()
-    clientPack.FamilyID = curCache.GetFamilyID()
+    familyID = curCache.GetFamilyID()
+    familyDataServerID = DBDataMgr.GetFamilyMgr().GetCurCrossServerID()
+    if familyDataServerID <= 0:
+        familyDataServerID = GameWorld.GetGameWorld().GetServerID() # 公会未跨服时默认就是玩家所在服
+    clientPack.FamilyID = familyID
     clientPack.FamilyName = curCache.GetFamilyName()
     clientPack.FamilyEmblemID = curCache.GetFamilyEmblemID()
     clientPack.FamilyEmblemWord = curCache.GetFamilyEmblemWord()
+    clientPack.FamilyDataServerID = familyDataServerID
     clientPack.PlusData = curCache.GetPlusData()
     clientPack.PlusDataSize = len(clientPack.PlusData)
     return clientPack

--
Gitblit v1.8.0