6374 【后端】【2.0】删除无用功能代码、封包、配置(删除修复代码)

xdh

2019-03-20 db9769e37b8e3c5f5a5346e9e4fb17c89614100b

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py

@@ -23,12 +23,13 @@
import GameWorldBoss

import CrossRealmPK

import PlayerQuery

import PlayerTalk

import CrossBoss

import ChConfig

import GMShell



import traceback

import json

import cPickle



def SendMsgToCrossServer(msgType, dataMsg):

    ## 发送信息到跨服服务器上

@@ -36,16 +37,27 @@
        return

    if not dataMsg:

        return

    sendMsg = str({"MsgType":msgType, "Data":dataMsg, "ServerGroupID":GameWorld.GetServerGroupID()})

    GameWorld.Log("SendMsgToCrossServer => %s" % (sendMsg))   
    
    # 协议要用最高级2，可减少长度

    srcMsg = {"MsgType":msgType, "Data":dataMsg, "ServerGroupID":GameWorld.GetServerGroupID()}

    sendMsg = cPickle.dumps(srcMsg, 2)

    if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):

        GameWorld.ErrLog("服务器未启动好,不允许向跨服服务器发送数据! %s" % (srcMsg))

        return

    GameWorld.Log("SendMsgToCrossServer => %s" % (srcMsg))   
    GameWorld.GetGameWorld().SendMergerChildToCenterStringData(sendMsg, len(sendMsg))

    return



def OnCrossServerReceiveMsg(recvMsg, tick):

    ## 跨服服务器收到信息处理

    try:

        #GameWorld.Log("OnCrossServerReceiveMsg: %s" % recvMsg)

        msgDict = eval(recvMsg)

        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", "")

@@ -63,11 +75,14 @@
        elif msgType == ShareDefine.ClientServerMsg_PKBillboard:

            CrossRealmPK.ClientServerMsg_PKBillboard(serverGroupID, msgData)

                        

        elif msgType == ShareDefine.ClientServerMsg_ChatCrossWorld:

            PlayerTalk.ClientServerMsg_ChatCrossWorld(serverGroupID, msgData, tick)

                        
        elif msgType == ShareDefine.ClientServerMsg_GMCMD:

            GMShell.ClientServerMsg_GMCMD(msgData, tick)

            

        elif msgType == ShareDefine.ClientServerMsg_ServerInitOK:

            ClientServerMsg_ServerInitOK(serverGroupID, msgData, tick)

            ClientServerMsg_ServerInitOK(serverGroupID, tick)

            

        elif msgType == ShareDefine.ClientServerMsg_ViewPlayerCache:

            CrossRealmPlayer.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)

@@ -86,19 +101,30 @@
            GameWorld.ErrLog("没有该信息类型逻辑处理！")

            

    except:

        GameWorld.ErrLog("OnCrossServerReceiveMsg:%s; except:%s" % (recvMsg, traceback.format_exc()))

        GameWorld.ErrLog("OnCrossServerReceiveMsg:%s; except:%s" % (cPickle.loads(recvMsg), traceback.format_exc()))

        if GameWorld.GetGameWorld().GetDebugLevel():

            raise BaseException(str(traceback.format_exc()))

    return



def ClientServerMsg_ServerInitOK(serverGroupID, msgData, tick):

def ClientServerMsg_ServerInitOK(serverGroupID, tick):

    ''' 收到子服连接成功通知 

         当子服启动成功后，可同步一次跨服服务器活动状态及活动数据给子服

    '''

    GameWorld.Log("收到跨服子服连接成功通知!")

    CrossRealmPlayer.ClientServerMsg_ServerInitOK(serverGroupID)

    CrossRealmPK.ClientServerMsg_ServerInitOK(serverGroupID, tick)

    CrossBoss.ClientServerMsg_ServerInitOK(serverGroupID)

    GameWorld.Log("收到跨服子服连接成功通知! serverGroupID=%s" % serverGroupID)

    Sync_CrossServerInitDataToClientServer(tick, serverGroupID)

    return



def Sync_CrossServerInitDataToClientServer(tick, serverGroupID=0):

    ''' 同步跨服功能数据到子服服务器

        本函数调用时机：

        1.跨服服务器启动成功，主动广播同步所有子服，此时设置 serverGroupID 为 0

        2.子服启动成功，由子服主动发起请求同步最新数据，此时有指定子服 serverGroupID

        3.子服重新连接跨服服务器成功，逻辑同2

        @param serverGroupID: 子服服务器组ID，为0时为全部子服务器组

    '''

    CrossRealmPlayer.Sync_CrossCommInitDataToClientServer(serverGroupID)

    CrossRealmPK.Sync_CrossPKInitDataToClientServer(tick, serverGroupID)

    CrossBoss.Sync_CrossBossInitDataToClientServer(serverGroupID)

    return



def MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID):

@@ -136,15 +162,20 @@
        return

    if not dataMsg:

        return

    sendMsg = str({"MsgType":msgType, "Data":dataMsg})

    GameWorld.Log("SendMsgToClientServer => serverGroupIDList=%s, sendMsg=%s" % (serverGroupIDList, sendMsg))

    
    srcMsg = {"MsgType":msgType, "Data":dataMsg}

    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 not serverGroupIDList:

        GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg)

    else:

        serverGroupIDList = list(set(serverGroupIDList)) # 去重

        #for serverGroupID in serverGroupIDList:

        #    GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg)

        jsonGroupIDInfo = json.dumps(serverGroupIDList, ensure_ascii=False)

        jsonGroupIDInfo = cPickle.dumps(serverGroupIDList, 2)

        GameWorld.GetGameWorld().SendMergeMsgToClientByGroupList(jsonGroupIDInfo, sendMsg)

    return



@@ -152,18 +183,26 @@
    ## 子服收到跨服服务器信息

    dataPack = IPY_GameServer.IPY_MGBroadcastMergeClient()

    dataMsg = dataPack.GetData()

    #GameWorld.Log("OnClientServerReceiveMsg: %s" % dataMsg)

    

    try:

        msgDict = eval(dataMsg)

        GameWorld.Log("收到OnClientServerReceiveMsg" )

        if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):

            GameWorld.Log("服务器未启动好，不处理跨服信息!")

            return

        
        msgDict = cPickle.loads(dataMsg)

        msgType = msgDict.get("MsgType", -1)    

        msgData = msgDict.get("Data", "")

        GameWorld.Log("OnClientServerReceiveMsg: %s" % msgDict)

        

        if msgType == ShareDefine.CrossServerMsg_ExitCrossServer:

            CrossRealmPlayer.CrossServerMsg_ExitCrossServer(msgData)

            

        elif msgType == ShareDefine.CrossServerMsg_Notify:

            PlayerControl.CrossServerMsg_Notify(msgData)

            
        elif msgType == ShareDefine.CrossServerMsg_ChatCrossWorld:

            PlayerTalk.CrossServerMsg_ChatCrossWorld(msgData)

            

        elif msgType == ShareDefine.CrossServerMsg_ViewPlayerCacheRet:

            CrossRealmPlayer.CrossServerMsg_ViewPlayerCacheRet(msgData, tick)

@@ -218,7 +257,7 @@
            GameWorld.ErrLog("没有该信息类型逻辑处理！")

            

    except:

        GameWorld.ErrLog("OnClientServerReceiveMsg:%s; except:%s" % (dataMsg, traceback.format_exc()))

        GameWorld.ErrLog("OnClientServerReceiveMsg:%s; except:%s" % (cPickle.loads(dataMsg), traceback.format_exc()))

        if GameWorld.GetGameWorld().GetDebugLevel():

            raise BaseException(str(traceback.format_exc()))

        

@@ -249,12 +288,12 @@
    GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_CrossServerConnState, connState)

    

    if result != 1:

        GameWorld.Log("--OnClientServerReceiveMsg  disconn")

        GameWorld.Log("===与跨服服务器断开连接!")

        CrossRealmPlayer.CrossServerMsg_CrossServerState({"isOpen":0})

        return

    

    GameWorld.Log("OnConnCorossServer conn success!!!")

    if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_IsGameWorldInit):

    GameWorld.Log("===与跨服服务器连接成功!")

    if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):

        GameWorld.Log("    服务器还未启动好，暂不处理! 等服务器启动好后再处理！")

        return

    

@@ -267,8 +306,12 @@
    return



def OnGameServerInitOK():

    ## 子服启动成功

    ## 服务器启动成功

    
    tick = GameWorld.GetGameWorld().GetTick()

    
    if GameWorld.IsCrossServer():

        Sync_CrossServerInitDataToClientServer(tick, serverGroupID=0) # 这里设置为0，广播所有子服务器组

        return

    

    serverGroupID = GameWorld.GetServerGroupID()