From f2cf64ffabcd15d5497aee8914b8d37d8b9a88b0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 07 二月 2026 15:39:43 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端（公会GM命令支持跨服 CreateFamily、Family、Zhenbaoge；跨服公会聊天支持，包含公会聊天缓存；查看玩家A705回包增加公会所在服务器ID信息；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py | 321 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 262 insertions(+), 59 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 1201f24..253e252 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
@@ -18,14 +18,21 @@
import ChConfig
import GameWorld
import PyMongoMain
+import CrossPlayer
+import PlayerFamily
import PlayerControl
import NetPackCommon
import ChPyNetSendPack
import IpyGameDataPY
import IPY_GameWorld
+import PlayerOnline
+import PlayerPreset
+import PlayerBeauty
+import PlayerGubao
import ShareDefine
import TurnAttack
import DBDataMgr
+import CrossMsg
import random
import time
@@ -37,8 +44,6 @@
return
def OnPlayerLogout(curPlayer):
- if curPlayer.GetLV() < IpyGameDataPY.GetFuncCfg("PlayerViewCache", 1):
- return
playerID = curPlayer.GetPlayerID()
curCache = FindViewCache(playerID)
@@ -52,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
@@ -80,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)
@@ -112,6 +134,17 @@
return False
+def FindBattleViewCache(playerID):
+ ## 获取可战斗的玩家缓存
+ # @return: None-无；curCache-有返回该缓存对象
+ curCache = FindViewCache(playerID)
+ if not curCache:
+ return
+ plusDict = curCache.GetPlusDict()
+ if "Lineup" not in plusDict:
+ return
+ return curCache
+
def FindViewCache(playerID):
'''查找玩家缓存，如果不存在，则会有额外逻辑，如从redis、db直接找，
本服玩家理论上一定有查看缓存，因为如果不存在会直接从db读，除非该玩家数据被删除
@@ -126,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:
@@ -142,30 +175,48 @@
# 跨服玩家
else:
pass
- # 跨服玩家，去子服拉取数据，理论上也一定有，但是如果需要拉数据，有一定延迟
- # 逻辑待扩展
+ # 跨服玩家，游戏服不处理，仅跨服服务器支持获取基础信息，游戏服如果要查看跨服玩家，直接去玩家所在服查询
# 机器人
- elif ShareDefine.RobotIDStart <= playerID <= ShareDefine.RobotIDMax:
- curCache = UpdRobotViewCache(playerID)
+ #elif ShareDefine.RobotIDStart <= playerID <= ShareDefine.RobotIDMax:
+ elif IpyGameDataPY.GetIpyGameDataNotLog("Robot", playerID):
+ GameWorld.DebugLog("加载机器人缓存: %s" % playerID)
+ curCache = viewCacheMgr.AddPlayerViewCache(playerID)
+ curCache = UpdRobotViewCache(curCache, playerID)
# 假玩家，默认添加
elif ShareDefine.FackPlayerIDStart <= playerID <= ShareDefine.FackPlayerIDMax:
- serverID = playerID % 100 + 1 # 1 ~ 100 服
- accID = "fake%s@test@s%s" % (playerID, serverID)
- fightPower = random.randint(1000000, 100000000) # 先随机，外层有需要的话再自己设置
+ GameWorld.DebugLog("加载假玩家缓存: %s" % playerID)
+ # 随机复制个机器人数据
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ robotIpyData = ipyDataMgr.GetRobotByIndex(random.randint(0, ipyDataMgr.GetRobotCount() - 1))
curCache = viewCacheMgr.AddPlayerViewCache(playerID)
- curCache.SetPlayerName("%s%s" % (GameWorld.GbkToCode("神秘道友"), playerID))
+ curCache = UpdRobotViewCache(curCache, robotIpyData.GetID())
+
+ # 再覆盖部分数据
+ serverID = playerID % 100 + 1 # 1 ~ 100 服
+ accID = "fake%s@test@s%s" % (playerID, serverID)
+ #fightPower = random.randint(1000000, 100000000) # 先随机，外层有需要的话再自己设置
+
+ curCache.SetPlayerName("%s%s" % (GameWorld.GbkToCode("主公"), playerID))
curCache.SetAccID(accID)
- curCache.SetLV(random.randint(100, 200))
- curCache.SetJob(random.randint(1, 2))
- curCache.SetRealmLV(random.randint(5, 15))
- curCache.SetFightPowerTotal(fightPower)
curCache.SetServerID(serverID)
+ #curCache.SetLV(random.randint(100, 200))
+ #curCache.SetJob(random.randint(1, 2))
+ #curCache.SetRealmLV(random.randint(5, 15))
+ #curCache.SetFightPowerTotal(fightPower)
curCache.SetOffTime(int(time.time()) - random.randint(1, 3600 * 24 * 10)) # 随机离线 0~10天
return curCache
+
+#def ResetCacheUpdTickByPresetSwitch(curPlayer, batPresetID):
+# for batPresetType in ChConfig.MapDefBatPresetTypeDict.values():
+# if batPresetID == PlayerPreset.GetBatPresetID(curPlayer, batPresetType):
+# curPlayer.SetDict(Key_UpdViewCacheTick, 0)
+# GameWorld.DebugLogEx("功能战斗缓存用到该流派预设，重置缓存刷新CD! batPresetType=%s,batPresetID=%s", batPresetType, batPresetID)
+# break
+# return
def __CheckUpdViewCache(playerID):
if playerID < ShareDefine.RealPlayerIDStart:
@@ -194,6 +245,9 @@
if not curCache:
return
+ familyID = curPlayer.GetFamilyID()
+ #familyBase = DBDataMgr.GetFamilyMgr().GetFamilyViewBase(familyID)
+
tick = GameWorld.GetGameWorld().GetTick()
curPlayer.SetDict(Key_UpdViewCacheTick, tick)
#GameWorld.DebugLog("更新玩家查看缓存数据! isOffline=%s" % isOffline, playerID)
@@ -205,15 +259,17 @@
curCache.SetFace(curPlayer.GetFace())
curCache.SetFacePic(curPlayer.GetFacePic())
curCache.SetModelMark(curPlayer.GetModelMark())
- curCache.SetFamilyID(curPlayer.GetFamilyID())
- curCache.SetFamilyName(curPlayer.GetFamilyName())
- curCache.SetFamilyEmblemID(PlayerControl.GetFamilyEmblemID(curPlayer))
+ curCache.SetEquipShowSwitch(curPlayer.GetEquipShowSwitch())
curCache.SetTitleID(PlayerControl.GetTitleID(curPlayer))
+ curCache.SetFamilyID(familyID)
+ #公会信息由公会刷新更新，玩家常规更新不更新公会信息
+ #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)
@@ -226,17 +282,54 @@
continue
equipDict["%s" % equipIndex] = {"ItemID":curEquip.GetItemTypeID(), "UserData":curEquip.GetUserData()}
- # 阵容
- lineupDict = {}
- for lineupID in ShareDefine.LineupList:
- lineupInfo = TurnAttack.GetPlayerLineupInfo(curPlayer, lineupID)
- if not lineupInfo:
- continue
- lineupDict["%s" % lineupID] = lineupInfo
+ olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
- # 其他
+ # 预设、阵容
+ batPresetDict = {} # 战斗预设方案组合 {"战斗功能预设":{"功能方案预设":功能预设ID, ...}, ...}
+ lineupDict, mgPresetDict = {}, {}
+ for batPresetType in ShareDefine.NeedCacheBatPresetList:
+ batPresetID = PlayerPreset.GetBatPresetID(curPlayer, batPresetType)
+ #武将方案包含在 lineupInfo 里了，所以不用再取武将预设方案
+ #heroPresetID = PlayerPreset.GetFuncPresetID(curPlayer, batPresetID, ShareDefine.FuncPreset_Hero)
+ mgPresetID = PlayerPreset.GetFuncPresetID(curPlayer, batPresetID, ShareDefine.FuncPreset_Mingge)
+
+ # 战斗预设方案组合 {"战斗功能预设":{"功能方案预设":功能预设ID, ...}, ...}
+ batPresetDict["%s" % batPresetType] = {str(ShareDefine.FuncPreset_Battle):batPresetID,
+ str(ShareDefine.FuncPreset_Mingge):mgPresetID,
+ }
+
+ lineupInfo = TurnAttack.GetPlayerLineupInfo(curPlayer, batPresetType)
+ if lineupInfo:
+ batPresetID = lineupInfo.get("BatPresetID", batPresetID)
+ if str(batPresetID) not in lineupDict:
+ lineupDict["%s" % batPresetID] = lineupInfo
+
+ # 命格方案
+ attrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Mingge, mgPresetID)
+ skillLVDict = olPlayer.GetCalcSpecInfo(ChConfig.Def_CalcAttr_Mingge, mgPresetID)
+ mgPresetDict["%s" % mgPresetID] = {"Attr":{str(k):v for k, v in attrDict.items()}, "Skill":skillLVDict}
+
+ # 命格：感悟境界等级、属性、已激活意象效果和层数
+ minggeDict = {"GWLV":curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MGGanwuLV), "Preset":mgPresetDict}
- plusDict= {"Equip":equipDict, "Lineup":lineupDict}
+ # 古宝：数量、属性
+ attrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Gubao)
+ actCnt = PlayerGubao.GetGubaoTotalCnt(curPlayer)
+ gubaoDict = {"Cnt":actCnt, "Attr":{str(k):v for k, v in attrDict.items()}}
+
+ # 红颜
+ attrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Beauty)
+ actCnt = PlayerBeauty.GetBeautyActCnt(curPlayer)
+ beautyDict = {"Cnt":actCnt, "Attr":{str(k):v for k, v in attrDict.items()}}
+
+ # 坐骑
+ attrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Horse)
+ horseLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseLV)
+ classLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)
+ horseDict = {"LV":horseLV, "ClassLV":classLV, "Attr":{str(k):v for k, v in attrDict.items()}}
+
+ plusDict = {"Equip":equipDict, "BatPreset":batPresetDict, "Lineup":lineupDict, "Mingge":minggeDict,
+ "Beauty":beautyDict, "Horse":horseDict, "Gubao":gubaoDict}
curCache.SetPlusDict(plusDict)
return curCache
@@ -263,14 +356,81 @@
curCache.SetFace(dbPlayer.Face)
curCache.SetFacePic(dbPlayer.FacePic)
curCache.SetModelMark(dbPlayer.ModelMark)
+ curCache.SetEquipShowSwitch(dbPlayer.EquipShowSwitch)
+ curCache.SetTitleID(dbPlayer.ExAttr3)
curCache.SetFamilyID(familyID)
- family = DBDataMgr.GetFamilyMgr().FindFamily(familyID)
- curCache.SetFamilyName(family.GetName() if family else "")
- curCache.SetFamilyEmblemID(family.GetEmblemID() if family else 0)
- #curCache.SetTitleID(PlayerControl.GetTitleID(curPlayer))
+ #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):
+ ## 获取玩家基础查看信息
+ baseInfo = {}
+ if not curPlayer:
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if curPlayer:
+ baseInfo = {
+ "Name":curPlayer.GetPlayerName(),
+ "LV":curPlayer.GetLV(),
+ "Job":curPlayer.GetJob(),
+ "RealmLV":curPlayer.GetOfficialRank(),
+ "Face":curPlayer.GetFace(),
+ "FacePic":curPlayer.GetFacePic(),
+ "TitleID":PlayerControl.GetTitleID(curPlayer),
+ "FamilyID":curPlayer.GetFamilyID(),
+ "ServerID":GameWorld.GetPlayerServerID(curPlayer),
+ "FightPower":PlayerControl.GetFightPower(curPlayer),
+ }
+ else:
+ viewCache = FindViewCache(playerID)
+ if viewCache:
+ baseInfo = {
+ "Name":viewCache.GetPlayerName(),
+ "LV":viewCache.GetLV(),
+ "Job":viewCache.GetJob(),
+ "RealmLV":viewCache.GetRealmLV(),
+ "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):
@@ -284,15 +444,49 @@
"RealmLV" : curCache.GetRealmLV(),
"Face" : curCache.GetFace(),
"FacePic" : curCache.GetFacePic(),
+ "TitleID" : curCache.GetTitleID(),
"ModelMark" : curCache.GetModelMark(),
+ "EquipShowSwitch" : curCache.GetEquipShowSwitch(),
"FightPower" : curCache.GetFightPowerTotal(),
"PlusData" : curCache.GetPlusDict(),
}
return robotDict
-def UpdRobotViewCache(robotID):
+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():
+ ## 机器人战力倒序排序列表
+ # @return: 倒序排序列表 [[战力, 机器人ID], ...]，外部使用可随机修改，不会打乱原始排序
+ sortList = []
+ robotFPSortList = IpyGameDataPY.GetConfigEx("robotFPSortList")
+ if not robotFPSortList:
+ robotFPSortList = LoadRobot()
+ if robotFPSortList:
+ sortList += robotFPSortList
+ return sortList
+
+def UpdRobotViewCache(curCache, robotID, robotIpyData=None):
## 更新机器人查看缓存
- robotIpyData = IpyGameDataPY.GetIpyGameData("Robot", robotID)
+ if not robotIpyData:
+ robotIpyData = IpyGameDataPY.GetIpyGameData("Robot", robotID)
if not robotIpyData:
return
try:
@@ -300,19 +494,17 @@
except:
return
- viewCacheMgr = DBDataMgr.GetPlayerViewCacheMgr()
- curCache = viewCacheMgr.GetPlayerViewCache(robotID)
- if not curCache:
- curCache = viewCacheMgr.AddPlayerViewCache(robotID)
#curCache.SetAccID(dbPlayer.AccID)
- curCache.SetPlayerName(robotInfo.get("PlayerName", "p%s" % robotID))
+ 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.SetFace(robotInfo.get("Face", 0))
curCache.SetFacePic(robotInfo.get("FacePic", 0))
+ curCache.SetTitleID(robotInfo.get("TitleID", 0))
curCache.SetModelMark(robotInfo.get("ModelMark", 0))
+ curCache.SetEquipShowSwitch(robotInfo.get("EquipShowSwitch", 0))
#机器人暂定没有仙盟、称号
#curCache.SetFamilyID(familyID)
#family = DBDataMgr.GetFamilyMgr().FindFamily(familyID)
@@ -330,30 +522,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():
+ 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()
@@ -364,13 +560,20 @@
clientPack.Face = curCache.GetFace()
clientPack.FacePic = curCache.GetFacePic()
clientPack.ModelMark = curCache.GetModelMark()
+ clientPack.EquipShowSwitch = curCache.GetEquipShowSwitch()
clientPack.TitleID = curCache.GetTitleID()
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