From 027dccfa5c57091f7d1787af3e6c7b26c8c0f9a3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 23 十二月 2019 15:46:52 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统(玩家看到boss才同步伤血封包;修复玩家PK时buff掉血添加npc伤血列表报错)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
index e5c6737..6f97c43 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/GMShell.py
@@ -19,7 +19,7 @@
 import GameWorld
 import Commands
 import IPY_GameServer
-import MergeChildMsg
+import CrossRealmMsg
 import PyGameData
 import traceback
 import GMCommon
@@ -87,15 +87,14 @@
             GameWorld.Log("###使用GM命令 = %s错误,玩家不是GM"%(callFunName), curPlayer.GetPlayerID())
             return
         
-        #非跨服服务器下使用跨服专属GM命令,则发送到跨服
-        if not GameWorld.IsMergeServer():
+        #非跨服服务器下使用跨服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