From 669ad215fec240afaf92be612f2b0077731c8e0f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 10:38:46 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(删除旧跨服代码)

---
 ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
index e5c6737..2bc0744 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
@@ -19,7 +19,6 @@
 import GameWorld
 import Commands
 import IPY_GameServer
-import MergeChildMsg
 import PyGameData
 import traceback
 import GMCommon
@@ -88,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(ShareDefine.ClientServerMsg_GMCMD, alist)
+                #MergeChildMsg.SendMergerChildToCenterStringData(ShareDefine.ClientServerMsg_GMCMD, alist)
                 return
             
         callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "OnExec"))

--
Gitblit v1.8.0