From cda5e4e81f17542946ac53e77d2cd625ac2ea3d4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 二月 2019 17:12:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
index 943407b..2bc0744 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
+++ b/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
--
Gitblit v1.8.0