5424 【后端】【1.4】跨服竞技场开发（GM工具增加子服服务器维护，文字翻译版）

hxp

2018-12-30 1ea73e1885835466265ce788d93556b7030ee0e8

 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py

@@ -46,19 +46,14 @@
import ShareDefine

import GameDataRecord

import GameWorldShopItem

import PlayerMergeRegister

import PlayerCompensation

import PlayerFB

import UpdatePlayerName

import PlayerFamilyBoss

import PlayerManorWar

import GameWorldBoss

import MergeBroadcast

import GameWorldFamilyWar

import GameWorldMergeKing

import GameWorldMergePK

#import PlayerFamilyTech

import MergeChildMsg

import PlayerFamilyRedPacket

import PlayerFBHelpBattle

import PlayerFamilyStore

@@ -74,6 +69,9 @@
import PyGameData

import PlayerTalk

import PlayerStore

import CrossRealmPlayer

import CrossRealmMsg

import CrossRealmPK



import time

import datetime

@@ -426,12 +424,14 @@
        PlayerCompensation.SendPersonalItemMailBatch(eval(resultName))

        return

    

    if callName == 'SendMergerChildMsg':

        operType, dataMsg = eval(resultName)

        MergeChildMsg.SendMergerChildToCenterStringData(operType, dataMsg)

        # 如果是恢复跨服PK连胜的，先记录恢复的玩家ID, 等待成功后同步最新结果给玩家

        if operType == ChConfig.Def_RecoverMergePKWin:

            GameWorldMergePK.Add_RecoverMergePKWinPlayer(srcPlayerID)

    if callName == "SendMsgToCrossServer":

        msgType, dataMsg = eval(resultName)

        CrossRealmMsg.SendMsgToCrossServer(msgType, dataMsg)

        return

    
    if callName == "SendMsgToClientServer":

        msgType, dataMsg, serverGroupIDList = eval(resultName)

        CrossRealmMsg.SendMsgToClientServer(msgType, dataMsg, serverGroupIDList)

        return

    

    if callName == 'MergeWorldNotify':

@@ -527,33 +527,35 @@
        GameDataRecord.ChangeCoinCnt(eval(resultName))

        return

    

    #跨服广播子服

    if callName == 'SendBroadcastMergeClient':

        operType, mapID, dataDict, isRepeat = eval(resultName)

        MergeBroadcast.SendBroadcastMerge(operType, mapID, dataDict, isRepeat)

        return



    #跨服赛报名获得新账号

    if callName == 'MergeRegister':

        PlayerMergeRegister.MergeWarRegisterNewAcc(srcPlayerID, eval(resultName), tick)

        return    
    
    #跨服王者争霸

    if callName == 'MergeKingFB':

        GameWorldMergeKing.MapServer_MergeKingFB(eval(resultName))

    #跨服匹配PK战斗结算

    if callName == "CrossPKOver":

        CrossRealmPK.MapServer_CrossPKOver(eval(resultName), tick)

        return

    

    #跨服匹配PK

    if callName == 'MergePKOver':

        GameWorldMergePK.MapServer_MergePKOver(eval(resultName))

    #跨服匹配房间开启

    if callName == "CrossPKRoomOpen":

        CrossRealmPK.MapServer_CrossPKRoomOpen(eval(resultName), tick)

        return

    

    #跨服匹配PK取消匹配

    if callName == 'MergePKCancel':

    if callName == "CrossRealmPKCancel":

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

        if not curPlayer:

            return

        GameWorldMergePK.SendCancelMergePKMatch(curPlayer, resultName)

        CrossRealmPK.SendCancelCrossRealmPKMatch(curPlayer, resultName)

        return

    
    #跨服PK请求玩家当前排名

    if callName == "CrossPKSeasonOrder":

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

        if not curPlayer:

            return

        CrossRealmPK.MapServer_QueryCrossPKSeasonOrder(curPlayer, eval(resultName))

        return

    
    #跨服注册结果

    if callName == "CrossRealmReg":

        CrossRealmPlayer.OnCrossRealmRegOK(srcPlayerID, eval(resultName), tick)

        return

    

    #py喇叭聊天

@@ -829,15 +831,6 @@
        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

        resultName = '%s' % GameWorldOpenServerCampaign.CanGiveCampaignAward(curPlayer, eval(resultName))

        

    # 跨服PK奖励

    if callName == 'MergePKAward':

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

        resultName = '%s' % GameWorldMergePK.MapServer_QueryMergePKAward(curPlayer, eval(resultName))

        
    # 跨服王者争霸

    if callName == 'MergeKing':

        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

        resultName = '%s' % GameWorldMergeKing.MapServer_MergeKingQuery(curPlayer, eval(resultName))

    

    # 玩家自身战盟科技等级提升, 改为地图直接处理, 暂屏蔽

#    if callName == 'PlayerFamilyTechLVUP':