From f194ca807c0ef437b866e74db7cd4dcb02e531c3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 14 二月 2019 17:54:57 +0800
Subject: [PATCH] 6211 【后端】【1.6】合服任务单（运营活动支持合服定制）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py
index 57fb5d0..f0bdca9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py
@@ -20,6 +20,7 @@
import CrossRealmPlayer
import IPY_GameWorld
import ChPyNetSendPack
+import CrossPlayerData
import NetPackCommon
import ChConfig
@@ -69,7 +70,7 @@
zoneID = 0
if not mapID:
- zoneIpyData = CrossRealmPlayer.GetServerCrossZoneIpyData(registerMap)
+ zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(registerMap)
if not zoneIpyData:
GameWorld.ErrLog("找不到该服务器对应跨服分区: registerMap=%s" % (registerMap))
return
@@ -87,6 +88,7 @@
prepareEnterCrossServer.DataMapID = registerMap
NetPackCommon.SendFakePack(curPlayer, prepareEnterCrossServer)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_CrossRegisterMap, registerMap)
+ CrossPlayerData.OnPlayerCrossReg(curPlayer)
#curPlayer.SendMergeRegisterPlayer(mapID, dataMapID, copyMapID, posX, posY)
curPlayer.SendMergeRegisterPlayerAfterChange(CrossRealmPlayer.GetCrossPlayerName(curPlayer), mapID, dataMapID, copyMapID, posX, posY)
GameWorld.Log(" 发送跨服玩家数据注册: registerMap=%s,zoneID=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s,GetVsRoomId=%s"
@@ -113,7 +115,7 @@
if registerMap in ChConfig.RegisterEnter_CrossServerMapIDList:
CrossRealmPlayer.DoEnterCrossRealm(curPlayer)
- PlayerControl.SetCrossRealmState(curPlayer, registerMap)
+ PlayerControl.SetCrossMapID(curPlayer, registerMap)
NetPackCommon.SendFakePack(curPlayer, ChPyNetSendPack.tagMCStartEnterCrossServer())
return
--
Gitblit v1.8.0