From 067c557365c6a749f6f41f5d8cad8ce9e941c80f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 14 十月 2025 18:07:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..f5c5daf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
@@ -194,6 +194,9 @@
if not curCache:
return
+ familyID = curPlayer.GetFamilyID()
+ family = DBDataMgr.GetFamilyMgr().FindFamily(familyID) if familyID else None
+
tick = GameWorld.GetGameWorld().GetTick()
curPlayer.SetDict(Key_UpdViewCacheTick, tick)
#GameWorld.DebugLog("更新玩家查看缓存数据! isOffline=%s" % isOffline, playerID)
@@ -205,9 +208,10 @@
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.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.SetTitleID(PlayerControl.GetTitleID(curPlayer))
curCache.SetFightPowerTotal(PlayerControl.GetFightPower(curPlayer))
curCache.SetServerID(GameWorld.GetPlayerServerID(curPlayer))
@@ -264,9 +268,10 @@
curCache.SetFacePic(dbPlayer.FacePic)
curCache.SetModelMark(dbPlayer.ModelMark)
curCache.SetFamilyID(familyID)
- family = DBDataMgr.GetFamilyMgr().FindFamily(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 "")
#curCache.SetTitleID(PlayerControl.GetTitleID(curPlayer))
curCache.SetFightPowerTotal(dbPlayer.FightPowerEx * ChConfig.Def_PerPointValue + dbPlayer.FightPower)
curCache.SetServerID(GameWorld.GetAccIDServerID(dbPlayer.AccID))
@@ -371,6 +376,7 @@
clientPack.FamilyID = curCache.GetFamilyID()
clientPack.FamilyName = curCache.GetFamilyName()
clientPack.FamilyEmblemID = curCache.GetFamilyEmblemID()
+ clientPack.FamilyEmblemWord = curCache.GetFamilyEmblemWord()
clientPack.PlusData = curCache.GetPlusData()
clientPack.PlusDataSize = len(clientPack.PlusData)
return clientPack
--
Gitblit v1.8.0