hxp
2019-01-10 54531eb1ab1a76b508129e21ec5b7c32a1c7d0dc
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
@@ -818,7 +818,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
    
@@ -1774,7 +1774,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 +1817,7 @@
            GameWorld.DebugLog("    房间ID不同, playerID=%s" % (playerID))
            continue
        player.SetDict(ChConfig.Def_PlayerKey_IsLoginToMergeServer, 0)
        PlayerControl.SetCrossRealmState(player, 0)
        PlayerControl.SetCrossMapID(player, 0)
        
    return
@@ -1908,7 +1908,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