From 0e2e58e69f47e85a9aafc53a4af67c3f82493b6c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 22 八月 2018 11:02:04 +0800
Subject: [PATCH] Fix: 2764 【后端】优化分流规则(同地图切坐标不分流);

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
index 0afee67..023ee82 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py
@@ -943,7 +943,17 @@
         if gameWorld.GetCloseFBTick() > 0:
             #不可进入
             return False
-
+        
+        if askStruct.GetTeamLV() == IPY_GameWorld.tmlLeader:
+            '''原因: 
+                                队长退出组队副本,其他队员还在里面,此时副本不会被关闭
+                                 队长在队伍ID不变的情况下又组了其他人,然后又想进去该副本,那么这时会进入之前队员还在的那条队伍分线,导致队伍线路错乱
+                                所以此处不允许该队长进入,并提示其等待或重新建队进入
+                                
+            FBinCantEnter 副本清理中,请等待关闭或重新创建队伍进入
+            '''
+            return False, "FBinCantEnter"
+        
         #副本在等待关闭状态不允许玩家进入
         return (gameWorld.GetOpenState() != IPY_GameWorld.fbosWaitForClose)
 
@@ -1370,7 +1380,7 @@
     fbIpyData = GetFBIpyData(mapID)
     maxTimes = fbIpyData.GetDayTimes()
     MWPrivilegeID = fbIpyData.GetExtraTimesMWPriID()
-    wmpIpyData = PlayerMagicWeapon.GetMagicWeaponPrivilege(curPlayer, MWPrivilegeID)
+    
     mwAddCnt = 0#wmpIpyData.GetEffectValue() if wmpIpyData else 0
     extraTimesVIPPriID = fbIpyData.GetExtraTimesVIPPriID()
     extraCnt = PlayerVip.GetPrivilegeValue(curPlayer, extraTimesVIPPriID)
@@ -1386,7 +1396,7 @@
     enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_EnterFbCntDay % mapID)
     maxTimes = fbIpyData.GetDayTimes()
     MWPrivilegeID = fbIpyData.GetExtraTimesMWPriID()
-    wmpIpyData = PlayerMagicWeapon.GetMagicWeaponPrivilege(curPlayer, MWPrivilegeID)
+    
     mwAddCnt = 0#wmpIpyData.GetEffectValue() if wmpIpyData else 0
     maxTimes += mwAddCnt #法宝增加的次数加到基础次数里
     extraTimesVIPPriID = fbIpyData.GetExtraTimesVIPPriID()

--
Gitblit v1.8.0