xdh
2018-12-22 06eec1e27d26532824a710bba2483b0c7f39c27e
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.py
@@ -196,16 +196,16 @@
        guardDict[npcid] = gameFB.GetGameFBDictByKey(FBPlayerDict_GuardNPCCnt%npcid)
    hasRefreshBoss = gameFB.GetGameFBDictByKey(FBPlayerDict_HasRefreshBoss)
    isAutoBoss = gameFB.GetGameFBDictByKey(FBPlayerDict_AutoBoss)
    itemDict = PyGameData.g_gathersoulfbAwardDict.get(curPlayer.GetID(), {})
    lineID = GameWorld.GetGameWorld().GetLineID()
    itemDict = PyGameData.g_gathersoulfbAwardDict.get(lineID, {})
    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:
@@ -533,12 +539,13 @@
    ##掉落奖励 {wheel:[[itemid,itemCnt,isBind]]}
    gameFB = GameWorld.GetGameFB()
    curWheel = gameFB.GetGameFBDictByKey(FBPlayerDict_CurWheel) + 1
    ownerID = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_SingleFBPlayerID)
    if ownerID not in PyGameData.g_gathersoulfbAwardDict:
        PyGameData.g_gathersoulfbAwardDict[ownerID] = {}
    if curWheel not in PyGameData.g_gathersoulfbAwardDict[ownerID]:
        PyGameData.g_gathersoulfbAwardDict[ownerID][curWheel] = []
    PyGameData.g_gathersoulfbAwardDict[ownerID][curWheel].append([itemID, itemCnt, isBind])
    #ownerID = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_SingleFBPlayerID)
    lineID = GameWorld.GetGameWorld().GetLineID()
    if lineID not in PyGameData.g_gathersoulfbAwardDict:
        PyGameData.g_gathersoulfbAwardDict[lineID] = {}
    if curWheel not in PyGameData.g_gathersoulfbAwardDict[lineID]:
        PyGameData.g_gathersoulfbAwardDict[lineID][curWheel] = []
    PyGameData.g_gathersoulfbAwardDict[lineID][curWheel].append([itemID, itemCnt, isBind])
    curPlayer = FBCommon.GetCurSingleFBPlayer()
    if curPlayer:
        DoFBHelp(curPlayer, 0)
@@ -554,7 +561,8 @@
    # 进入离开阶段
    FBCommon.SetFBStep(FB_Step_Over, tick)
    ownerID = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_SingleFBPlayerID)
    itemDict = PyGameData.g_gathersoulfbAwardDict.pop(ownerID, {})
    lineID = GameWorld.GetGameWorld().GetLineID()
    itemDict = PyGameData.g_gathersoulfbAwardDict.pop(lineID, {})
    totalItemList = []
    for itemList in itemDict.values():
        totalItemList += itemList