860312 套装技能战斗力

hch

2019-06-01 10f29653d4cf13514f319c8445ae01c36de9926a

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py

@@ -23,6 +23,8 @@
import CrossPlayerData

import NetPackCommon

import ChConfig

import FBCommon

import FBLogic





#------------------------------------------------------------------------------ 

@@ -68,20 +70,38 @@
        GameWorld.ErrLog("跨服已经在上传数据，不重复提交!playerRegisterMap=%s,registerMap=%s" % (playerRegisterMap, registerMap), curPlayer.GetPlayerID())

        return

    

    zoneID = 0

    #跨服前更新自己所属服务器组ID

    PlayerControl.UpdPlayerServerGroupID(curPlayer)

    serverGroupID = PlayerControl.GetPlayerServerGroupID(curPlayer)

    zoneIpyData = CrossRealmPlayer.GetCrossZoneIpyDataByServerGroupID(registerMap, serverGroupID)

    if not zoneIpyData:

        return

    zoneID = zoneIpyData.GetZoneID()

    
    if not mapID:

        zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(registerMap)

        zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(zoneID, 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()

        mapID, dataMapID, copyMapID, posX, posY = zoneIpyData.GetMapID(), zoneIpyData.GetDataMapID(), zoneIpyData.GetCopyMapID(), zoneIpyData.GetPosX(), zoneIpyData.GetPosY()

    
    if not posX or not posY:

        fbLineIpyData = FBCommon.GetFBLineIpyData(mapID, lineID)

        if fbLineIpyData:

            tick = GameWorld.GetGameWorld().GetTick()

            ipyEnterPosInfo = FBCommon.GetFBLineEnterPosInfo(mapID, lineID, fbLineIpyData)

            retPos = FBLogic.OnGetFBEnterPos(curPlayer, mapID, lineID, ipyEnterPosInfo, tick)

            if not retPos:

                GameWorld.ErrLog("未找到进入副本坐标！mapID=%s,lineID=%s" % (mapID, lineID))

                return

            posX, posY = retPos

            

    if not mapID:

    if not mapID or not posX or not posY:

        return

    

    #跨服前更新自己所属服务器组ID

    PlayerControl.UpdPlayerServerGroupID(curPlayer)

    if not FBLogic.OnRegEnterCrossFB(curPlayer, mapID, lineID):

        GameWorld.ErrLog("OnRegEnterCrossFB 进入跨服副本注册失败，进入条件不足！无法注册! mapID=%s,lineID=%s" % (mapID, lineID), playerID)

        return

    

    if registerMap in ChConfig.RegisterEnter_CrossServerMapIDList:

        prepareEnterCrossServer = ChPyNetSendPack.tagMCPrepareEnterCrossServer()

@@ -89,12 +109,13 @@
        NetPackCommon.SendFakePack(curPlayer, prepareEnterCrossServer)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_CrossRegisterMap, registerMap)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ReqCrossFBFuncLine, lineID)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ReqCrossFBZoneID, zoneID)

    CrossPlayerData.OnPlayerCrossReg(curPlayer)

    #curPlayer.SendMergeRegisterPlayer(mapID, dataMapID, copyMapID, posX, posY)

    curPlayer.SendMergeRegisterPlayerAfterChange(CrossRealmPlayer.GetCrossPlayerName(curPlayer), mapID, dataMapID, copyMapID, posX, posY)

    GameWorld.Log("    发送跨服玩家数据注册: registerMap=%s,lineID=%s,zoneID=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s,GetVsRoomId=%s" 

                  % (registerMap, lineID, zoneID, mapID, dataMapID, copyMapID, posX, posY, curPlayer.GetVsRoomId()), playerID)

    return

    return True



## 跨服赛报名结果（上传数据）

#  @param index 玩家索引

@@ -105,6 +126,7 @@
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    registerMap = curPlayer.NomalDictGetProperty(ChConfig.Def_PlayerKey_CrossRegisterMap)

    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PlayerKey_CrossRegisterMap, 0)

    curPlayer.SetDict(ChConfig.Def_PlayerKey_RequestEnterCrossServerTick, 0)

    playerID = curPlayer.GetPlayerID()

    result = registerResult.GetResult()

    GameWorld.Log("GameServer_MergeRegisterResult registerMap=%s,result=%s" % (registerMap, result), playerID)