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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index 704810f..2481af4 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -45,7 +45,6 @@
 import PlayerTruck
 import HighLadder
 import EventReport
-import MergePlayer
 import PlayerCompensation
 import PlayerFamilyRedPacket
 import PlayerFamilyStore
@@ -493,7 +492,6 @@
     # 设置家族成员离线时间
     SetPlayerOfflineTime(curPlayer)
     
-    #MergePlayer.OnPlayerLeaveGotoMergeServer(curPlayer, tick)
     #------------镖车逻辑
     #TruckPlayerDisconnectProcess(curPlayer, tick)
     return

--
Gitblit v1.8.0