From fd929faf55ab49f558ee2f7b5ef9adcba0de82c6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 30 八月 2018 19:26:25 +0800
Subject: [PATCH] fix:3101 【后端】仙盟贡献物品效果

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.py |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.py
index b399c4a..ae3e662 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.py
@@ -39,6 +39,7 @@
 import GameWorld
 import ChConfig
 import PlayerControl
+import FamilyRobBoss
 import EventShell
 import FBLogic
 import FBCommon
@@ -422,9 +423,13 @@
             return IPY_GameWorld.cmePlayerFull
 
     #检查副本状态是否可以登录
-    if not FBCommon.CheckFBStateCanEnter(askStruct):
+    checkRet = FBCommon.CheckFBStateCanEnter(askStruct)
+    if type(checkRet) not in [tuple, list]:
+        checkRet = (checkRet, "FB_andyshao_861048")
+    canEnter, notifyMark = checkRet
+    if not canEnter:
         #副本关闭中, 请稍后
-        return IPY_GameWorld.cmeCustom, 'FB_andyshao_861048'
+        return IPY_GameWorld.cmeCustom, notifyMark
     
     changeMapAskResult = FBLogic.OnChangeMapAsk(askStruct, tick)
 
@@ -497,6 +502,9 @@
     __RefreshOnFiveMinute(tick)
     #定时检测关闭超时文件
     EventReport.OnTimeCloseScribeTxt()
+    
+    #仙盟归属boss定时处理
+    FamilyRobBoss.OnFamilyOwnerBossProcess(tick)
     return
 
 ## 通知RouteServer 消息

--
Gitblit v1.8.0