From 9f88b35005ae7075509b49b12e6454da4d4f488c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 22 二月 2019 18:20:40 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单(封包)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py |   10 +++++-----
 1 files changed, 5 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..6d8d8c7 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,7 @@
 import IPY_GameWorld
 import PlayerControl
 import GameWorldProcess
-import PlayerMergeEvent
+import PlayerSuccess
 import ReadChConfig
 import ShareDefine
 import FBCommon
@@ -517,12 +517,15 @@
     #注册玩家离开副本时间
     gameFBMgr.SetPlayerLogoffTick(0)
     
+    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FeastRedPack_EnterMap, 1, [gameMapID])
+    
     if gameFBMgr.HaveFBPlayer(curPlayerID):
         #已经注册了这个玩家, 不清除已注册的玩家的字典信息
         return
     
     #注册进入这个副本的玩家
     gameFBMgr.AddFBPlayer(curPlayerID)
+    
     return
 
 def DoEnterFB(curPlayer, tick):
@@ -695,9 +698,6 @@
     if callFunc:
         #GameWorld.Log("副本逻辑不可使用   GameLogic_%d"%(mapID))
         callFunc(curPlayer , tick)
-    
-    #有玩家离开副本广播一次
-    PlayerMergeEvent.BroadcastMergePlayerEvent()
     
     #如果是最后一个人离开副本, 那么设置副本的离开时间, 5分钟后副本关闭
     __PlayerLeaveSetPlayerLogoffTick(curPlayer, tick)
@@ -1229,7 +1229,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