From 321404e348a4b11c5389fd3f3e3dd5d3fee7cdc5 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 21 一月 2019 19:24:21 +0800
Subject: [PATCH] 5999 【主干】优化上线通知玩家技能

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
index 8fc44ee..47c47c3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
@@ -18,7 +18,6 @@
 import IPY_GameWorld
 import PlayerControl
 import GameWorldProcess
-import PlayerMergeEvent
 import ReadChConfig
 import ShareDefine
 import FBCommon
@@ -696,9 +695,6 @@
         #GameWorld.Log("副本逻辑不可使用   GameLogic_%d"%(mapID))
         callFunc(curPlayer , tick)
     
-    #有玩家离开副本广播一次
-    PlayerMergeEvent.BroadcastMergePlayerEvent()
-    
     #如果是最后一个人离开副本, 那么设置副本的离开时间, 5分钟后副本关闭
     __PlayerLeaveSetPlayerLogoffTick(curPlayer, tick)
     return
@@ -1229,7 +1225,7 @@
 def PlayerLoginInFBCheck(curPlayer, tick):
     gameMap = GameWorld.GetMap()
     #如果此地图是自动释放的, 需要检查这个玩家
-    if gameMap.GetMapFBType() == 0:
+    if gameMap.GetMapFBType() in [IPY_GameWorld.fbtNull, IPY_GameWorld.fbtCrossVSRoom]:
         return False
     
     #玩家 在副本中,并且副本不踢出玩家下线

--
Gitblit v1.8.0