From 597f6350370aeea090967ac02f81e85d0385db22 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 01 九月 2018 18:12:14 +0800
Subject: [PATCH] 3192 合服数据后台发送
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.py | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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..88fe8bb 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)
@@ -1041,7 +1051,7 @@
#根据副本需求, 过滤NPC
for curNPC in gameNPCList:
#尸体不处理
- if curNPC.GetHP() <= 0:
+ if GameObj.GetHP(curNPC) <= 0:
continue
#召唤兽特殊判断
@@ -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