From 1044d94e5c6ae6bd197864f854f5c29b4b7e8734 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 24 二月 2025 11:53:50 +0800
Subject: [PATCH] 10337 【越南】【英语】【BT】【GM】【砍树】爬塔通关类的支持一键过关(战力不足时提示TaskFeedback4)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py |  325 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 284 insertions(+), 41 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index 05939f6..8c11841 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -17,23 +17,47 @@
 
 import GameWorld
 import ShareDefine
+import PlayerAssist
 import PlayerControl
+import PlayerPackData
+import PlayerFuncTeam
+import CrossLuckyCloudBuy
 import IPY_GameServer
+import PlayerViewCache
 import CrossRealmPlayer
 import PlayerCompensation
+import PlayerActBossTrial
+import PlayerActXianXiaMJ
+import PlayerActGubao
+import PlayerActHorsePetTrain
+import PlayerActLianqi
 import CrossActionControl
+import CrossActAllRecharge
+import CrossFamilyFlagwar
+import CrossChampionship
+import CrossBattlefield
 import CrossBillboard
+import CrossYaomoBoss
 import GameWorldBoss
 import CrossRealmPK
+import GameXiangong
+import GameWorship
 import PlayerQuery
 import PlayerTalk
+import PyGameData
 import CrossBoss
 import ChConfig
+import ChPlayer
 import PlayerFB
 import GMShell
 
 import traceback
 import cPickle
+import time
+
+# 仅输出简短日志的信息类型
+ClientServerMsg_ShortLogTypeList = [ShareDefine.ClientServerMsg_PushPlayerCache, ShareDefine.ClientServerMsg_PlayerPackData]
+CrossServerMsg_ShortLogTypeList = [ShareDefine.CrossServerMsg_PushPlayerPackData, ShareDefine.CrossServerMsg_ViewPlayerCacheRet]
 
 def SendMsgToCrossServer(msgType, dataMsg):
     ## 发送信息到跨服服务器上
@@ -48,39 +72,53 @@
     if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
         GameWorld.ErrLog("服务器未启动好,不允许向跨服服务器发送数据! %s" % (srcMsg))
         return
-    GameWorld.Log("SendMsgToCrossServer => %s" % (srcMsg))   
+    if msgType in ClientServerMsg_ShortLogTypeList:
+        playerID = 0
+        if isinstance(dataMsg, dict):
+            playerID = dataMsg.get("playerID", 0)
+            if not playerID:
+                playerID = dataMsg.get("PlayerID", 0)
+        msgLen = len(str(srcMsg))
+        GameWorld.Log("SendMsgToCrossServer => %s, playerID=%s,msgLen=%s" % (msgType, playerID, msgLen))
+    else:
+        GameWorld.Log("SendMsgToCrossServer => %s, %s" % (msgType, srcMsg))
     GameWorld.GetGameWorld().SendMergerChildToCenterStringData(sendMsg, len(sendMsg))
     return
 
 def OnCrossServerReceiveMsg(recvMsg, tick):
     ## 跨服服务器收到信息处理
     try:
-        GameWorld.Log("收到OnCrossServerReceiveMsg" )
         if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
             GameWorld.Log("服务器未启动好,不处理子服信息!")
             return
         msgDict = cPickle.loads(recvMsg)
         
-        GameWorld.Log("OnCrossServerReceiveMsg: %s" % msgDict)
-        
         msgType = msgDict.get("MsgType", -1)    
         msgData = msgDict.get("Data", "")
         serverGroupID = msgDict.get("ServerGroupID", 0)
         
+        if msgType in ClientServerMsg_ShortLogTypeList:
+            playerID = 0
+            if isinstance(msgData, dict):
+                playerID = msgData.get("playerID", 0)
+                if not playerID:
+                    playerID = msgData.get("PlayerID", 0)
+            msgLen = len(str(msgDict))
+            GameWorld.Log("OnCrossServerReceiveMsg: %s, serverGroupID=%s,playerID=%s,msgLen=%s" % (msgType, serverGroupID, playerID, msgLen))
+        else:
+            GameWorld.Log("OnCrossServerReceiveMsg: %s, serverGroupID=%s, %s" % (msgType, serverGroupID, msgDict))
+            
         if msgType == ShareDefine.ClientServerMsg_PKMatch:
             CrossRealmPK.ClientServerMsg_PKMatch(serverGroupID, msgData, tick)
             
-        elif msgType == ShareDefine.ClientServerMsg_PKRobotOver:
-            CrossRealmPK.ClientServerMsg_PKRobotOver(serverGroupID, msgData, tick)
-            
-        elif msgType == ShareDefine.ClientServerMsg_PKCancel:
-            CrossRealmPK.ClientServerMsg_PKCancel(msgData, tick)
-            
-        elif msgType == ShareDefine.ClientServerMsg_PKPrepareOK:
-            CrossRealmPK.ClientServerMsg_PKPrepareOK(msgData, tick)
+        elif msgType == ShareDefine.ClientServerMsg_PKOver:
+            CrossRealmPK.ClientServerMsg_PKOver(serverGroupID, msgData, tick)
             
         elif msgType == ShareDefine.ClientServerMsg_PKBillboard:
             CrossRealmPK.ClientServerMsg_PKBillboard(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_LuckyCloudBuy:
+            CrossLuckyCloudBuy.ClientServerMsg_LuckyCloudBuy(serverGroupID, msgData)
             
         elif msgType == ShareDefine.ClientServerMsg_QueryBillboard:
             CrossBillboard.ClientServerMsg_QueryBillboard(serverGroupID, msgData)
@@ -93,7 +131,10 @@
             
         elif msgType == ShareDefine.ClientServerMsg_ChatCrossWorld:
             PlayerTalk.ClientServerMsg_ChatCrossWorld(serverGroupID, msgData, tick)
-                        
+            
+        elif msgType == ShareDefine.ClientServerMsg_PlayerLoginout:
+            ChPlayer.ClientServerMsg_PlayerLoginout(serverGroupID, msgData)
+            
         elif msgType == ShareDefine.ClientServerMsg_GMCMD:
             GMShell.ClientServerMsg_GMCMD(msgData, tick)
             
@@ -101,7 +142,16 @@
             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)
+            
+        elif msgType == ShareDefine.ClientServerMsg_PlayerPackData:
+            PlayerPackData.ClientServerMsg_PlayerPackData(serverGroupID, msgData)
             
         elif msgType == ShareDefine.ClientServerMsg_QueryNPCInfo:
             PlayerQuery.ClientServerMsg_QueryNPCInfo(serverGroupID, msgData)
@@ -115,6 +165,81 @@
         elif msgType == ShareDefine.ClientServerMsg_AddBuff:
             MapServer_CrossAddBuff(msgData)
             
+        elif msgType == ShareDefine.ClientServerMsg_CrossAssist:
+            PlayerAssist.ClientServerMsg_CrossAssist(serverGroupID, msgData, tick)
+            
+        elif msgType == ShareDefine.ClientServerMsg_BattlefieldBuyOpen:
+            CrossBattlefield.ClientServerMsg_BattlefieldBuyOpen(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_BattlefieldCallJoin:
+            CrossBattlefield.ClientServerMsg_BattlefieldCallJoin(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_BattlefieldCallKick:
+            CrossBattlefield.ClientServerMsg_BattlefieldCallKick(serverGroupID, msgData)
+                        
+        elif msgType == ShareDefine.ClientServerMsg_BattlefieldCallChange:
+            CrossBattlefield.ClientServerMsg_BattlefieldCallChange(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ChampionshipPKOver:
+            CrossChampionship.ClientServerMsg_ChampionshipPKOver(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ChampionshipOfficialApply:
+            CrossChampionship.ClientServerMsg_ChampionshipOfficialApply(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ChampionshipOfficialApplyReply:
+            CrossChampionship.ClientServerMsg_ChampionshipOfficialApplyReply(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ChampionshipOfficialKick:
+            CrossChampionship.ClientServerMsg_ChampionshipOfficialKick(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ChampionshipOfficialLeave:
+            CrossChampionship.ClientServerMsg_ChampionshipOfficialLeave(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ChampionshipOfficialChallenge:
+            CrossChampionship.ClientServerMsg_ChampionshipOfficialChallenge(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ChampionshipGuess:
+            CrossChampionship.ClientServerMsg_ChampionshipGuess(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ChampionshipWorship:
+            CrossChampionship.ClientServerMsg_ChampionshipWorship(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ActAllRechargeValue:
+            CrossActAllRecharge.ClientServerMsg_ActAllRechargeValue(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_CrossYaomoBossHurtAward:
+            CrossYaomoBoss.ClientServerMsg_CrossYaomoBossHurtAward(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_BossTrialSubmit:
+            PlayerActBossTrial.ClientServerMsg_BossTrialSubmit(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_XianXiaMJScore:
+            PlayerActXianXiaMJ.ClientServerMsg_XianXiaMJScore(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_GubaoScore:
+            PlayerActGubao.ClientServerMsg_GubaoScore(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_HorsePetTrainScore:
+            PlayerActHorsePetTrain.ClientServerMsg_HorsePetTrainScore(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_LianqiScore:
+            PlayerActLianqi.ClientServerMsg_LianqiScore(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_CreateFuncTeam:
+            PlayerFuncTeam.ClientServerMsg_CreateFuncTeam(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_ChangeFuncTeam:
+            PlayerFuncTeam.ClientServerMsg_ChangeFuncTeam(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_FuncTeamMemOP:
+            PlayerFuncTeam.ClientServerMsg_FuncTeamMemOP(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_QueryFuncTeam:
+            PlayerFuncTeam.ClientServerMsg_QueryFuncTeam(serverGroupID, msgData)
+            
+        elif msgType == ShareDefine.ClientServerMsg_QueryXiangong:
+            GameXiangong.ClientServerMsg_QueryXiangong(serverGroupID, msgData)
+            
         # 需要发送到地图服务器处理的
         elif msgType in [ShareDefine.ClientServerMsg_Reborn, ShareDefine.ClientServerMsg_CollectNPC]:
             MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID)
@@ -123,9 +248,7 @@
             GameWorld.ErrLog("没有该信息类型逻辑处理!")
             
     except:
-        GameWorld.ErrLog("OnCrossServerReceiveMsg:%s; except:%s" % (cPickle.loads(recvMsg), traceback.format_exc()))
-        if GameWorld.GetGameWorld().GetDebugLevel():
-            raise BaseException(str(traceback.format_exc()))
+        GameWorld.RaiseException("跨服服务器接收信息处理报错 \r\n%s" % str(traceback.format_exc()))
     return
 
 def ClientServerMsg_ServerInitOK(serverGroupID, tick):
@@ -146,9 +269,15 @@
     '''
     CrossRealmPlayer.Sync_CrossCommInitDataToClientServer(serverGroupID)
     CrossRealmPK.Sync_CrossPKInitDataToClientServer(tick, serverGroupID)
+    CrossChampionship.Sync_CrossChampionshipDataToClientServer(serverGroupID)
+    CrossBattlefield.Sync_CrossBattlefieldDataToClientServer(serverGroupID)
     CrossBoss.Sync_CrossBossInitDataToClientServer(serverGroupID)
     CrossActionControl.Sync_CrossActInfoToClientServer(serverGroupID)
+    CrossLuckyCloudBuy.Sync_LuckyCloudBuyDataToClientServer(tick, serverGroupID)
+    CrossActAllRecharge.Sync_AllRechargeDataToClientServer(serverGroupID)
+    CrossYaomoBoss.Sync_CrossYaomoBossDataToClientServer(serverGroupID)
     PlayerCompensation.Sync_CrossMailPlayerIDToClientServer(serverGroupID)
+    GameWorship.Sync_CrossWorshipToClientServer(serverGroupID)
     return
 
 def MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID):
@@ -191,22 +320,33 @@
     return
 ## ================================================================================================
 
-def SendMsgToClientServer(msgType, dataMsg, serverGroupIDList=[]):
+def SendMsgToClientServer(msgType, dataMsg, serverGroupIDList=None):
     ''' 广播信息到子服务器上
         @param serverGroupIDList: 发送指定的服务器组ID列表,内部已经针对列表中组ID去重,
         所以外部逻辑可直接添加,不用考虑组ID重复问题,没有指定服务器组ID时,默认广播所有子服
     '''
     if not GameWorld.IsCrossServer():
         return
-    if not dataMsg:
-        return
-    
-    srcMsg = {"MsgType":msgType, "Data":dataMsg}
+    #if not dataMsg:
+    #    return
+    if serverGroupIDList == None:
+        serverGroupIDList = []
+        
+    srcMsg = {"MsgType":msgType, "Data":dataMsg, "CrossServerTime":GameWorld.GetCurrentDataTimeStr()}
     sendMsg = cPickle.dumps(srcMsg, 2)
     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))
+    if msgType in CrossServerMsg_ShortLogTypeList:
+        playerID = 0
+        if isinstance(dataMsg, dict):
+            playerID = dataMsg.get("playerID", 0)
+            if not playerID:
+                playerID = dataMsg.get("PlayerID", 0)
+        msgLen = len(str(srcMsg))
+        GameWorld.Log("SendMsgToClientServer => %s, %s, playerID=%s,msgLen=%s" % (msgType, serverGroupIDList, playerID, msgLen))
+    else:
+        GameWorld.Log("SendMsgToClientServer => %s, %s, %s" % (msgType, serverGroupIDList, srcMsg))
     if not serverGroupIDList:
         GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg, len(sendMsg))
     else:
@@ -223,7 +363,6 @@
     dataMsg = dataPack.GetData()
     
     try:
-        GameWorld.Log("收到OnClientServerReceiveMsg" )
         if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
             GameWorld.Log("服务器未启动好,不处理跨服信息!")
             return
@@ -231,31 +370,62 @@
         msgDict = cPickle.loads(dataMsg)
         msgType = msgDict.get("MsgType", -1)    
         msgData = msgDict.get("Data", "")
-        GameWorld.Log("OnClientServerReceiveMsg: %s" % msgDict)
+        crossServerTimeStr = msgDict.get("CrossServerTime", "")
         
+        if msgType in CrossServerMsg_ShortLogTypeList:
+            playerID = 0
+            if isinstance(msgData, dict):
+                playerID = msgData.get("playerID", 0)
+                if not playerID:
+                    playerID = msgData.get("PlayerID", 0)
+            msgLen = len(str(msgDict))
+            GameWorld.Log("OnClientServerReceiveMsg: %s, playerID=%s,msgLen=%s" % (msgType, playerID, msgLen))
+        else:
+            GameWorld.Log("OnClientServerReceiveMsg: %s, %s" % (msgType, msgDict))
+            
+        if crossServerTimeStr:
+            curServerTime = int(time.time())
+            crossServerTime = GameWorld.ChangeTimeStrToNum(crossServerTimeStr)
+            curServerCrossServerTime = GameWorld.ChangeTimeStrToNum(GameWorld.GetCrossServerTimeStr())
+            diffSeconds = curServerCrossServerTime - crossServerTime# 本服计算误差
+            
+            _, _, syncMapTime = PyGameData.g_crossServerTimeInfo
+            PyGameData.g_crossServerTimeInfo = [crossServerTime, curServerTime, syncMapTime]
+            if curServerTime - syncMapTime >= 600 or abs(diffSeconds) >= 30 or msgType == ShareDefine.CrossServerMsg_CrossServerTime: # 一定时间同步地图一次 或计算 误差超过30秒 或强制同步时间的
+                GameWorld.DebugLog("同步地图跨服服务器时间时,本服与跨服服务器时间计算误差! diffSeconds=%s" % (diffSeconds))
+                syncMapTime = curServerTime
+                PyGameData.g_crossServerTimeInfo = [crossServerTime, curServerTime, syncMapTime]
+                GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerTime, PyGameData.g_crossServerTimeInfo)
+                
         if msgType == ShareDefine.CrossServerMsg_ExitCrossServer:
             CrossRealmPlayer.CrossServerMsg_ExitCrossServer(msgData)
             
         elif msgType == ShareDefine.CrossServerMsg_Notify:
             PlayerControl.CrossServerMsg_Notify(msgData)
             
+        elif msgType == ShareDefine.CrossServerMsg_PlayerLoginout:
+            ChPlayer.CrossServerMsg_PlayerLoginout(msgData)
+            
         elif msgType == ShareDefine.CrossServerMsg_ChatCrossWorld:
             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)
+            
+        elif msgType == ShareDefine.CrossServerMsg_PullPlayerPackData:
+            PlayerPackData.CrossServerMsg_PullPlayerPackData(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_PushPlayerPackData:
+            PlayerPackData.CrossServerMsg_PushPlayerPackData(msgData)
             
         elif msgType == ShareDefine.CrossServerMsg_PKMatchReqRet:
             CrossRealmPK.CrossServerMsg_PKMatchReqRet(msgData)
-            
-        elif msgType == ShareDefine.CrossServerMsg_PKMatchResult:
-            CrossRealmPK.CrossServerMsg_PKMatchResult(msgData)
-            
-        elif msgType == ShareDefine.CrossServerMsg_PKReadyOKRoomList:
-            CrossRealmPK.CrossServerMsg_PKReadyOKRoomList(msgData)
-            
-        elif msgType == ShareDefine.CrossServerMsg_PKTimeoutRoomList:
-            CrossRealmPK.CrossServerMsg_PKTimeoutRoomList(msgData)
             
         elif msgType == ShareDefine.CrossServerMsg_PKOverInfo:
             CrossRealmPK.CrossServerMsg_PKOverInfo(msgData)
@@ -263,8 +433,68 @@
         elif msgType == ShareDefine.CrossServerMsg_PKSeasonInfo:
             CrossRealmPK.CrossServerMsg_PKSeasonInfo(msgData)
             
-        elif msgType == ShareDefine.CrossServerMsg_PKSyncBillboard:
-            CrossRealmPK.CrossServerMsg_PKSyncBillboard(msgData)
+        elif msgType == ShareDefine.CrossServerMsg_LuckyCloudBuyLottery:
+            CrossLuckyCloudBuy.CrossServerMsg_LuckyCloudBuyLottery(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_LuckyCloudBuyNum:
+            CrossLuckyCloudBuy.CrossServerMsg_LuckyCloudBuyNum(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_BattlefieldState:
+            CrossBattlefield.CrossServerMsg_BattlefieldState(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_BattlefieldBuy:
+            CrossBattlefield.CrossServerMsg_BattlefieldBuy(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_BattlefieldOver:
+            CrossBattlefield.CrossServerMsg_BattlefieldOver(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_FamilyFlagwarOver:
+            CrossFamilyFlagwar.CrossServerMsg_FamilyFlagwarOver(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_CrossBossTrialFamilyAward:
+            PlayerActBossTrial.CrossServerMsg_CrossBossTrialFamilyAward(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_FuncTeamInfo:
+            PlayerFuncTeam.CrossServerMsg_FuncTeamInfo(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_FuncTeamDel:
+            PlayerFuncTeam.CrossServerMsg_FuncTeamDel(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_FuncTeamList:
+            PlayerFuncTeam.CrossServerMsg_FuncTeamList(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_Worship:
+            GameWorship.CrossServerMsg_Worship(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_Xiangong:
+            GameXiangong.CrossServerMsg_Xiangong(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_ChampionshipState:
+            CrossChampionship.CrossServerMsg_ChampionshipState(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_ChampionshipPlayer:
+            CrossChampionship.CrossServerMsg_ChampionshipPlayer(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_ChampionshipGroup:
+            CrossChampionship.CrossServerMsg_ChampionshipGroup(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_ChampionshipGuess:
+            CrossChampionship.CrossServerMsg_ChampionshipGuess(msgData, tick)
+            
+        elif msgType == ShareDefine.CrossServerMsg_ChampionshipOfficial:
+            CrossChampionship.CrossServerMsg_ChampionshipOfficial(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_ChampionshipDailyOfficial:
+            CrossChampionship.CrossServerMsg_ChampionshipDailyOfficial(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_ActAllRechargeInfo:
+            CrossActAllRecharge.CrossServerMsg_ActAllRechargeInfo(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_CrossDailyActionState:
+            CrossActionControl.CrossServerMsg_CrossDailyActionState(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_CrossYaomoBossHurtInfo:
+            CrossYaomoBoss.CrossServerMsg_CrossYaomoBossHurtInfo(msgData)
             
         elif msgType == ShareDefine.CrossServerMsg_SyncBillboard:
             CrossBillboard.CrossServerMsg_SyncBillboard(msgData, tick)
@@ -274,6 +504,9 @@
             
         elif msgType == ShareDefine.CrossServerMsg_CrossBossState:
             CrossBoss.CrossServerMsg_CrossBossState(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_CrossAssist:
+            PlayerAssist.CrossServerMsg_CrossAssist(msgData, tick)
             
         elif msgType == ShareDefine.CrossServerMsg_CrossActInfo:
             CrossActionControl.CrossServerMsg_CrossActInfo(msgData)
@@ -292,6 +525,9 @@
             
         elif msgType == ShareDefine.CrossServerMsg_EnterFBRet:
             PlayerFB.CrossServerMsg_EnterFBRet(msgData, tick)
+            
+        elif msgType == ShareDefine.CrossServerMsg_EnterVSRoomRet:
+            PlayerFB.CrossServerMsg_EnterVSRoomRet(msgData, tick)
             
         elif msgType == ShareDefine.CrossServerMsg_SendMail:
             PlayerCompensation.CrossServerMsg_SendMail(msgData)
@@ -313,14 +549,21 @@
         elif msgType == ShareDefine.CrossServerMsg_CrossServerState:
             CrossRealmPlayer.CrossServerMsg_CrossServerState(msgData)
             
+        elif msgType == ShareDefine.CrossServerMsg_CrossServerTime:
+            playerID = msgData.get("PlayerID")
+            if playerID:
+                tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+                if tagPlayer:
+                    GameWorld.DebugAnswer(tagPlayer, "跨服服务器时间: %s" % GameWorld.GetCrossServerTimeStr())
+            
+        elif msgType == ShareDefine.CrossServerMsg_DebugAnswer:
+            GameWorld.CrossServerMsg_DebugAnswer(msgData)
+            
         else:
             GameWorld.ErrLog("没有该信息类型逻辑处理!")
             
     except:
-        GameWorld.ErrLog("OnClientServerReceiveMsg:%s; except:%s" % (cPickle.loads(dataMsg), traceback.format_exc()))
-        if GameWorld.GetGameWorld().GetDebugLevel():
-            raise BaseException(str(traceback.format_exc()))
-        
+        GameWorld.RaiseException("子服服务器接收信息处理报错\r\n%s" % str(traceback.format_exc()))
     return
 
 def MapServer_ClientServerReceiveMsg(msgType, msgData):

--
Gitblit v1.8.0