From 1ea73e1885835466265ce788d93556b7030ee0e8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 30 十二月 2018 18:42:00 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(GM工具增加子服服务器维护,文字翻译版)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index deb04fc..549d5d7 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
@@ -528,20 +527,14 @@
         GameDataRecord.ChangeCoinCnt(eval(resultName))
         return
     
-    #跨服广播子服
-    if callName == 'SendBroadcastMergeClient':
-        operType, mapID, dataDict, isRepeat = eval(resultName)
-        MergeBroadcast.SendBroadcastMerge(operType, mapID, dataDict, isRepeat)
-        return
-    
     #跨服匹配PK战斗结算
     if callName == "CrossPKOver":
-        CrossRealmPK.MapServer_CrossPKOver(eval(resultName))
+        CrossRealmPK.MapServer_CrossPKOver(eval(resultName), tick)
         return
     
     #跨服匹配房间开启
     if callName == "CrossPKRoomOpen":
-        CrossRealmPK.MapServer_CrossPKRoomOpen(eval(resultName))
+        CrossRealmPK.MapServer_CrossPKRoomOpen(eval(resultName), tick)
         return
     
     #跨服匹配PK取消匹配

--
Gitblit v1.8.0