From 133a8b5682a9b7637b20f2be88d27628fb6ca39a Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 12 二月 2019 15:53:56 +0800
Subject: [PATCH] 5819 【后端】【1.6】运营活动支持对应不同的职业和世界等级(累计充值修改)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 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 b4d8357..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
@@ -16,9 +16,13 @@
#-------------------------------------------------------------------------------
import GameWorld
+import PlayerControl
import CrossRealmPlayer
import IPY_GameWorld
-import ChPlayer
+import ChPyNetSendPack
+import CrossPlayerData
+import NetPackCommon
+import ChConfig
#------------------------------------------------------------------------------
@@ -43,29 +47,52 @@
# @remarks 函数详细说明.
def DoResult(curPlayer, callFunName, funResult, tick):
resultInfo = eval(funResult)
- actionType = resultInfo[0]
- mapPosInfo = resultInfo[1:]
- if not curPlayer:
+ GameWorld.Log("GY_Query_CrossRealmReg DoResult %s" % funResult, curPlayer.GetPlayerID())
+ if not resultInfo:
return
-
- playerID = curPlayer.GetPlayerID()
- GameWorld.Log("GY_Query_CrossRealmReg DoResult %s" % funResult, playerID)
+ registerMap, mapID, dataMapID, copyMapID, posX, posY = resultInfo
+ RegisterEnterCrossServer(curPlayer, registerMap, mapID, dataMapID, copyMapID, posX, posY)
+ return
- if GameWorld.IsMergeServer():
+def RegisterEnterCrossServer(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
+ '''
+ @param registerMap: 一般是dataMapID
+ '''
+ playerID = curPlayer.GetPlayerID()
+ if GameWorld.IsCrossServer():
GameWorld.Log(" 跨服服务器不允许上传报名数据!", playerID)
return
- if not mapPosInfo:
+ playerRegisterMap = curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_CrossRegisterMap)
+ if playerRegisterMap in ChConfig.RegisterEnter_CrossServerMapIDList:
+ GameWorld.ErrLog("跨服已经在上传数据，不重复提交!playerRegisterMap=%s,registerMap=%s" % (playerRegisterMap, registerMap), curPlayer.GetPlayerID())
+ return
+
+ zoneID = 0
+ if not mapID:
+ zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(registerMap)
+ if not zoneIpyData:
+ GameWorld.ErrLog("找不到该服务器对应跨服分区: registerMap=%s" % (registerMap))
+ return
+ zoneID, mapID, dataMapID, copyMapID, posX, posY = zoneIpyData.GetZoneID(), zoneIpyData.GetMapID(), \
+ zoneIpyData.GetDataMapID(), zoneIpyData.GetCopyMapID(), zoneIpyData.GetPosX(), zoneIpyData.GetPosY()
+
+ if not mapID:
return
#跨服前更新自己所属服务器组ID
- ChPlayer.UpdatePlayerServerGroupID(curPlayer)
+ PlayerControl.UpdPlayerServerGroupID(curPlayer)
- mapID, dataMapID, copyMapID, posX, posY = mapPosInfo
+ if registerMap in ChConfig.RegisterEnter_CrossServerMapIDList:
+ prepareEnterCrossServer = ChPyNetSendPack.tagMCPrepareEnterCrossServer()
+ 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(" 发送跨服玩家数据注册: actionType=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s,GetVsRoomId=%s"
- % (actionType, mapID, dataMapID, copyMapID, posX, posY, curPlayer.GetVsRoomId()), playerID)
+ GameWorld.Log(" 发送跨服玩家数据注册: registerMap=%s,zoneID=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s,GetVsRoomId=%s"
+ % (registerMap, zoneID, mapID, dataMapID, copyMapID, posX, posY, curPlayer.GetVsRoomId()), playerID)
return
## 跨服赛报名结果（上传数据）
@@ -75,19 +102,28 @@
def GameServer_MergeRegisterResult(index, tick):
registerResult = IPY_GameWorld.IPY_GMMergeRegisterPlayerResult()
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ registerMap = curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_CrossRegisterMap)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_CrossRegisterMap, 0)
playerID = curPlayer.GetPlayerID()
result = registerResult.GetResult()
+ GameWorld.Log("GameServer_MergeRegisterResult registerMap=%s,result=%s" % (registerMap, result), playerID)
if not result:
errorMsg = registerResult.GetErrorMsg()
GameWorld.Log("CrossRealmReg result Error:%s" % errorMsg, playerID)
+ NetPackCommon.SendFakePack(curPlayer, ChPyNetSendPack.tagMCEnterCrossServerError())
+ return
+
+ if registerMap in ChConfig.RegisterEnter_CrossServerMapIDList:
+ CrossRealmPlayer.DoEnterCrossRealm(curPlayer)
+ PlayerControl.SetCrossMapID(curPlayer, registerMap)
+ NetPackCommon.SendFakePack(curPlayer, ChPyNetSendPack.tagMCStartEnterCrossServer())
return
#newAccount = registerResult.GetAccount()
#newName = registerResult.GetPwd()
- msgList = str([])
+ msgList = str([registerMap])
GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetID(), 0, 0, "CrossRealmReg", msgList, len(msgList))
- GameWorld.Log("GameServer_MergeRegisterResult msgList=%s" % msgList, playerID)
return
--
Gitblit v1.8.0