From 3a3ad99a1761438e31bc6860e94b43cb4f165513 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 26 十二月 2018 10:52:19 +0800 Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(删除旧跨服代码) --- ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py index 3860e58..c9fecb5 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py @@ -29,7 +29,6 @@ #--------------------------------------------------------------------- import GameWorld import IPY_GameServer -import MergeBroadcast import IpyGameDataPY import CrossRealmMsg import ShareDefine @@ -82,7 +81,7 @@ GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList)) notifyDict = {"country":country, "msgMark":msgMark, "msgParamList":msgParamList, "lineID":lineID, "mergeMinOSD":mergeMinOSD, "mergeMaxOSD":mergeMaxOSD, "mergeMapInfo":mergeMapInfo} - MergeBroadcast.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False) + #.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False) return ## 世界广播 -- Gitblit v1.8.0