From 94c9b0759bfa49e66bfce3f790c40f15d362ba1a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 10 一月 2019 15:17:26 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发（支持跨服复活）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index 357373c..bbcc5fd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -155,15 +155,15 @@
PlayerControl.SetCrossRealmState(curPlayer, 0)
return
-def SendCrossRealmReg(curPlayer, registerType, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
+def SendCrossRealmReg(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
# 发送跨服账号注册上传数据
# 设置上传数据的活动类型
- curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterType, registerType)
- sysMsg = str([registerType, mapID, dataMapID, copyMapID, posX, posY])
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, registerMap)
+ sysMsg = str([registerMap, mapID, dataMapID, copyMapID, posX, posY])
curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossRealmReg", sysMsg, len(sysMsg))
- GameWorld.Log("SendCrossRealmReg registerType=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s"
- % (registerType, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
+ GameWorld.Log("SendCrossRealmReg registerMap=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s"
+ % (registerMap, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
return
def OnCrossRealmRegOK(playerID, msgList, tick):
@@ -176,16 +176,16 @@
if not IsCrossServerOpen():
return
- registerType = msgList[0]
- playerRegisterType = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CrossRegisterType)
- if playerRegisterType and registerType != playerRegisterType:
+ registerMap = msgList[0]
+ playerRegisterMap = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CrossRegisterMap)
+ if playerRegisterMap and registerMap != playerRegisterMap:
return
- curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterType, 0)
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, 0)
- GameWorld.Log("跨服报名成功 , registerType=%s" % (registerType), playerID)
+ GameWorld.Log("跨服报名成功 , registerMap=%s" % (registerMap), playerID)
# 跨服PK上传数据完毕，通知跨服服务器，准备完毕
- if registerType == ChConfig.Def_FBMapID_CrossRealmPK:
+ if registerMap == ChConfig.Def_FBMapID_CrossRealmPK:
regVSRoomID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MergeRegisterRoomID)
vsRoomID = curPlayer.GetVsRoomId()
@@ -204,13 +204,13 @@
# 其他的，在上传数据完毕后，使用通用的通知可进入跨服
else:
- NotifyCanEnterMergeServer(curPlayer, registerType)
+ NotifyCanEnterMergeServer(curPlayer, registerMap)
# hxp 2015.09.10 跨服boss，后面的暂时不需要
return
-def NotifyCanEnterMergeServer(curPlayer, registerType):
+def NotifyCanEnterMergeServer(curPlayer, registerMap):
# 通用包，通知客户端可进入跨服服务器
return
--
Gitblit v1.8.0