ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
@@ -19,10 +19,10 @@
import GameWorld
import Commands
import IPY_GameServer
import MergeChildMsg
import PyGameData
import traceback
import GMCommon
import ShareDefine
import os
#---------------------------------------------------------------------
g_broadCastList = []
@@ -87,12 +87,12 @@
            return
        
        #非跨服服务器下使用跨服专属GM命令,则发送到跨服
        if not GameWorld.IsMergeServer():
        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)
                #MergeChildMsg.SendMergerChildToCenterStringData(ShareDefine.ClientServerMsg_GMCMD, alist)
                return
            
        callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "OnExec"))
@@ -245,7 +245,7 @@
    return cmdDict
## 收到子服务器发送的GM命令
def ClientServer_SendGMCMD(cmdMsgList, tick):
def ClientServerMsg_GMCMD(cmdMsgList, tick):
    if len(cmdMsgList) == 0:
        return