From 025e48a224019c84c170d53c942c66fc32791bbb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 20 十二月 2018 19:14:19 +0800
Subject: [PATCH] 5372 【后端】【1.4】聚魂副本开发

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.py |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.py
index e99d2ec..6d7f110 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.py
@@ -199,13 +199,13 @@
 
     itemDict = PyGameData.g_gathersoulfbAwardDict.get(curPlayer.GetID(), {})
     helpItemInfo = {}
-    for wheel, itemList in itemDict:
+    for wheel, itemList in itemDict.items():
         helpItemInfo[str(wheel)] = FBCommon.GetJsonItemList(itemList)
     helpDict = {FBCommon.Help_wheel:curWheel, 
                 FBCommon.Help_step:fbStep, 
                 FBCommon.Help_npc:FBCommon.GetJsonNPCKillList(guardDict),
                 FBCommon.Help_isAuto:isAutoBoss,
-                FBCommon.Help_isAuto:hasRefreshBoss,
+                FBCommon.Help_hasRefreshBoss:hasRefreshBoss,
                 FBCommon.Help_gsItemInfo:helpItemInfo,
                 }
     #副本帮助
@@ -413,6 +413,8 @@
     NPCCustomRefresh.SetNPCRefresh(gatherSoulFBCfg[Def_BuildMark], [(guardNPCID, 1)], 1, 1)
     key = FBPlayerDict_GuardNPCCnt % guardNPCID
     gameFB.SetGameFBDict(key, gameFB.GetGameFBDictByKey(key) + 1)
+    gameFB.SetGameFBDict(FBPlayerDict_GuardNPCID, 0)
+    DoFBHelp(curPlayer, tick)
     return
 
 
@@ -484,8 +486,12 @@
     if gameFB.GetGameFBDictByKey(FBPlayerDict_HasRefreshBoss):
         #本波已刷黄金BOSS
         return
-    
     gatherSoulFBCfg = GetGatherSoulFBCfg()
+    lastWheelEndTime = gameFB.GetGameFBDictByKey(FBPlayerDict_LastWheelEndTime)
+    if lastWheelEndTime and tick - lastWheelEndTime < gatherSoulFBCfg[Def_WheelRefreshCD]:
+        return
+    
+    
     costMoney = gatherSoulFBCfg[Def_BossCostMoney]
     costMoneyList = PlayerControl.HaveMoneyEx(curPlayer, ShareDefine.TYPE_Price_Gold_Paper_Money, costMoney, False)
     if not costMoneyList:

--
Gitblit v1.8.0