From df824550205e9f266f51ebbf4028ac37fe0992bc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 20 三月 2019 14:01:27 +0800
Subject: [PATCH] 2683 子 天赋技能和新增双职业各两个技能 / 【后端】天赋技能
---
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