From 858ee8dd80555d802f2b6ffaa47012fe7fc2c19e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 07 一月 2019 09:45:49 +0800
Subject: [PATCH] 2831 【BUG】【1.5】跨服pk,跨服重连中会被本服玩家打死

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py         |    5 +++++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.py |   11 +++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 938722a..2212d32 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -100,6 +100,7 @@
 import PlayerActTotalRecharge
 import PlayerSpringSale
 import PlayerFairyCeremony
+import CrossRealmPlayer
 import ChNetSendPack
 import FamilyRobBoss
 import FBHelpBattle
@@ -1365,6 +1366,10 @@
     
     PassiveBuffEffMng.OnLoadMapGFPassive(curPlayer)
     ItemControler.PlayerItemControler(curPlayer).RefreshStartEquipCount()   # 刷新装备珍品星级
+    
+    #最后处理下跨服
+    CrossRealmPlayer.OnLoadMapOK(curPlayer)
+    
     #EndLoadMap需放在最后
     curPlayer.EndLoadMap()
     return True
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.py
index 11a0900..e1cb159 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.py
@@ -70,6 +70,17 @@
     GameWorld.Log("PlayerExitCrossServer...", curPlayer.GetPlayerID())
     return
 
+def OnLoadMapOK(curPlayer):
+    ## 主服登录地图成功
+    if GameWorld.IsCrossServer():
+        return
+    
+    # 跨服状态下断线重连
+    if PlayerControl.GetCrossRealmState(curPlayer):
+        GameWorld.Log("跨服状态下登录本服地图成功...", curPlayer.GetPlayerID())
+        DoEnterCrossRealm(curPlayer)
+    return
+
 def DoEnterCrossRealm(curPlayer):
     ## 玩家进入跨服处理,本服的逻辑处理
     curPlayer.SetVisible(False)

--
Gitblit v1.8.0