2612 【1.3】【1.3.100】上古战场积分足够，退出副本，重新上线后没给奖励

xdh

2018-12-11 8fd18771e4526d6fe373f354335217b19aa3a6ee

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py

@@ -4825,7 +4825,7 @@
    

    mission_1.SetProperty(Def_Around_AllCount, allCount)

    EventShell.EventRespons_RunTaskAllCnt(curPlayer, curMissionData.Type, allCount)

    GameWorld.DebugLog("删除任务allCount %s, RUNCOUNT=%s" % (allCount, RUNCOUNT))

    GameWorld.Log("删除任务allCount %s, RUNCOUNT=%s" % (allCount, RUNCOUNT))





    if allCount < RUNCOUNT:

@@ -4890,6 +4890,7 @@
# @return 无

# @remarks 跑环任务结束处理，删除或者随机下一个

def __RunAroundMission(curPlayer, missionID, curMissionData, curActionNode):

    GameWorld.Log("__RunAroundMission----%s"%missionID)

    #任务完成，触发随机跑环

    run_event = GameWorld.ToIntDef(curActionNode.GetAttribute("run_around"), 0)

    firstMissionID = GameWorld.ToIntDef(curActionNode.GetAttribute("id"), 0)

@@ -4926,8 +4927,9 @@
    

    

    #总跑环次数已满，不可再做

    if run_event == Def_Run_Around_Over_1 and allCount >= RUNCOUNT:

        return

    if run_event == Def_Run_Around_Over_1:

        if allCount >= RUNCOUNT or aroundCount >= AROUNDCOUNT:

            return

    

    nextMissionID = 0

    nextMission = None

@@ -4975,9 +4977,9 @@
        

        if curMissionData.Type == QuestCommon.Def_Mission_Type_RunFamily:

            PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_TaskFRun, 1)

        if allCount < RUNCOUNT:

            nextMissionID = __OverRandRunAround(curPlayer, curMissionData)

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_RunTaskNextMissionID % curMissionData.Type, nextMissionID)

#        if allCount < RUNCOUNT:

#            nextMissionID = __OverRandRunAround(curPlayer, curMissionData)

#            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_RunTaskNextMissionID % curMissionData.Type, nextMissionID)

        

                

            

@@ -5433,6 +5435,8 @@
# @return 返回值无意义

# @remarks 设置跑环任务奖励 <set_run_around_reward multiple="指定倍数" id_name="任务ID存储key" /> 

def DoType_Set_Run_Around_Reward(curPlayer, curMission, curActionNode):

    curMissionID = curMission.GetMissionID()

    GameWorld.Log("DoType_Set_Run_Around_Reward---%s"%curMissionID)

    idNameStr = curActionNode.GetAttribute("id_name")

    if curMission and idNameStr != "":

        questID = GameWorld.ToIntDef(curMission.GetProperty(idNameStr), 0)

@@ -5441,7 +5445,6 @@
            if curMission == None:

                curMission = QuestCommon.AddNewMission(curPlayer, questID)

            

    curMissionID = curMission.GetMissionID()

    curMissionData = FindQuestFunc(curMissionID)

    if not curMissionData:

        return

@@ -5872,6 +5875,11 @@
    #记录副本对应的任务ID

    if FBCommon.GetRecordMapID(mapID) in [ChConfig.Def_FBMapID_ClearDevil, ChConfig.Def_FBMapID_MagicWeapon]:

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ReqFBMissionID, curMission.GetMissionID())

        missionID = curMission.GetMissionID()

        curMissionData = FindQuestFunc(missionID)

        if curMissionData:

            missionType = curMissionData.Type

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_ReqFBMissionType, missionType)

    return



#---------------------------------------------------------------------

@@ -6069,6 +6077,34 @@
    if questID != 0:

        curMission = curPlayer.FindMission(questID)

    curMission.SetProperty(key, PlayerHorse.GetHorseSumLV(curPlayer))

    return



##设置强化总等级

# @param curPlayer 玩家实例

# @param curMission 任务实例

# @param curActionNode节点信息

# @return 返回值无意义

# @remarks <Set_Totalpluslv key="" />

def DoType_Set_Totalpluslv(curPlayer, curMission, curActionNode):

    key = curActionNode.GetAttribute("key")

    questID = GameWorld.ToIntDef(curActionNode.GetAttribute("id"), 0)

    if questID != 0:

        curMission = curPlayer.FindMission(questID)

    curMission.SetProperty(key, ChEquip.GetTotalPlusLV(curPlayer, False))

    return



##设置装备总星级

# @param curPlayer 玩家实例

# @param curMission 任务实例

# @param curActionNode节点信息

# @return 返回值无意义

# @remarks <Set_Equiptotalstar key="" />

def DoType_Set_Equiptotalstar(curPlayer, curMission, curActionNode):

    key = curActionNode.GetAttribute("key")

    questID = GameWorld.ToIntDef(curActionNode.GetAttribute("id"), 0)

    if questID != 0:

        curMission = curPlayer.FindMission(questID)

    curMission.SetProperty(key, ChEquip.GetTotalEquipStars(curPlayer))

    return

#---------------------------------------------------------------------

##DoType_调度器

@@ -7203,6 +7239,20 @@
    totalcnt = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)

    return PlayerMagicWeapon.GetMWActiveCntTotal(curPlayer) >= totalcnt



##总强化等级

# @param None

# @return None <Totalpluslv value="cnt"/>

def ConditionType_Totalpluslv(curPlayer, curMission, curActionNode):

    totalcnt = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)

    return ChEquip.GetTotalPlusLV(curPlayer, False) >= totalcnt



##装备总星级

# @param None

# @return None <Equiptotalstar value="cnt"/>

def ConditionType_Equiptotalstar(curPlayer, curMission, curActionNode):

    totalcnt = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)

    return ChEquip.GetTotalEquipStars(curPlayer) >= totalcnt



##激活法宝,确认与成就逻辑后使用

# @param None

# @return None <Active_Magicweapon id="法宝ID"/>