From 32004fc5071f6da69d8b9e0bfc4a3080d04f9f03 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 22 十二月 2018 09:58:00 +0800
Subject: [PATCH] 5372 【后端】【1.4】聚魂副本开发(代码还原)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index 18b0890..148aff8 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -41,7 +41,6 @@
 import PlayerBourse
 import GameWorldActionTeHui
 import PlayerXMZZ
-import GameWorldMergePK
 import GameWorldShopItem
 import MergeChildMsg
 import PlayerTruck
@@ -70,6 +69,7 @@
 import PyGameData
 import GMShell
 import IPY_PlayerDefine
+import CrossRealmPK
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -172,6 +172,8 @@
         PyGameData.g_todayPlayerLVDict[curPlayer.GetID()] = curPlayer.GetLV()
         #副本助战
         PlayerFBHelpBattle.OnHelpPlayerLogin(curPlayer)
+        #跨服PK
+        CrossRealmPK.OnPlayerLogin(curPlayer)
         
         GMShell.OnPlayerLogin(curPlayer)
         GMT_CTG.OnPlayerLogin(curPlayer)
@@ -515,7 +517,7 @@
 def __Func_PlayerDisconnect(curPlayer, tick):
     
     #跨服匹配PK
-    #GameWorldMergePK.OnLeaveServer(curPlayer)
+    CrossRealmPK.OnLeaveServer(curPlayer)
     
     #组队玩家离线
     PlayerTeam.DoPlayerLogOffTeamLogic(curPlayer, tick)

--
Gitblit v1.8.0