From fa36285c65432bd2994814f1bf21d8a3de544890 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 18 一月 2019 11:51:00 +0800
Subject: [PATCH] 5315 子 【1.5.100】登录奖励活动(初版)

---
 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