From e8dd07d4ed0ffd52c781e1fe8c2eac3ef71adf38 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 24 八月 2018 17:11:05 +0800
Subject: [PATCH] fix:召唤兽基础NPC主人的最终伤害,压制飘血通知由服务端通知

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