From 0c973f689560b5d3c957a6a94797a210cd5aab34 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 十一月 2019 13:44:18 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统(去除协助类型定义)

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_PersonalBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_PersonalBoss.py
index 2af46e3..20bf4cd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_PersonalBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_PersonalBoss.py
@@ -30,7 +30,7 @@
 ## 是否需要做进入副本通用检查条件逻辑,默认需要检查
 def OnNeedCheckCanEnterFBComm(curPlayer, mapID, lineID):
     ## 进行中的不需要重复检查,防止断线重连被禁止进入
-    if FBCommon.GetCustomSceneState(curPlayer, mapID, lineID) == ChConfig.CustomSceneState_Fight:
+    if FBCommon.GetCustomMapStep(curPlayer, mapID, lineID) == ChConfig.CustomMapStep_Fight:
         GameWorld.DebugLog("VIPBoss已经在进行中,本次进入不需要重新检查!")
         return False
     return True
@@ -38,7 +38,8 @@
 ## 客户端进入自定义场景
 def OnEnterCustomScene(curPlayer, mapID, lineID):
     
-    if FBCommon.SetCustomSceneStart(curPlayer, mapID, lineID):
+    if FBCommon.GetCustomMapStep(curPlayer, mapID, lineID) != ChConfig.CustomMapStep_Fight:
+        FBCommon.SetCustomMapStep(curPlayer, mapID, lineID, ChConfig.CustomMapStep_Fight)
         FBCommon.DelFBEnterTicket(curPlayer, ChConfig.Def_FBMapID_PersonalBoss)
         #增加进入次数
         FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_PersonalBoss)
@@ -58,14 +59,13 @@
     if npcID != bossID:
         return
     
-    if FBCommon.GetCustomSceneState(curPlayer, mapID, lineID) != ChConfig.CustomSceneState_Fight:
+    if FBCommon.GetCustomMapStep(curPlayer, mapID, lineID) != ChConfig.CustomMapStep_Fight:
         return
-    FBCommon.SetCustomSceneOver(curPlayer, mapID, lineID)
     
     npcCountDict = {bossID:1}
     dropItemMapInfo = [0, 0]
     jsonItemList = NPCCommon.GiveKillNPCDropPrize(curPlayer, mapID, npcCountDict, dropItemMapInfo=dropItemMapInfo, isVirtualDrop=True)[0]
-    
+    FBCommon.SetCustomMapStep(curPlayer, mapID, lineID, ChConfig.CustomMapStep_Over)
     isPass = 1
     overDict = {FBCommon.Over_itemInfo:jsonItemList}
     FBCommon.NotifyFBOver(curPlayer, mapID, lineID, isPass, overDict)

--
Gitblit v1.8.0