From efb7e570e8aee945dedc80e2be76becca1ea7ba5 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 21 六月 2019 16:43:36 +0800
Subject: [PATCH] 6374 封魔坛、雷罚进入限制
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py | 16 +++++-----------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py | 15 +++++----------
2 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
index 648b076..3228329 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
@@ -110,12 +110,7 @@
if mapID == ChConfig.Def_FBMapID_SealDemonEx:
return
lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
- bossID = CurFBLineBOSSID(lineID)
- key = ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID
- GameWorld.GetGameWorld().SetGameWorldDict(key, 1)
- GameWorld.DebugLog(' 刷BOSSbossID=%s' % bossID)
-
-
+
refreshIDList = FBCommon.GetFBLineRefreshNPC(ChConfig.Def_FBMapID_SealDemon, lineID)
if refreshIDList:
for refreshID in refreshIDList:
@@ -136,11 +131,11 @@
FBCommon.SetFBPropertyMark(lineID)
else:
lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
-
+ gameFB = GameWorld.GetGameFB()
playerCnt = GameWorld.GetGameWorld().GetMapCopyPlayerManager().GetPlayerCount()
GameWorld.DebugLog("DoEnterFB...playerCnt=%s,lineID=%s" % (playerCnt, lineID), playerID)
-
- if lineID < 0:
+ overTick = gameFB.GetGameFBDictByKey(FBDict_IsOver)
+ if lineID < 0 or overTick:
PlayerControl.PlayerLeaveFB(curPlayer)
return
hadDelTicket = FBCommon.GetHadDelTicket(curPlayer)
@@ -165,7 +160,7 @@
return
UpdateHurtInfo(curPlayer, 0, True)
- gameFB = GameWorld.GetGameFB()
+
# 上鼓舞buff
encourageLV = gameFB.GetPlayerGameFBDictByKey(playerID, FBPlayerDict_EncourageLV)
if encourageLV > 0:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py
index 6363986..2ed99be 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py
@@ -122,13 +122,7 @@
# @return 返回值无意义
# @remarks 开启副本
def OnOpenFB(tick):
- lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
- bossID = CurFBLineBOSSID(lineID)
- if not bossID:
- return
- key = ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID
- GameWorld.GetGameWorld().SetGameWorldDict(key, 1)
- GameWorld.DebugLog(' 刷BOSSbossID=%s' % bossID)
+
return
## 进副本
@@ -140,11 +134,11 @@
playerID = curPlayer.GetPlayerID()
lineID = GameWorld.GetGameWorld().GetPropertyID() - 1
-
+ gameFB = GameWorld.GetGameFB()
playerCnt = GameWorld.GetGameWorld().GetMapCopyPlayerManager().GetPlayerCount()
GameWorld.DebugLog("DoEnterFB...playerCnt=%s,lineID=%s" % (playerCnt, lineID), playerID)
-
- if lineID < 0:
+ overTick = gameFB.GetGameFBDictByKey(FBDict_IsOver)
+ if lineID < 0 or overTick:
PlayerControl.PlayerLeaveFB(curPlayer)
return
hadDelTicket = FBCommon.GetHadDelTicket(curPlayer)
@@ -159,7 +153,7 @@
UpdateHurtInfo(curPlayer, 0, True)
- gameFB = GameWorld.GetGameFB()
+
# 上鼓舞buff
encourageLV = gameFB.GetPlayerGameFBDictByKey(playerID, FBPlayerDict_EncourageLV)
if encourageLV > 0:
--
Gitblit v1.8.0