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/GameWorldMixServerCampaign.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.py
index f241f1e..04ea05e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.py
@@ -48,7 +48,7 @@
 def MixServerOnDay():
     
     # 跨服服务器功能限制
-    if GameWorld.IsMergeServer():
+    if GameWorld.IsCrossServer():
         return
     
     isMixServer = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer) # 是否合服

--
Gitblit v1.8.0