From 609e16921fd14b577cb7e4f56777a839b408b311 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 20 八月 2018 20:13:04 +0800
Subject: [PATCH] Merge commit '444a48bf8875c1c4295871d48eee7433ac700734'
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.py | 8 ++++++--
1 files changed, 6 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..e3ddad5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.py
@@ -422,9 +422,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)
--
Gitblit v1.8.0