From d0d6f28bee730ee64bf46adffa4f768d6af6ac0c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 19 九月 2024 10:56:34 +0800
Subject: [PATCH] 10267 【越南】【英文】【砍树】仙官新增膜拜

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py |  264 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 199 insertions(+), 65 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index 357373c..a59b095 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -28,6 +28,7 @@
 import NetPackCommon
 import IpyGameDataPY
 import PyGameData
+import PlayerDBOper
 
 # 获取玩家跨服服务器上的名字
 #===============================================================================
@@ -46,7 +47,7 @@
 # 获取玩家跨服服务器上的名字
 def GetCrossPlayerName(curPlayer):
     # 通过游戏账号中的平台标志获取名称,目前为spid
-    playerName = curPlayer.GetPlayerName()
+    playerName = curPlayer.GetName()
     
     opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s_%s" % (GameWorld.GetPlayerPlatform(curPlayer), 
                                            GameWorld.GetPlayerServerSID(curPlayer)))
@@ -56,36 +57,77 @@
     
     return opName.decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName
 
-def GetServerCrossZoneIpyData(mapID, serverGroupID=0):
-    ## 获取本服对应跨服玩法分区地图信息
-    if mapID not in ChConfig.Def_CrossZoneTableName:
+def GetCrossZoneIpyDataByZoneID(mapID, zoneID):
+    ## 获取跨服分区
+    zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm")
+    crossZoneName = GameWorld.GetCrossZoneName()
+    return IpyGameDataPY.GetIpyGameData(zoneTypeName, crossZoneName, zoneID)
+
+def GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID):
+    ## 获取跨服分区
+    zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm")
+    crossZoneName = GameWorld.GetCrossZoneName()
+    ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True)
+    if not ipyDataList:
         return
-    if not serverGroupID:
-        serverGroupID = GameWorld.GetServerGroupID()
-        
-    tableName = ChConfig.Def_CrossZoneTableName[mapID]
-    ipyDataMgr = IpyGameDataPY.IPY_Data()
-    if not hasattr(ipyDataMgr, "Get%sCount" % tableName):
-        return
-    
-    for i in xrange(getattr(ipyDataMgr, "Get%sCount" % tableName)()):
-        ipyData = getattr(ipyDataMgr, "Get%sByIndex" % tableName)(i)
+    for ipyData in ipyDataList:
         serverGroupIDList = ipyData.GetServerGroupIDList()
         for serverGroupIDInfo in serverGroupIDList:
             if (isinstance(serverGroupIDInfo, tuple) and serverGroupIDInfo[0] <= serverGroupID <= serverGroupIDInfo[1]) \
                 or (isinstance(serverGroupIDInfo, int) and serverGroupIDInfo == serverGroupID):
                 return ipyData
+    GameWorld.ErrLog("没有找到跨服玩法对应分区! mapID=%s, serverGroupID=%s, zoneTypeName=%s" % (mapID, serverGroupID, zoneTypeName))
     return
+
+def GetCrossZoneIpyDataListByServerGroupID(mapID, serverGroupID):
+    ## 获取跨服常规分区列表
+    if serverGroupID:
+        ipyData = GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID)
+        if not ipyData:
+            return
+        ipyDataList = [ipyData]
+    else:
+        crossZoneName = GameWorld.GetCrossZoneName()
+        zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm")
+        ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True)
+    return ipyDataList
+
+def GetServerCommCrossZoneID(serverGroupID):
+    ## 获取跨服常规分区
+    zoneTypeName = "CrossZoneComm"
+    crossZoneName = GameWorld.GetCrossZoneName()
+    ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True)
+    if not ipyDataList:
+        return 0
+    for ipyData in ipyDataList:
+        serverGroupIDList = ipyData.GetServerGroupIDList()
+        for serverGroupIDInfo in serverGroupIDList:
+            if (isinstance(serverGroupIDInfo, tuple) and serverGroupIDInfo[0] <= serverGroupID <= serverGroupIDInfo[1]) \
+                or (isinstance(serverGroupIDInfo, int) and serverGroupIDInfo == serverGroupID):
+                return ipyData.GetZoneID()
+    return 0
+
+def GetServerCrossZoneMapIpyData(zoneID, mapID):
+    ## 获取本服对应跨服玩法分区地图信息 - 仅适用于固定地图及虚拟分线的跨服玩法
+    if mapID not in ChConfig.Def_CrossZoneMapTableName:
+        return
+    tableName = ChConfig.Def_CrossZoneMapTableName[mapID]
+    return IpyGameDataPY.GetIpyGameDataByCondition(tableName, {"ZoneID":zoneID})
 
 def IsCrossServerOpen():
     ## 跨服服务器是否开放中
     return GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
 
-def ClientServerMsg_ServerInitOK(serverGroupID):
-    ## 子服连接成功
+def Sync_CrossCommInitDataToClientServer(serverGroupID=0):
+    ''' 同步跨服常规通用数据到子服务器
+    @param serverGroupID: 为0时同步所有子服
+    '''
+    
     isOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
-    GameWorld.Log("子服连接成功,通知当前跨服服务器状态: isOpen=%s" % isOpen)
-    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossServerState, {"isOpen":isOpen}, [serverGroupID])
+    crossZoneName = GameWorld.GetCrossZoneName()
+    GameWorld.Log("通知当前跨服服务器状态: isOpen=%s,crossZoneName=%s,syncServerGroupID=%s" % (isOpen, crossZoneName, serverGroupID))
+    serverGroupIDList = [serverGroupID] if serverGroupID else []
+    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossServerState, {"isOpen":isOpen, "crossZoneName":crossZoneName}, serverGroupIDList)
     return
 
 def DoChangeCrossServerState(isOpen):
@@ -101,7 +143,7 @@
             curPlayer = playerManager.GetActivePlayerAt(i)
             if curPlayer == None:
                 continue
-            PlayerControl.SetCrossRealmState(curPlayer, 0)
+            PlayerControl.SetCrossMapID(curPlayer, 0)
             curPlayer.Kick(0)
             
     # 广播所有子服,本服务器进入维护
@@ -110,6 +152,10 @@
 
 def CrossServerMsg_CrossServerState(msgData):
     ## 子服收到跨服服务器状态变更,子服不存DB,默认跨服维护中,连接跨服成功后由跨服同步状态直接更新到字典即可,没连上就默认维护中
+    if "crossZoneName" in msgData:
+        PyGameData.g_crossZoneName = msgData["crossZoneName"]
+        GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossZoneName, PyGameData.g_crossZoneName)
+        
     isOpen = msgData["isOpen"]
     isOpen = 1 if isOpen else 0
     GameWorld.Log("收到跨服服务器状态变更: 是否正常开放中=%s" % isOpen)
@@ -121,8 +167,9 @@
             curPlayer = playerManager.GetActivePlayerAt(i)
             if curPlayer == None:
                 continue
-            PlayerControl.SetCrossRealmState(curPlayer, 0)
+            PlayerControl.SetCrossMapID(curPlayer, 0)
             
+    GameWorld.GetGameWorld().SendCrossServerStateToLoginServer(isOpen)
     # 通知地图
     GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen)
     return
@@ -139,7 +186,7 @@
     CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_ExitCrossServer, playerID, [serverGroupID])
     
     # 设置非跨服状态,踢下线
-    PlayerControl.SetCrossRealmState(curPlayer, 0)
+    PlayerControl.SetCrossMapID(curPlayer, 0)
     curPlayer.Kick(0)
     GameWorld.Log("PlayerExitCrossServer...serverGroupID=%s" % serverGroupID, playerID)
     return
@@ -151,19 +198,28 @@
     curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
     if not curPlayer:
         GameWorld.Log("    退出跨服时本服玩家不在线!", playerID)
+        DoOfflinePlayerExitCrossServer(playerID)
         return
-    PlayerControl.SetCrossRealmState(curPlayer, 0)
+    PlayerControl.SetCrossMapID(curPlayer, 0)
     return
 
-def SendCrossRealmReg(curPlayer, registerType, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
+def DoOfflinePlayerExitCrossServer(playerID):
+    ## 处理离线玩家退出跨服服务器更新DB数据逻辑
+    
+    PlayerDBOper.UpdateDBOper(PlayerDBOper.Table_DBPlayer, {"PlayerID":playerID}, {"ExAttr5":0})
+    return
+
+def SendCrossRealmReg(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0, lineID=0):
     # 发送跨服账号注册上传数据
+    # @param mapID: 真实场景地图ID
+    # @param dataMapID: 真实场景地图ID对应场景数据地图ID
     
     # 设置上传数据的活动类型
-    curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterType, registerType)
-    sysMsg = str([registerType, mapID, dataMapID, copyMapID, posX, posY])
+    curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, registerMap)
+    sysMsg = str([registerMap, mapID, dataMapID, copyMapID, posX, posY, lineID])
     curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossRealmReg", sysMsg, len(sysMsg))            
-    GameWorld.Log("SendCrossRealmReg registerType=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s" 
-                  % (registerType, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
+    GameWorld.Log("SendCrossRealmReg registerMap=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s" 
+                  % (registerMap, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
     return
 
 def OnCrossRealmRegOK(playerID, msgList, tick): 
@@ -176,16 +232,16 @@
     if not IsCrossServerOpen():
         return
     
-    registerType = msgList[0]
-    playerRegisterType = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CrossRegisterType)
-    if playerRegisterType and registerType != playerRegisterType:
+    registerMap = msgList[0]
+    playerRegisterMap = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CrossRegisterMap)
+    if playerRegisterMap and registerMap != playerRegisterMap:
         return
-    curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterType, 0)
+    curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, 0)
     
-    GameWorld.Log("跨服报名成功 , registerType=%s" % (registerType), playerID)
+    GameWorld.Log("跨服报名成功 , registerMap=%s" % (registerMap), playerID)
     
     # 跨服PK上传数据完毕,通知跨服服务器,准备完毕
-    if registerType == ChConfig.Def_FBMapID_CrossRealmPK:
+    if registerMap == ChConfig.Def_FBMapID_CrossRealmPK:
         regVSRoomID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MergeRegisterRoomID) 
         vsRoomID = curPlayer.GetVsRoomId()
         
@@ -204,13 +260,13 @@
         
     # 其他的,在上传数据完毕后,使用通用的通知可进入跨服
     else:
-        NotifyCanEnterMergeServer(curPlayer, registerType)
+        NotifyCanEnterMergeServer(curPlayer, registerMap)
         
     # hxp 2015.09.10 跨服boss,后面的暂时不需要
     return
 
 
-def NotifyCanEnterMergeServer(curPlayer, registerType):
+def NotifyCanEnterMergeServer(curPlayer, registerMap):
     # 通用包,通知客户端可进入跨服服务器
     return
 
@@ -226,7 +282,7 @@
     '''
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
     GameWorld.ErrLog("某些异常情况下,前端强制发包退出跨服状态! ", curPlayer.GetPlayerID())
-    PlayerControl.SetCrossRealmState(curPlayer, 0)
+    PlayerControl.SetCrossMapID(curPlayer, 0)
     return
 
 #// C0 02 查看跨服玩家信息 #tagCGViewCrossPlayerInfo
@@ -235,6 +291,7 @@
 #{
 #    tagHead        Head;
 #    DWORD        PlayerID;    // 跨服玩家ID
+#    BYTE        EquipClassLV;    //大于0为查看指定境界阶装备信息,  0为查看默认信息
 #};
 def OnViewCrossPlayerInfo(index, clientData, tick):
     if GameWorld.IsCrossServer():
@@ -243,27 +300,20 @@
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
     playerID = curPlayer.GetPlayerID()
     tagPlayerID = clientData.PlayerID
-    curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagPlayerID)
+    equipClassLV = clientData.EquipClassLV
+    curCache = PlayerViewCache.FindViewCache(tagPlayerID)
     ## 本服有,直接回客户端
     if curCache:
         GameWorld.DebugLog("查看跨服玩家,是本服玩家,直接回复!tagPlayerID=%s" % (tagPlayerID), playerID)
-        sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
-        sendPack.PlayerID = tagPlayerID
-        sendPack.PropData = curCache.GetPropData()
-        sendPack.PropDataSize = len(sendPack.PropData)
-        sendPack.ItemData = PlayerViewCache.GetItemData(curCache)
-        sendPack.ItemDataSize = len(sendPack.ItemData)
-        sendPack.PlusData = PlayerViewCache.GetPlusData(curCache)
-        sendPack.PlusDataSize = len(sendPack.PlusData)
-        NetPackCommon.SendFakePack(curPlayer, sendPack)
+        PlayerViewCache.Sync_PlayerCache(curPlayer, curCache, equipClassLV)
         return
     
     if tagPlayerID in PyGameData.g_crossPlayerViewCache:
-        validChaheTime = 5 * 60 * 1000
+        validChaheTime = 10 * 60 * 1000
         cacheInfo, updTick = PyGameData.g_crossPlayerViewCache[tagPlayerID]
         if tick - updTick <= validChaheTime:
             GameWorld.DebugLog("查看跨服玩家数据同步CD中,直接用缓存数据回复!tagPlayerID=%s" % (tagPlayerID), playerID)
-            SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo)
+            SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, equipClassLV, cacheInfo)
             return
         
         for crossPlayerID, cacheInfoList in PyGameData.g_crossPlayerViewCache.items():
@@ -271,52 +321,65 @@
                 PyGameData.g_crossPlayerViewCache.pop(crossPlayerID)
                 
     # 发送跨服服务器查询
-    dataMsg = {"tagPlayerID":tagPlayerID, "playerID":playerID}
+    dataMsg = {"tagPlayerID":tagPlayerID, "playerID":playerID, "equipClassLV":equipClassLV}
     CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_ViewPlayerCache, dataMsg)
     return
 
 def ClientServerMsg_ViewPlayerCache(serverGroupID, msgData):
     tagPlayerID = msgData["tagPlayerID"]
     playerID = msgData["playerID"]
+    equipClassLV = msgData["equipClassLV"]
     
     GameWorld.Log("收到子服查看跨服玩家信息: serverGroupID=%s,playerID=%s,tagPlayerID=%s" % (serverGroupID, playerID, tagPlayerID))
     
-    cacheInfo = []
-    curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagPlayerID)
+    cacheInfo = {}
+    curCache = PlayerViewCache.FindViewCache(tagPlayerID)
     if curCache:
-        cacheInfo = [curCache.GetPropData(), PlayerViewCache.GetItemData(curCache), PlayerViewCache.GetPlusData(curCache)]
-        
-    viewPlayerCacheRet = [playerID, tagPlayerID, cacheInfo]
+        cacheInfo = {"PropData":curCache.PropData, "PlusData":curCache.PlusData}
+        for classLV in xrange(1, 15 + 1):
+            attrName = "ItemData%s" % classLV
+            if hasattr(curCache, attrName):
+                cacheInfo[attrName] = getattr(curCache, attrName)
+                
+    viewPlayerCacheRet = [playerID, tagPlayerID, equipClassLV, cacheInfo]
     CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_ViewPlayerCacheRet, viewPlayerCacheRet, [serverGroupID])
     return
 
 def CrossServerMsg_ViewPlayerCacheRet(msgData, tick):
     
-    playerID, tagPlayerID, cacheInfo = msgData
+    playerID, tagPlayerID, equipClassLV, cacheInfo = msgData
     GameWorld.Log("收到跨服服务器回复的查看玩家信息: playerID=%s,tagPlayerID=%s" % (playerID, tagPlayerID))
     
     PyGameData.g_crossPlayerViewCache[tagPlayerID] = [cacheInfo, tick] # 更新信息
     
     curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
     if curPlayer:
-        SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo)
+        SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, equipClassLV, cacheInfo)
         
     return
 
-def SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo):
+def SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, equipClassLV, cacheInfo):
     if not cacheInfo:
         PlayerControl.NotifyCode(curPlayer, "ViewPlayer_OffLine")
         return
-    PropData, ItemData, PlusData = cacheInfo
+    
+    if equipClassLV:
+        itemData = cacheInfo.get("ItemData%s" % equipClassLV, "")
+        sendPack = ChPyNetSendPack.tagSCPlayerEquipCacheResult()
+        sendPack.PlayerID = tagPlayerID
+        sendPack.EquipClassLV = equipClassLV
+        sendPack.ItemData = itemData
+        sendPack.ItemDataSize = len(sendPack.ItemData)
+        NetPackCommon.SendFakePack(curPlayer, sendPack)
+        return
+    
+    #回包客户端
     sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
     sendPack.PlayerID = tagPlayerID
-    sendPack.PropData = PropData
+    sendPack.PropData = cacheInfo.get("PropData", "")
     sendPack.PropDataSize = len(sendPack.PropData)
-    sendPack.ItemData = ItemData
-    sendPack.ItemDataSize = len(sendPack.ItemData)
-    sendPack.PlusData = PlusData
+    sendPack.PlusData = cacheInfo.get("PlusData", "")
     sendPack.PlusDataSize = len(sendPack.PlusData)
-    sendPack.CrossPlayer = 1
     NetPackCommon.SendFakePack(curPlayer, sendPack)
     return
 
@@ -336,7 +399,7 @@
     # 离线的话直接发邮件
     GameWorld.Log("收到跨服获得物品,玩家不在线,直接发邮件! itemInfo=%s" % str(itemInfo), playerID)
     itemID, itemCount, isBind, itemUserData = itemData
-    addItemList = [{"ItemID":itemID, "Count":itemCount, "IsBind":isBind, "UserData":itemUserData}]
+    addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":isBind, "UserData":itemUserData}]
     PlayerCompensation.SendMailByKey("", [playerID], addItemList, detail={"CrossPutInItem":1, "Event":event})
     return
 
@@ -352,5 +415,76 @@
     curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossGiveMoney", msgInfo, len(msgInfo))
     return
 
+def SetCrossPlayerAttrValue(msgInfo, tick):
+    ## 设置跨服玩家属性值
+    playerID, setType, setDict, isDelay = msgInfo
+    if not PyGameData.g_crossSetPlayerAttr:
+        GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick, tick)
+    playerSetInfoList = PyGameData.g_crossSetPlayerAttr.get(playerID, [])
+    playerSetInfoList.append([setType, setDict])
+    PyGameData.g_crossSetPlayerAttr[playerID] = playerSetInfoList
+    if not isDelay:
+        __SendCrossServerSetPlayerAttr(0)
+    return
 
-    
\ No newline at end of file
+def OnCrossProcess(tick):
+    __SendCrossServerSetPlayerAttr(tick)
+    return
+
+def __SendCrossServerSetPlayerAttr(tick):
+    if not PyGameData.g_crossSetPlayerAttr:
+        return
+    
+    if tick:
+        # 延迟10秒一次性同步,主要是比如OnDay的时候当多个玩家同时跨服时,减少同步次数,延迟统一发送
+        if tick - GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick) < 10 * 1000:
+            return
+        GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick, tick)
+        
+    CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_SetPlayerAttrValue, PyGameData.g_crossSetPlayerAttr)
+    PyGameData.g_crossSetPlayerAttr = {}
+    return
+
+def OnPlayerLogin(curPlayer):
+    if not IsCrossServerOpen():
+        return
+    
+    Sync_CrossZoneInfo(curPlayer)
+    LoginDoUnNotifyCrossMsg(curPlayer)
+    return
+    
+def MapServer_QueryCrossPlayerResult(playerID, callName, msgInfo, offlineExitCross=False):
+    ## 同步地图跨服玩家处理信息,玩家可能不在线,缓存后等玩家上线处理,暂不考虑存档问题,服务器维护后未处理的命令将失效
+    
+    curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+    if curPlayer and curPlayer.GetInitOK():
+        msgInfo = str(msgInfo)
+        curPlayer.MapServer_QueryPlayerResult(0, 0, callName, msgInfo, len(msgInfo))
+        return curPlayer
+    else:
+        # 缓存起来,等上线后处理
+        if playerID not in PyGameData.g_unNotifyPlayerCrossMsgDict:
+            PyGameData.g_unNotifyPlayerCrossMsgDict[playerID] = []
+        msgList = PyGameData.g_unNotifyPlayerCrossMsgDict[playerID]
+        msgList.append([callName, msgInfo])
+        GameWorld.Log("玩家不在线,添加未通知的跨服命令: %s, msgInfo=%s" % (callName, msgInfo), playerID)
+        if offlineExitCross:
+            DoOfflinePlayerExitCrossServer(playerID)
+    return
+
+def LoginDoUnNotifyCrossMsg(curPlayer):
+    playerID = curPlayer.GetPlayerID()
+    msgList = PyGameData.g_unNotifyPlayerCrossMsgDict.pop(playerID, [])
+    if not msgList:
+        return
+    for callName, msgInfo in msgList:
+        GameWorld.Log("上线处理未通知的跨服命令: %s, msgInfo=%s" % (callName, msgInfo), playerID)
+        msgInfo = str(msgInfo)
+        curPlayer.MapServer_QueryPlayerResult(0, 0, callName, msgInfo, len(msgInfo))
+    return
+
+def Sync_CrossZoneInfo(curPlayer):
+    clientPack = ChPyNetSendPack.tagGCCrossZoneInfo()
+    clientPack.CommZoneID = GetServerCommCrossZoneID(GameWorld.GetServerGroupID())
+    NetPackCommon.SendFakePack(curPlayer, clientPack)
+    return

--
Gitblit v1.8.0