ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.py
@@ -35,6 +35,9 @@
import EventShell
import NPCCommon
import FBHelpBattle
import PlayerActLogin
import PlayerPet
import PlayerHorse
import math
@@ -118,12 +121,16 @@
#  @param tick 时间戳
#  @return 布尔值
def OnEnterFBEvent(curPlayer, mapID, lineID, tick):
    if lineID == 0:
        return True
    historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID-1, False, [mapID])
    needStar = IpyGameDataPY.GetFuncCfg('MunekadoLockLimit')
    if historyStar < needStar:
        GameWorld.DebugLog('    上一层评级未达到%s,无法挑战本层!' % needStar)
    if lineID != 0:
        historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID-1, False, [mapID])
        needStar = IpyGameDataPY.GetFuncCfg('MunekadoLockLimit')
        if historyStar < needStar:
            GameWorld.DebugLog('    上一层评级未达到%s,无法挑战本层!' % needStar)
            return False
    #坐骑与灵宠总等级
    needSumLV = IpyGameDataPY.GetFuncEvalCfg('MunekadoLockLimit', 2, {}).get(lineID, 0)
    if PlayerPet.GetTotalPetLV(curPlayer) + PlayerHorse.GetHorseSumLV(curPlayer) < needSumLV:
        GameWorld.DebugLog('    坐骑与灵宠总等级未达到%s,无法挑战本层!' % needSumLV)
        return False
    return True
@@ -426,7 +433,7 @@
        if star == 5:
            EventReport.WriteEvent_FB(curPlayer, mapID, lineID, ChConfig.CME_Log_End, 0, 1)
        EventShell.EventRespons_FBEvent(curPlayer, "zmsl_%s_%s" % (lineID, star))
        #PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrial, 1, [playerCount, star, lineID+1])
        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrial, 1, [playerCount, star, lineID+1])
        EventShell.EventRespons_FBEvent(curPlayer, "passzmsl")
        # 如果在副本中过天,则只给物品奖励,不变更过关信息
        if not isInFBOnDay:
@@ -437,7 +444,7 @@
        else:
            curPlayer.SetDict(ChConfig.Def_PlayerKey_IsInFBOnDay, 0)
        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrialEx, 1)
        PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_MunekadoTrial, 1)
            #=======================================================================================
            # #给奖励
            # needSpace = len(prizeItemList)
@@ -448,7 +455,7 @@
            #    GameWorld.DebugLog("背包空间不够,发送邮件: mailItemList=%s" % str(prizeItemList), curPlayer.GetPlayerID())
            # else:
            #    for itemID, itemCnt, isBind in prizeItemList:
            #        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem], event=["MunekadoTrial", False, {}])
            #        ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["MunekadoTrial", False, {}])
            #overDict[FBCommon.Over_itemInfo] = FBCommon.GetJsonItemList(prizeItemList)
            #=======================================================================================
            
@@ -473,7 +480,7 @@
    if lineID < 2:        
        GameWorld.DebugLog("前两层不能扫荡!")
        return
    historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID-1, False, [mapID])
    historyStar = GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_PlayerFBStar_MapId, lineID, False, [mapID])
    if historyStar < 5:
        GameWorld.DebugLog("没有S级不能扫荡!")
        return
@@ -500,7 +507,8 @@
    EventShell.EventRespons_FBEvent(curPlayer, "zmsl_%s_%s" % (lineID, star))
    EventShell.EventRespons_FBEvent(curPlayer, "passzmsl")
    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrialEx, 1)
    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_MunekadoTrial, 1, [1, star, lineID+1])
    PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_MunekadoTrial, 1)
    jsonItemList, totalExp, totalMoney = NPCCommon.GiveKillNPCDropPrize(curPlayer, ChConfig.Def_FBMapID_MunekadoTrial, {killNPCID:1}, curGrade=star)
    
    # 通知结果
@@ -643,60 +651,63 @@
## 更新当前副本星级
def __UpdZMSLFBStar(tick, isEnter=False, curPlayer=None):
    #1-D 2-C 3-B 4-A 5-S
    gameFB = GameWorld.GetGameFB()
    curStar = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_Grade)
    if curStar == 1:
        return curStar
    stepStartTick = gameFB.GetGameFBDictByKey(ZMSL_FBStepStartTick)
    if not stepStartTick:
        return curStar
    useSecond = int(math.ceil((tick - stepStartTick) / 1000.0))
    lineID = FBCommon.GetFBPropertyMark()
    starTimeList = IpyGameDataPY.GetFuncEvalCfg('MunekadoTrialStarTime').get(lineID,[])
    wheelNum = gameFB.GetGameFBDictByKey(ZMSL_FBNextRefreshStep)
    if wheelNum > len(starTimeList):
        GameWorld.DebugLog("    MunekadoTrialStarTime 配置错误 与波数不等")
        return
    stepStar = gameFB.GetGameFBDictByKey(ZMSL_FBStepStar)
    starTimeInfo = starTimeList[wheelNum-1]
    updStar = stepStar if stepStar else 5
    totalStarTime = 0
    for starTime in starTimeInfo:
        if updStar == 1:
            break
        totalStarTime +=starTime
        if useSecond >= totalStarTime:
            updStar = max(1, updStar-1)
        else:
            break
    diffSecond =max(0, totalStarTime -useSecond)
    if curStar == updStar and not isEnter:
        return curStar
    gameFB.SetGameFBDict(ChConfig.Def_FB_Grade, updStar)
    GameWorld.DebugLog("__UpdFBStar useSecond=%s,curStar=%s,updStar=%s, diffSecond=%s"
                       % (useSecond, curStar, updStar, diffSecond))
    if curPlayer:
        DoFBHelp(curPlayer, tick)
        if updStar != 1:
            curPlayer.Sync_TimeTick(IPY_GameWorld.tttFlagTake, 0, diffSecond * 1000, True)
    else:
        playerManager = GameWorld.GetMapCopyPlayerManager()
        for index in xrange(playerManager.GetPlayerCount()):
            curPlayer = playerManager.GetPlayerByIndex(index)
            if not curPlayer:
                continue
            DoFBHelp(curPlayer, tick)
            if updStar != 1:
                curPlayer.Sync_TimeTick(IPY_GameWorld.tttFlagTake, 0, diffSecond * 1000, True)
    return updStar
    FBCommon.UpdateFBGrade(tick, FBCommon.GetFBLineGrade(GameWorld.GetGameWorld().GetMapID(), lineID))
    return
    #1-D 2-C 3-B 4-A 5-S
#    gameFB = GameWorld.GetGameFB()
#    curStar = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_Grade)
#    if curStar == 1:
#        return curStar
#    stepStartTick = gameFB.GetGameFBDictByKey(ZMSL_FBStepStartTick)
#    if not stepStartTick:
#        return curStar
#    useSecond = int(math.ceil((tick - stepStartTick) / 1000.0))
#    lineID = FBCommon.GetFBPropertyMark()
#    starTimeList = IpyGameDataPY.GetFuncEvalCfg('MunekadoTrialStarTime').get(lineID,[])
#    wheelNum = gameFB.GetGameFBDictByKey(ZMSL_FBNextRefreshStep)
#    if wheelNum > len(starTimeList):
#        GameWorld.DebugLog("    MunekadoTrialStarTime 配置错误 与波数不等")
#        return
#    stepStar = gameFB.GetGameFBDictByKey(ZMSL_FBStepStar)
#    starTimeInfo = starTimeList[wheelNum-1]
#    updStar = stepStar if stepStar else 5
#    totalStarTime = 0
#    for starTime in starTimeInfo:
#        if updStar == 1:
#            break
#        totalStarTime +=starTime
#        if useSecond >= totalStarTime:
#            updStar = max(1, updStar-1)
#        else:
#            break
#
#    diffSecond =max(0, totalStarTime -useSecond)
#
#    if curStar == updStar and not isEnter:
#        return curStar
#
#    gameFB.SetGameFBDict(ChConfig.Def_FB_Grade, updStar)
#
#    GameWorld.DebugLog("__UpdFBStar useSecond=%s,curStar=%s,updStar=%s, diffSecond=%s"
#                       % (useSecond, curStar, updStar, diffSecond))
#
#    if curPlayer:
#        DoFBHelp(curPlayer, tick)
#        if updStar != 1:
#            curPlayer.Sync_TimeTick(IPY_GameWorld.tttFlagTake, 0, diffSecond * 1000, True)
#    else:
#        playerManager = GameWorld.GetMapCopyPlayerManager()
#        for index in xrange(playerManager.GetPlayerCount()):
#            curPlayer = playerManager.GetPlayerByIndex(index)
#            if not curPlayer:
#                continue
#            DoFBHelp(curPlayer, tick)
#            if updStar != 1:
#                curPlayer.Sync_TimeTick(IPY_GameWorld.tttFlagTake, 0, diffSecond * 1000, True)
#
#
#    return updStar
##副本帮助信息
# @param curPlayer 玩家实例
@@ -787,7 +798,7 @@
    ItemCommon.DelCostItem(curPlayer, itemPack, delInfoDict)
    
    #给物品
    ItemControler.GivePlayerItem(curPlayer, exchangeItemID, exchangeItemCount, exchangeItemIsBind, [IPY_GameWorld.rptItem],
    ItemControler.GivePlayerItem(curPlayer, exchangeItemID, exchangeItemCount, 0, [IPY_GameWorld.rptItem],
                                 event=[ChConfig.ItemGive_TrialExchange, False, {}])
    #任务
    EventShell.EventRespons_TrialExchange(curPlayer, costItemID)