From 57d60ef7648868c76189d3a127dc3e5f0800f6f3 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 27 六月 2019 14:27:31 +0800
Subject: [PATCH] 7589 【2.0.100】【后端】资源找回优化

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.py |   29 ++++-------------------------
 1 files changed, 4 insertions(+), 25 deletions(-)

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 23e5938..8eca865 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.py
@@ -52,19 +52,11 @@
     GameWorld.ErrLog("没有找到跨服玩法对应分区! mapID=%s, serverGroupID=%s, zoneTypeName=%s" % (mapID, serverGroupID, zoneTypeName))
     return
 
-def GetServerCrossZoneMapIpyData(mapID, serverGroupID=0):
-    ## 获取本服对应跨服玩法分区地图信息
+def GetServerCrossZoneMapIpyData(zoneID, mapID):
+    ## 获取本服对应跨服玩法分区地图信息 - 仅适用于固定地图及虚拟分线的跨服玩法
     if mapID not in ChConfig.Def_CrossZoneMapTableName:
         return
     tableName = ChConfig.Def_CrossZoneMapTableName[mapID]
-    if not serverGroupID:
-        if GameWorld.IsCrossServer():
-            return
-        serverGroupID = GameWorld.GetServerGroupID()
-    zoneIpyData = GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID)
-    if not zoneIpyData:
-        return
-    zoneID = zoneIpyData.GetZoneID()
     return IpyGameDataPY.GetIpyGameDataByCondition(tableName, {"ZoneID":zoneID})
 
 def IsCrossServerOpen():
@@ -155,26 +147,13 @@
 
 def DoEnterCrossRealm(curPlayer):
     ## 玩家进入跨服处理,本服的逻辑处理
-    curPlayer.SetCanAttack(False)
-    curPlayer.SetVisible(False)
-    curPlayer.SetSight(0)
-    curPet = curPlayer.GetPetMgr().GetFightPet()
-    if curPet:
-        curPet.SetVisible(False)
+    PlayerControl.SetPlayerSightLevel(curPlayer, curPlayer.GetID())
     return
 
 def DoExitCrossRealm(curPlayer):
     ## 玩家退出跨服处理,本服的逻辑处理
     GameWorld.Log("DoExitCrossRealm...", curPlayer.GetPlayerID())
-    curPlayer.SetCanAttack(True)
-    curPlayer.SetVisible(True)
-    curPlayer.SetSight(1)
-    curPlayer.RefreshView()
-    curPlayer.SetSight(ChConfig.Def_PlayerSight_Default)
-    curPlayer.RefreshView()
-    curPet = curPlayer.GetPetMgr().GetFightPet()
-    if curPet:
-        curPet.SetVisible(True)
+    PlayerControl.SetPlayerSightLevel(curPlayer, 0)
     if PlayerControl.GetCrossMapID(curPlayer):
         PlayerControl.SetCrossMapID(curPlayer, 0)
     return

--
Gitblit v1.8.0