8012 【2.0.300】【后端】升星功能调整（概率计算调整）

hxp

2019-07-19 ccd935ceb37990a02ee734867e30db5a7e5cac29

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py

@@ -241,14 +241,16 @@
        return

    maxCount = min(2000, maxCount)

    upBillboardList = []

    if winner.danLV >= danLVLimit:

        upBillboardList.append(winner)

    else:

        GameWorld.DebugLog("    段位不足，无法上榜! winnerDanLV=%s < danLVLimit=%s" % (winner.danLV, danLVLimit), winner.playerID)

    if loser.danLV >= danLVLimit:

        upBillboardList.append(loser)

    else:

        GameWorld.DebugLog("    段位不足，无法上榜! loserDanLV=%s < danLVLimit=%s" % (loser.danLV, danLVLimit), loser.playerID)

    if winner:

        if winner.danLV >= danLVLimit:

            upBillboardList.append(winner)

        else:

            GameWorld.DebugLog("    段位不足，无法上榜! winnerDanLV=%s < danLVLimit=%s" % (winner.danLV, danLVLimit), winner.playerID)

    if loser:

        if loser.danLV >= danLVLimit:

            upBillboardList.append(loser)

        else:

            GameWorld.DebugLog("    段位不足，无法上榜! loserDanLV=%s < danLVLimit=%s" % (loser.danLV, danLVLimit), loser.playerID)

    if not upBillboardList:

        return

    

@@ -307,7 +309,8 @@
    matchState = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK)

    if not matchState and not PyGameData.g_crossPKRoomDict:

        GameWorld.Log("匹配已结束，且当前没有PK中的房间了！主动广播子服最新榜单! ")

        zoneIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKZone", zoneID)

        crossZoneName = GameWorld.GetCrossZoneName()

        zoneIpyData = IpyGameDataPY.GetIpyGameData("CrossZonePK", crossZoneName, zoneID)

        if zoneIpyData:

            serverGroupIDList = zoneIpyData.GetServerGroupIDList()

            SyncPKSyncBillboardToClientServer(zoneID, seasonID, serverGroupIDList)

@@ -366,7 +369,8 @@
        serverTime = GameWorld.GetServerTime()

        curSeasonID = 0

        seasonState = 0

        seasonList = IpyGameDataPY.GetIpyGameDataList("CrossRealmPKSeason", zoneID)

        crossZoneName = GameWorld.GetCrossZoneName()

        seasonList = IpyGameDataPY.GetIpyGameDataList("CrossRealmPKSeason", crossZoneName, zoneID)

        seasonList = [] if not seasonList else seasonList

        for seasonIpyData in seasonList:

            startDateStr = seasonIpyData.GetStartDate()

@@ -535,18 +539,19 @@
    

    zoneSeasonTimeDict = {}

    serverTime = GameWorld.GetServerTime()

    ipyDataMgr = IpyGameDataPY.IPY_Data()

    for index in xrange(ipyDataMgr.GetCrossRealmPKZoneCount()):

        zoneIpyData = ipyDataMgr.GetCrossRealmPKZoneByIndex(index)

    crossZoneName = GameWorld.GetCrossZoneName()

    crossZoneList = IpyGameDataPY.GetIpyGameDataByCondition("CrossZonePK", {"CrossZoneName":crossZoneName}, True)

    if not crossZoneList:

        return zoneSeasonTimeDict

    
    for zoneIpyData in crossZoneList:

        zoneID = zoneIpyData.GetZoneID()

        

        # 规定每个赛区的赛季时间需按顺序配置

        seasonIpyDataList = []

        for sIndex in xrange(ipyDataMgr.GetCrossRealmPKSeasonCount()):

            seasonIpyData = ipyDataMgr.GetCrossRealmPKSeasonByIndex(sIndex)

            if zoneID == seasonIpyData.GetZoneID():

                seasonIpyDataList.append(seasonIpyData)

                
        seasonIpyDataList = IpyGameDataPY.GetIpyGameDataList("CrossRealmPKSeason", crossZoneName, zoneID)

        if not seasonIpyDataList:

            continue

        
        for i, seasonIpyData in enumerate(seasonIpyDataList):

            seasonID = seasonIpyData.GetSeasonID()

            startDateStr = seasonIpyData.GetStartDate()

@@ -604,8 +609,9 @@
    

    gameWorld = GameWorld.GetGameWorld()

    serverTime = GameWorld.GetServerTime()

    crossZoneName = GameWorld.GetCrossZoneName()

    for zoneID, seasonTimeInfo in zoneSeasonTimeDict.items():

        zoneIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKZone", zoneID)

        zoneIpyData = IpyGameDataPY.GetIpyGameData("CrossZonePK", crossZoneName, zoneID)

        if not zoneIpyData:

            continue

        

@@ -664,12 +670,16 @@
    if not preState and isOpen:

        PyGameData.g_crossPKPlayerDict = {}

        PyGameData.g_crossPKZoneMatchPlayerDict = {}

        PyGameData.g_crossPKZoneMatchRobotPlayerDict = {}

        PyGameData.g_crossPKRoomDict = {}

        GameWorld.Log("跨服PK匹配状态开启，重置相关匹配数据!")

        

    ipyDataMgr = IpyGameDataPY.IPY_Data()

    for index in xrange(ipyDataMgr.GetCrossRealmPKZoneCount()):

        zoneIpyData = ipyDataMgr.GetCrossRealmPKZoneByIndex(index)

    crossZoneName = GameWorld.GetCrossZoneName()

    crossZoneList = IpyGameDataPY.GetIpyGameDataByCondition("CrossZonePK", {"CrossZoneName":crossZoneName}, True)

    if not crossZoneList:

        return

    
    for zoneIpyData in crossZoneList:

        zoneID = zoneIpyData.GetZoneID()

        

        # 广播当前赛区的所有子服跨服PK赛季状态变更

@@ -682,31 +692,47 @@
        

    return



def ClientServerMsg_ServerInitOK(serverGroupID, tick):

    ## 子服启动成功

    GameWorld.Log("子服启动成功，同步给子服对应的赛季信息: serverGroupID=%s" % (serverGroupID))

    zoneID = GetCrossPKServerGroupZoneID(serverGroupID)

    if not zoneID:

        GameWorld.Log("    该子服没有分配赛区，不同步!")

def Sync_CrossPKInitDataToClientServer(tick, serverGroupID=0):

    ''' 同步跨服PK活动数据到子服务器

    @param serverGroupID: 为0时同步所有子服

    '''

    
    GameWorld.Log("同步给子服对应的赛季信息: syncServerGroupID=%s" % (serverGroupID))

    if serverGroupID:

        ipyData = GetCrossPKServerGroupZone(serverGroupID)

        if not ipyData:

            return

        crossZoneList = [ipyData]

    else:

        crossZoneName = GameWorld.GetCrossZoneName()

        crossZoneList = IpyGameDataPY.GetIpyGameDataByCondition("CrossZonePK", {"CrossZoneName":crossZoneName}, True)

    if not crossZoneList:

        return

    gameWorld = GameWorld.GetGameWorld()

    seasonID = gameWorld.GetDictByKey(ChConfig.Def_WorldKey_CrossPKZoneSeasonID % zoneID)

    seasonState = gameWorld.GetDictByKey(ChConfig.Def_WorldKey_CrossPKZoneSeasonState % zoneID)

    matchState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK)

    seasonInfo = {"ZoneID":zoneID, "SeasonID":seasonID, "SeasonState":seasonState, "MatchState":matchState}

    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKSeasonInfo, seasonInfo, [serverGroupID])

    for zoneIpyData in crossZoneList:

        zoneID = zoneIpyData.GetZoneID()

        seasonID = gameWorld.GetDictByKey(ChConfig.Def_WorldKey_CrossPKZoneSeasonID % zoneID)

        seasonState = gameWorld.GetDictByKey(ChConfig.Def_WorldKey_CrossPKZoneSeasonState % zoneID)

        matchState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK)

        seasonInfo = {"ZoneID":zoneID, "SeasonID":seasonID, "SeasonState":seasonState, "MatchState":matchState}

        serverGroupIDList = [serverGroupID] if serverGroupID else zoneIpyData.GetServerGroupIDList()

        CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKSeasonInfo, seasonInfo, serverGroupIDList)

        
    return



def GetCrossPKServerGroupZoneID(serverGroupID):

def GetCrossPKServerGroupZone(serverGroupID):

    ## 获取服务器组ID对应的跨服PK所属赛区，返回0代表该服务器没有分配赛区

    ipyDataMgr = IpyGameDataPY.IPY_Data()

    for index in xrange(ipyDataMgr.GetCrossRealmPKZoneCount()):

        zoneIpyData = ipyDataMgr.GetCrossRealmPKZoneByIndex(index)

    crossZoneName = GameWorld.GetCrossZoneName()

    crossZoneList = IpyGameDataPY.GetIpyGameDataByCondition("CrossZonePK", {"CrossZoneName":crossZoneName}, True)

    if not crossZoneList:

        return

    
    for zoneIpyData in crossZoneList:

        for groupInfo in zoneIpyData.GetServerGroupIDList():

            if (isinstance(groupInfo, int) and serverGroupID == groupInfo) \

                or (isinstance(groupInfo, tuple) and len(groupInfo) == 2 and groupInfo[0] <= serverGroupID <= groupInfo[1]):

                return zoneIpyData.GetZoneID()

    return 0

                return zoneIpyData

    return



def OnPlayerLoginCrossServer(curPlayer):

    # 跨服登录处理

@@ -731,19 +757,21 @@
        return

    __OnLoginNotifyPKOverInfo(curPlayer)

    

    crossZoneName = GameWorld.GetCrossZoneName()

    crossZoneList = IpyGameDataPY.GetIpyGameDataByCondition("CrossZonePK", {"CrossZoneName":crossZoneName}, True)

    if not crossZoneList:

        return

    # 同步所有赛区赛季信息

    zoneSeasonInfo = ChPyNetSendPack.tagGCCrossRealmPKSeasonInfo()

    zoneSeasonInfo.ZoneList = []

    ipyDataMgr = IpyGameDataPY.IPY_Data()

    for index in xrange(ipyDataMgr.GetCrossRealmPKZoneCount()):

        zoneIpyData = ipyDataMgr.GetCrossRealmPKZoneByIndex(index)

    for zoneIpyData in crossZoneList:

        zoneID = zoneIpyData.GetZoneID()

        zoneInfo = ChPyNetSendPack.tagGCCrossRealmPKZone()

        zoneInfo.ZoneID = zoneID

        zoneInfo.ZoneName = zoneIpyData.GetZoneName().decode(ShareDefine.Def_Game_Character_Encoding).encode(GameWorld.GetCharacterEncoding())

        zoneInfo.ZoneNameLen = len(zoneInfo.ZoneName)

        zoneInfo.SeasonList = []

        seasonList = IpyGameDataPY.GetIpyGameDataList("CrossRealmPKSeason", zoneID)

        seasonList = IpyGameDataPY.GetIpyGameDataList("CrossRealmPKSeason", crossZoneName, zoneID)

        seasonList = [] if not seasonList else seasonList

        for seasonIpyData in seasonList:

            seasonInfo = ChPyNetSendPack.tagGCCrossRealmPKSeason()

@@ -764,6 +792,8 @@
    seasonStatePack.SeasonID = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID)

    seasonStatePack.SeasonState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState)

    seasonStatePack.MatchState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK)

    seasonStatePack.CrossZoneName = GameWorld.GetCrossZoneName()

    seasonStatePack.CrossZoneNameLen = len(seasonStatePack.CrossZoneName)

    NetPackCommon.SendFakePack(curPlayer, seasonStatePack)

        

    return

@@ -818,7 +848,7 @@
#        return



    vsRoomID = curPlayer.GetVsRoomId()

    if vsRoomID and PlayerControl.GetCrossRealmState(curPlayer) == 1:

    if vsRoomID and PlayerControl.GetCrossMapID(curPlayer) == ChConfig.Def_FBMapID_CrossRealmPK:

        GameWorld.DebugLog("玩家跨服PK状态，不能取消匹配！vsRoomID=%s" % vsRoomID, curPlayer.GetPlayerID())

        return

    

@@ -859,15 +889,20 @@
    pkScore = playerInfoDict["pkScore"] # 当前积分

    danLV = playerInfoDict["danLV"] # 当前段位

    cWinCount = playerInfoDict["cWinCount"] # 连胜次数

    cLoseCount = playerInfoDict["cLoseCount"] # 连败次数

    ondayScore = playerInfoDict["ondayScore"] # 过天时的积分

    

    if playerID in PyGameData.g_crossPKZoneMatchRobotPlayerDict:

        GameWorld.Log("玩家已匹配机器人，无法重复发起匹配! playerID=%s,accID=%s" % (playerID, accID))

        CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 2], [serverGroupID])

        return

    zoneMatchPlayerList = PyGameData.g_crossPKZoneMatchPlayerDict.get(pkZoneID, [])

    if playerID in zoneMatchPlayerList:

        GameWorld.Log("玩家正在匹配中，无法重复发起匹配！playerID=%s,accID=%s" % (playerID, accID))

        GameWorld.Log("玩家正在匹配中，无法重复发起匹配! playerID=%s,accID=%s" % (playerID, accID))

        CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 1], [serverGroupID])

        return

    if playerID in PyGameData.g_crossPKPlayerDict:

        GameWorld.Log("玩家正在战斗中，无法重复发起匹配！playerID=%s,accID=%s" % (playerID, accID))

        GameWorld.Log("玩家正在战斗中，无法重复发起匹配! playerID=%s,accID=%s" % (playerID, accID))

        CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, -2], [serverGroupID])

        return

    

@@ -889,14 +924,28 @@
    pkPlayer.serverGroupID = serverGroupID

    pkPlayer.pkZoneID = pkZoneID

    pkPlayer.seasonID = seasonID

    
    # 判断是否匹配机器人

    matchRobotRate = 0

    danIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKDan", danLV)

    if danIpyData:

        matchRobotRate = danIpyData.GetMatchRobotRate() + danIpyData.GetMatchRobotRateEx() * cLoseCount

        if matchRobotRate and GameWorld.CanHappen(matchRobotRate, 100):

            PyGameData.g_crossPKZoneMatchRobotPlayerDict[playerID] = pkPlayer

            GameWorld.DebugLog("玩家加入匹配: seasonID=%s,pkZoneID=%s,serverGroupID=%s,accID=%s,playerID=%s,pkScore=%s,fightPower=%s,cWinCount=%s" 
                               % (seasonID, pkZoneID, serverGroupID, accID, playerID, pkScore, fightPower, cWinCount))

            GameWorld.DebugLog("    本次匹配到机器人: danLV=%s,cLoseCount=%s,概率=%s" % (danLV, cLoseCount, matchRobotRate), playerID)

            CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 2], [serverGroupID])

            return

        
    PyGameData.g_crossPKPlayerDict[playerID] = pkPlayer

    

    # 加入赛区匹配列表

    zoneMatchPlayerList.append(playerID)

    PyGameData.g_crossPKZoneMatchPlayerDict[pkZoneID] = zoneMatchPlayerList

    

    GameWorld.DebugLog("玩家加入匹配: seasonID=%s,pkZoneID=%s,serverGroupID=%s,accID=%s,playerID=%s,pkScore=%s,fightPower=%s,cWinCount=%s,len(zoneMatchPlayerList)=%s" 
                       % (seasonID, pkZoneID, serverGroupID, accID, playerID, pkScore, fightPower, cWinCount, len(zoneMatchPlayerList)))

    GameWorld.DebugLog("玩家加入匹配: seasonID=%s,pkZoneID=%s,serverGroupID=%s,accID=%s,playerID=%s,pkScore=%s,fightPower=%s,cWinCount=%s,cLoseCount=%s,概率=%s,len(zoneMatchPlayerList)=%s" 
                       % (seasonID, pkZoneID, serverGroupID, accID, playerID, pkScore, fightPower, cWinCount, cLoseCount, matchRobotRate, len(zoneMatchPlayerList)))

    

    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 1], [serverGroupID])

    return

@@ -1048,8 +1097,11 @@
#    ipyDataMgr = IpyGameDataPY.IPY_Data()

#    if maxDanLV == None:

#        maxDanLV = ipyDataMgr.GetCrossRealmPKDanCount() - 1

#    for index in xrange(ipyDataMgr.GetCrossRealmPKZoneCount()):

#        zoneIpyData = ipyDataMgr.GetCrossRealmPKZoneByIndex(index)

#    crossZoneName = GameWorld.GetCrossZoneName()

#    crossZoneList = IpyGameDataPY.GetIpyGameDataByCondition("CrossZonePK", {"CrossZoneName":crossZoneName}, True)

#    if not crossZoneList:

#        return

#    for zoneIpyData in crossZoneList:

#        pkZoneID = zoneIpyData.GetZoneID()

#        

#        addPlayerList = []

@@ -1576,6 +1628,105 @@
    DR_CrossReamlPK("PKOverRoom", dataDict)

    return



def UpdatePKPlayerScore(roomID, pkPlayer, isWin):

    ## 更新PK玩家积分

    
    playerID = pkPlayer.playerID

    cWinCount = pkPlayer.cWinCount

    pkScore = pkPlayer.pkScore

    danLV = pkPlayer.danLV

    dayScore = max(0, pkScore - pkPlayer.ondayScore)# 今日已获得积分，正积分

    
    GameWorld.DebugLog("roomID=%s,playerID=%s,isWin=%s,dayScore=%s,pkScore=%s,danLV=%s,cWinCount=%s" 
                       % (roomID, playerID, isWin, dayScore, pkScore, danLV, cWinCount))

    
    pkDanIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKDan", danLV)

    if not pkDanIpyData:

        GameWorld.ErrLog("跨服PK房间段位数据异常! roomID=%s,playerID=%s,danLV=%s" % (roomID, playerID, danLV))

    
    baseScoreList = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKScore", 2) # 胜负保底分

    wBaseScore = baseScoreList[0] if len(baseScoreList) > 0 else 0

    lBaseScore = baseScoreList[1] if len(baseScoreList) > 1 else 0

    wExScore = eval(IpyGameDataPY.GetFuncCompileCfg("CrossRealmPKScore", 3)) # 胜方附加分

    lExScore = 0

    
    if isWin:

        addScore = wBaseScore + wExScore

        pkPlayer.cWinCount += 1

    else:

        addScore = lBaseScore + lExScore

        pkPlayer.cWinCount = 0

        
    dayMaxScore = IpyGameDataPY.GetFuncCfg("CrossRealmPKScore", 1) # 每日获得积分上限，0为不限制

    if dayMaxScore and addScore:

        addScore = min(dayMaxScore - dayScore, addScore)

    pkPlayer.pkScore += addScore

    
    if pkDanIpyData and pkDanIpyData.GetLVUpScore() and pkPlayer.pkScore >= pkDanIpyData.GetLVUpScore():

        pkPlayer.danLV += 1

        
    return addScore



def ClientServerMsg_PKRobotOver(serverGroupID, playerInfoDict, tick):

    ## 收到子服同步的PK机器人结算

    
    if not GameWorld.IsCrossServer():

        GameWorld.ErrLog("非跨服服务器不处理跨服PK匹配请求！")

        return

    
    playerID = playerInfoDict["playerID"] # 角色ID

    isWinner = playerInfoDict["isWinner"] # 是否获胜

    
    if playerID not in PyGameData.g_crossPKZoneMatchRobotPlayerDict:

        GameWorld.DebugLog("玩家没有匹配到机器人，无法结算PK机器人奖励!", playerID)

        return

    pkPlayer = PyGameData.g_crossPKZoneMatchRobotPlayerDict.pop(playerID)

    zoneID = pkPlayer.pkZoneID

    seasonID = pkPlayer.seasonID

    
    GameWorld.Log("机器人跨服PK结算: isWinner=%s,zoneID=%s,seasonID=%s,pkScore=%s,danLV=%s,cWinCount=%s" 
                  % (isWinner, zoneID, seasonID, pkPlayer.pkScore, pkPlayer.danLV, pkPlayer.cWinCount), playerID)

    
    roomID = 0

    addScore = UpdatePKPlayerScore(roomID, pkPlayer, isWinner)

    pkScore = pkPlayer.pkScore

    danLV = pkPlayer.danLV

    cWinCount = pkPlayer.cWinCount

    
    GameWorld.Log("    更新: addScore=%s,pkScore=%s,danLV=%s,cWinCount=%s" % (addScore,pkScore, danLV, cWinCount), playerID)

    
    if isWinner:

        winner, loser = pkPlayer, None

    else:

        winner, loser = None, pkPlayer

        
    # 更新排行榜

    UpdateCrossPKBillboard(zoneID, seasonID, winner, loser)

    
    # PK机器人默认结果数据

    overType = 0

    roundWinnerIDList = []

    notifyState = False

    winnerID = winner.playerID if winner else 0

    tagPlayerID = 0

    tagPlayerName = ""

    
    timeStr = GameWorld.GetCurrentDataTimeStr()

    playerOverDict = {}

    playerOverDict[playerID] = [roomID, zoneID, seasonID, timeStr, overType, winnerID, roundWinnerIDList] \

                                + [serverGroupID, pkScore, danLV, cWinCount, addScore, tagPlayerID, tagPlayerName, notifyState]

                                
    serverGroupIDList = [pkPlayer.serverGroupID]

    GameWorld.DebugLog("同步子服战斗结果: seasonID=%s,timeStr=%s,roomID=%s,overType=%s,winnerID=%s,roundWinnerIDList=%s" 
                       % (seasonID, timeStr, roomID, overType, winnerID, roundWinnerIDList))

    # 同步子服

    CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKOverInfo, playerOverDict, serverGroupIDList)

    
    # 记录流向

    dataDict = {"zoneID":zoneID, "seasonID":seasonID, "pkPlayer":pkPlayer.GetDRInfo()}

    DR_CrossReamlPK("PKOverRobot", dataDict)

    return



##================================== 以下是子服逻辑 ==========================================



def OnGameServerInitOK():

@@ -1629,7 +1780,12 @@
    GameWorld.Log("    zoneID=%s,seasonID=%s,seasonState=%s,matchState=%s" % (zoneID, seasonID, seasonState, matchState))

    if not zoneID:

        return

    
    if not seasonID:

        dbSeasonID = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID)

        if dbSeasonID:

            GameWorld.ErrLog("    已经有分配赛季ID的暂定不能被置为0! dbSeasonID=%s" % dbSeasonID)

            return

        
    gameWorld = GameWorld.GetGameWorld()

    curSeasonState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState)

    

@@ -1668,6 +1824,8 @@
    seasonStatePack.SeasonID = seasonID

    seasonStatePack.SeasonState = seasonState

    seasonStatePack.MatchState = matchState

    seasonStatePack.CrossZoneName = GameWorld.GetCrossZoneName()

    seasonStatePack.CrossZoneNameLen = len(seasonStatePack.CrossZoneName)

    playerManager = GameWorld.GetPlayerManager()

    for i in xrange(playerManager.GetPlayerCount()):

        curPlayer = playerManager.GetPlayerByIndex(i)

@@ -1683,14 +1841,22 @@
    if not curPlayer:

        return

    

    if not result:

        return

    
    if result == -2:

        PlayerControl.NotifyCode(curPlayer, "CrossMatching17")

        return

    

    startMatchPack = ChPyNetSendPack.tagGCCrossRealmPKStartMatch()

    
    if result == 1:

        SetIsCrossPKMatching(curPlayer, 1)

        NetPackCommon.SendFakePack(curPlayer, ChPyNetSendPack.tagGCCrossRealmPKStartMatch())

        startMatchPack.IsRobot = 0

    elif result == 2:

        startMatchPack.IsRobot = 1

        

    NetPackCommon.SendFakePack(curPlayer, startMatchPack)    
    return



## 跨服匹配状态

@@ -1774,7 +1940,7 @@
                    matchPlayer.MaxProDef = readyPlayerInfo["MaxProDef"]

                    break

                

            PlayerControl.SetCrossRealmState(player, ChConfig.Def_FBMapID_CrossRealmPK)

            PlayerControl.SetCrossMapID(player, ChConfig.Def_FBMapID_CrossRealmPK)

            SetIsCrossPKMatching(player, 0)

            

            # 通知匹配成功，可进入跨服

@@ -1817,7 +1983,7 @@
            GameWorld.DebugLog("    房间ID不同, playerID=%s" % (playerID))

            continue

        player.SetDict(ChConfig.Def_PlayerKey_IsLoginToMergeServer, 0)

        PlayerControl.SetCrossRealmState(player, 0)

        PlayerControl.SetCrossMapID(player, 0)

        

    return



@@ -1874,6 +2040,8 @@
        

        sendMapOverInfo = [roomID, zoneID, seasonID, timeStr, overType, winnerID, roundWinnerIDList, pkScore, danLV, cWinCount, addScore, tagPlayerID, tagPlayerName, notifyState]

        player = GameWorld.GetPlayerManager().FindPlayerByID(playerID)

        if not player:

            CrossRealmPlayer.DoOfflinePlayerExitCrossServer(playerID)

        if not player or PlayerControl.GetIsTJG(player):

            GameWorld.DebugLog("    玩家不在线 或脱机中，先缓存，玩家上线后再同步，playerID=%s" % (playerID))

            overInfoData = PyGameDataStruct.tagDBCrossPKUnNotifyOverInfo()

@@ -1908,7 +2076,7 @@
    overInfoData = PyDataManager.GetCrossPKUnNotifyOverInfoManager().GetPlayerUnNotifyOverInfo(playerID)

    if not overInfoData:

        return

    PlayerControl.SetCrossRealmState(curPlayer, 0)

    PlayerControl.SetCrossMapID(curPlayer, 0)

    PlayerControl.SetVsRoomId(curPlayer, 0)

    

    zoneID = overInfoData.ZoneID