From bc433db8262081f0400bcb9c2c3476000662daf3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 七月 2024 14:24:53 +0800
Subject: [PATCH] 10205 【越南】【主干】【港台】【砍树】自选礼包(支持一次性放入超65535个数叠加物品;邮件同步支持一次性领取超65535个数叠加物品)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
index 4c596ad..5d8626c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
@@ -19,6 +19,7 @@
 #---------------------------------------------------------------------
 
 import GameWorld
+import GameWorship
 import PlayerControl
 import NetPackCommon
 import GameWorldArena
@@ -53,6 +54,9 @@
         return True
     
     if CrossChampionship.IsChampionshipPlayer(playerID):
+        return True
+    
+    if GameWorship.IsWorshipPlayer(playerID):
         return True
     
     if GameWorldSkyTower.IsSkyTowerPassPlayer(playerID):
@@ -148,6 +152,8 @@
 
 def GetCachePropDataDict(curCache):
     ## 获取缓存基础属性字典信息
+    if not curCache:
+        return {}
     if not hasattr(curCache, "PropDataDict"):
         curCache.PropDataDict = {}
     if not curCache.PropDataDict and curCache.PropData:
@@ -192,12 +198,7 @@
         return
     curCache.LV = curPackData.PlayerLV
     curCache.OffTime = curPackData.OffTime
-    if isLogout:
-        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
-        if curPlayer:
-            curCache.GeTuiID = curPlayer.GetGeTuiClientID()
-            curCache.GeTuiIDSize = len(curCache.GeTuiID)
-            
+    
     curCache.PropDataDict = {} # 每次更新数据时,重置字典缓存,下次获取时重新eval缓存
     curCache.PropData = curPackData.PropData
     curCache.PropDataSize = curPackData.PropDataSize
@@ -319,6 +320,7 @@
             answerPack.RealmLV = 1
             answerPack.OnlineType = ChConfig.Def_Offline
             answerPack.ServerGroupID = 0
+            answerPack.Face = 0
         else:
             cacheDict = GetCachePropDataDict(curCache)
             answerPack.PlayerID = clientPack.PlayerID
@@ -327,6 +329,7 @@
             answerPack.LV = cacheDict["LV"]
             answerPack.RealmLV = cacheDict["RealmLV"]
             answerPack.OnlineType = ChConfig.Def_Offline
+            answerPack.Face = cacheDict.get("Face", 0)
             
             if GameWorld.IsCrossServer():
                 answerPack.ServerGroupID = cacheDict.get("ServerGroupID", 0)
@@ -341,6 +344,7 @@
         answerPack.OnlineType = ChConfig.Def_Online
         answerPack.IsInTeam = tagPlayer.GetTeamID() > 0
         answerPack.ServerGroupID = PlayerControl.GetPlayerServerGroupID(tagPlayer)
+        answerPack.Face = tagPlayer.GetFace()
 
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
     NetPackCommon.SendFakePack(curPlayer, answerPack)

--
Gitblit v1.8.0