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/PlayerQuery.py |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index deb04fc..083e90c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -52,7 +52,6 @@
 import PlayerFamilyBoss
 import PlayerManorWar
 import GameWorldBoss
-import MergeBroadcast
 import GameWorldFamilyWar
 #import PlayerFamilyTech
 import PlayerFamilyRedPacket
@@ -526,12 +525,6 @@
     # 用于记录全服充值的点券数
     if callName == "RecordChangeCoin":
         GameDataRecord.ChangeCoinCnt(eval(resultName))
-        return
-    
-    #跨服广播子服
-    if callName == 'SendBroadcastMergeClient':
-        operType, mapID, dataDict, isRepeat = eval(resultName)
-        MergeBroadcast.SendBroadcastMerge(operType, mapID, dataDict, isRepeat)
         return
     
     #跨服匹配PK战斗结算

--
Gitblit v1.8.0