4438 【主干】【2.0.200】打boss状态下发起匹配可以进入跨服，回来后归属不会清，boss不会回血

hxp

2019-07-08 02a9f1326fd99fc60ee14c70bb55d714803607f0

 ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py

@@ -19,10 +19,11 @@
import GameWorld

import Commands

import IPY_GameServer

import MergeChildMsg

import CrossRealmMsg

import PyGameData

import traceback

import GMCommon

import ShareDefine

import os

#---------------------------------------------------------------------

g_broadCastList = []

@@ -86,15 +87,14 @@
            GameWorld.Log("###使用GM命令 = %s错误,玩家不是GM"%(callFunName), curPlayer.GetPlayerID())

            return

        

        #非跨服服务器下使用跨服专属GM命令，则发送到跨服

        if not GameWorld.IsMergeServer():

        #非跨服服务器下使用跨服GM命令，则发送到跨服

        if not GameWorld.IsCrossServer():

            callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "OnGetMergeParam"))

            if callFunc != None:

                extendParamList = callFunc(curPlayer)

                alist.extend(extendParamList)

                MergeChildMsg.SendMergerChildToCenterStringData(ChConfig.Def_SendGMCMD, alist)

                return

            
                CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_GMCMD, alist)

                
        callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "OnExec"))

        if callFunc == None:

            #没有此命令

@@ -245,7 +245,7 @@
    return cmdDict



## 收到子服务器发送的GM命令

def ClientServer_SendGMCMD(cmdMsgList, tick):

def ClientServerMsg_GMCMD(cmdMsgList, tick):

    if len(cmdMsgList) == 0:

        return