From 7fc14311b1a05376ffb63c6ddb8ccbfda6ee0456 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 11 一月 2019 21:59:21 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发（增加回本服时如果本服角色死亡则直接复活、回本服刷新本服队伍信息）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
index 414e290..928b0f9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
+++ b/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, 1)
+ 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
--
Gitblit v1.8.0