From 9c8047eb2dbdea0da2b1840084a7687f5332737a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 09 十月 2020 16:42:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20: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 2bc0744..6f97c43 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
@@ -19,6 +19,7 @@
import GameWorld
import Commands
import IPY_GameServer
+import CrossRealmMsg
import PyGameData
import traceback
import GMCommon
@@ -86,15 +87,14 @@
GameWorld.Log("###使用GM命令 = %s错误,玩家不是GM"%(callFunName), curPlayer.GetPlayerID())
return
- #非跨服服务器下使用跨服专属GM命令，则发送到跨服
+ #非跨服服务器下使用跨服GM命令，则发送到跨服
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)
- return
-
+ CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_GMCMD, alist)
+
callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "OnExec"))
if callFunc == None:
#没有此命令
--
Gitblit v1.8.0