From 6a875d29696c5625a779a379b0de523b2383d7ef Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 十一月 2024 16:41:11 +0800
Subject: [PATCH] 10312 【越南】【英文】【bt】【砍树】查看跨服玩家数据向对应子服查询

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index eb0409a..9fe85d6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -23,6 +23,7 @@
 import PlayerFuncTeam
 import CrossLuckyCloudBuy
 import IPY_GameServer
+import PlayerViewCache
 import CrossRealmPlayer
 import PlayerCompensation
 import PlayerActBossTrial
@@ -66,7 +67,7 @@
     if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
         GameWorld.ErrLog("服务器未启动好,不允许向跨服服务器发送数据! %s" % (srcMsg))
         return
-    GameWorld.Log("SendMsgToCrossServer => %s" % (srcMsg))   
+    GameWorld.Log("SendMsgToCrossServer => %s, %s" % (msgType, srcMsg))   
     GameWorld.GetGameWorld().SendMergerChildToCenterStringData(sendMsg, len(sendMsg))
     return
 
@@ -78,11 +79,11 @@
             return
         msgDict = cPickle.loads(recvMsg)
         
-        GameWorld.Log("OnCrossServerReceiveMsg: %s" % msgDict)
-        
         msgType = msgDict.get("MsgType", -1)    
         msgData = msgDict.get("Data", "")
         serverGroupID = msgDict.get("ServerGroupID", 0)
+        
+        GameWorld.Log("OnCrossServerReceiveMsg: %s, %s, %s" % (msgType, serverGroupID, msgDict))
         
         if msgType == ShareDefine.ClientServerMsg_PKMatch:
             CrossRealmPK.ClientServerMsg_PKMatch(serverGroupID, msgData, tick)
@@ -124,7 +125,10 @@
             ClientServerMsg_ServerInitOK(serverGroupID, tick)
             
         elif msgType == ShareDefine.ClientServerMsg_ViewPlayerCache:
-            CrossRealmPlayer.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)
+            PlayerViewCache.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_PushPlayerCache:
+            PlayerViewCache.ClientServerMsg_PushPlayerCache(serverGroupID, msgData)
             
         elif msgType == ShareDefine.ClientServerMsg_PullOtherPlayerPackData:
             PlayerPackData.ClientServerMsg_PullOtherPlayerPackData(serverGroupID, msgData)
@@ -310,7 +314,7 @@
     if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
         GameWorld.ErrLog("跨服服务器未启动好,不允许向子服发送数据! serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
         return
-    GameWorld.Log("SendMsgToClientServer => serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
+    GameWorld.Log("SendMsgToClientServer => %s, %s, %s" % (msgType, serverGroupIDList, srcMsg))
     if not serverGroupIDList:
         GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg, len(sendMsg))
     else:
@@ -335,7 +339,7 @@
         msgType = msgDict.get("MsgType", -1)    
         msgData = msgDict.get("Data", "")
         crossServerTimeStr = msgDict.get("CrossServerTime", "")
-        GameWorld.Log("OnClientServerReceiveMsg: %s" % msgDict)
+        GameWorld.Log("OnClientServerReceiveMsg: %s, %s" % (msgType, msgDict))
         if crossServerTimeStr:
             curServerTime = int(time.time())
             crossServerTime = GameWorld.ChangeTimeStrToNum(crossServerTimeStr)
@@ -363,7 +367,10 @@
             PlayerTalk.CrossServerMsg_ChatCrossWorld(msgData)
             
         elif msgType == ShareDefine.CrossServerMsg_ViewPlayerCacheRet:
-            CrossRealmPlayer.CrossServerMsg_ViewPlayerCacheRet(msgData, tick)
+            PlayerViewCache.CrossServerMsg_ViewPlayerCacheRet(msgData, tick)
+            
+        elif msgType == ShareDefine.CrossServerMsg_PullPlayerViewCache:
+            PlayerViewCache.CrossServerMsg_PullPlayerViewCache(msgData)
             
         elif msgType == ShareDefine.CrossServerMsg_PlayerPackDataState:
             PlayerPackData.CrossServerMsg_PlayerPackDataState(msgData)

--
Gitblit v1.8.0