diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 12444d13..a4a56de2 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -482,8 +482,25 @@ function DataManager:dealOpenActivity(activityInfo) return end - local dealTypeMap = {} + local newActivityList = {} + local map = {} for _, info in ipairs(activityInfo) do + if info.type then + if not map[info.type] then + map[info.type] = info + else + if map[info.type].start_at > info.start_at then + map[info.type] = info + end + end + end + end + for actType, info in pairs(map) do + table.insert(newActivityList, info) + end + + local dealTypeMap = {} + for _, info in ipairs(newActivityList) do local startTime = GFunc.formatTimeStep(info.start_at) if startTime <= curTime and curTime <= GFunc.formatTimeStep(info.end_at) then local reqFunc = DataManager.activityOpenFunc[info.type] @@ -503,8 +520,8 @@ end DataManager.activityOpenFunc = { [2] = function(params) - ModuleManager.ActBossRushManager:reqActData() DataManager.ActBossRushData:setActivityInfo(params) + ModuleManager.ActBossRushManager:reqActData() end, [3] = function(params) DataManager.ActPvpData:init({}) -- 默认初始化 diff --git a/lua/app/config/activity.lua b/lua/app/config/activity.lua index ea3a3e3f..a462129a 100644 --- a/lua/app/config/activity.lua +++ b/lua/app/config/activity.lua @@ -16,7 +16,7 @@ local activity = { }, [406]={ ["act_type"]=4, - ["start_time"]="2023-09-28 00:00:00", + ["start_time"]="2023-09-18 00:00:00", ["end_time"]="2023-10-08 00:00:00" }, [506]={ diff --git a/lua/app/config/activity_boss_rush_rank.lua b/lua/app/config/activity_boss_rush_rank.lua index 20db661e..7df264d5 100644 --- a/lua/app/config/activity_boss_rush_rank.lua +++ b/lua/app/config/activity_boss_rush_rank.lua @@ -1,5 +1,6 @@ local activity_boss_rush_rank = { [1]={ + ["activity"]=206, ["ranking"]={ 1, 1 @@ -24,6 +25,7 @@ local activity_boss_rush_rank = { } }, [2]={ + ["activity"]=206, ["ranking"]={ 2, 2 @@ -48,6 +50,7 @@ local activity_boss_rush_rank = { } }, [3]={ + ["activity"]=206, ["ranking"]={ 3, 3 @@ -72,6 +75,7 @@ local activity_boss_rush_rank = { } }, [4]={ + ["activity"]=206, ["ranking"]={ 4, 10 @@ -96,6 +100,7 @@ local activity_boss_rush_rank = { } }, [5]={ + ["activity"]=206, ["ranking"]={ 11, 50 @@ -120,6 +125,7 @@ local activity_boss_rush_rank = { } }, [6]={ + ["activity"]=206, ["ranking"]={ 51, 500 @@ -144,6 +150,182 @@ local activity_boss_rush_rank = { } }, [7]={ + ["activity"]=206, + ["ranking"]={ + 501, + 99999999 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + } + }, + [101]={ + ["activity"]=506, + ["ranking"]={ + 1, + 1 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } + }, + [102]={ + ["activity"]=506, + ["ranking"]={ + 2, + 2 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + } + }, + [103]={ + ["activity"]=506, + ["ranking"]={ + 3, + 3 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + } + }, + [104]={ + ["activity"]=506, + ["ranking"]={ + 4, + 10 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + } + }, + [105]={ + ["activity"]=506, + ["ranking"]={ + 11, + 50 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [106]={ + ["activity"]=506, + ["ranking"]={ + 51, + 500 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [107]={ + ["activity"]=506, ["ranking"]={ 501, 99999999 @@ -169,6 +351,6 @@ local activity_boss_rush_rank = { } } local config = { -data=activity_boss_rush_rank,count=7 +data=activity_boss_rush_rank,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/activity_bounty_level.lua b/lua/app/config/activity_bounty_level.lua index 83f8ce7d..82af2e3a 100644 --- a/lua/app/config/activity_bounty_level.lua +++ b/lua/app/config/activity_bounty_level.lua @@ -2320,9 +2320,1492 @@ local activity_bounty_level = { ["num"]=3, ["num_for_nothing"]="VQ==" } + }, + [401]={ + ["act_id"]=506, + ["exp"]=0, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [402]={ + ["act_id"]=506, + ["exp"]=15, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [403]={ + ["act_id"]=506, + ["exp"]=30, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + [404]={ + ["act_id"]=506, + ["exp"]=45, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [405]={ + ["act_id"]=506, + ["exp"]=60, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [406]={ + ["act_id"]=506, + ["exp"]=75, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [407]={ + ["act_id"]=506, + ["exp"]=90, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [408]={ + ["act_id"]=506, + ["exp"]=105, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [409]={ + ["act_id"]=506, + ["exp"]=120, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [410]={ + ["act_id"]=506, + ["exp"]=135, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [411]={ + ["act_id"]=506, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [412]={ + ["act_id"]=506, + ["exp"]=165, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [413]={ + ["act_id"]=506, + ["exp"]=180, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [414]={ + ["act_id"]=506, + ["exp"]=195, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + [415]={ + ["act_id"]=506, + ["exp"]=210, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [416]={ + ["act_id"]=506, + ["exp"]=225, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [417]={ + ["act_id"]=506, + ["exp"]=240, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [418]={ + ["act_id"]=506, + ["exp"]=255, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [419]={ + ["act_id"]=506, + ["exp"]=270, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [420]={ + ["act_id"]=506, + ["exp"]=285, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [421]={ + ["act_id"]=506, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + } + }, + [422]={ + ["act_id"]=506, + ["exp"]=315, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + }, + [423]={ + ["act_id"]=506, + ["exp"]=330, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=24002, + ["id_for_nothing"]="VAxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [501]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1400201, + ["id_for_nothing"]="VwxcA2dRfg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14002, + ["id_for_nothing"]="VwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [502]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [503]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [504]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [505]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14002, + ["id_for_nothing"]="VwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [506]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [507]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [508]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [509]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [510]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14002, + ["id_for_nothing"]="VwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [511]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + [512]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [513]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [514]={ + ["act_id"]=606, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [515]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [516]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [517]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [518]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [519]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [520]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14002, + ["id_for_nothing"]="VwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [521]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + [522]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [523]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [524]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [525]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14002, + ["id_for_nothing"]="VwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + [526]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [527]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=8, + ["id_for_nothing"]="Xg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=9, + ["id_for_nothing"]="Xw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [528]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [529]={ + ["act_id"]=606, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [530]={ + ["act_id"]=606, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5300101, + ["id_for_nothing"]="UwtcA2RRfg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=2, + ["num_for_nothing"]="VA==" + }, + ["reward_pro_max"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14002, + ["id_for_nothing"]="VwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } } } local config = { -data=activity_bounty_level,count=83 +data=activity_bounty_level,count=136 } return config \ No newline at end of file diff --git a/lua/app/config/activity_pvp_robot.lua b/lua/app/config/activity_pvp_robot.lua index 36535a37..8cb84d18 100644 --- a/lua/app/config/activity_pvp_robot.lua +++ b/lua/app/config/activity_pvp_robot.lua @@ -8,11 +8,11 @@ local activity_pvp_robot = { ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, + 14002, 6 }, { - 22001, + 24002, 6 }, { @@ -20,11 +20,11 @@ local activity_pvp_robot = { 6 }, { - 42001, + 44002, 6 }, { - 52001, + 54003, 6 } } diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index dd4cab93..cc642092 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -613,6 +613,7 @@ local LocalizationGlobalConst = ACT_PVP_TALK_DESC_7 = "ACT_PVP_TALK_DESC_7", ACT_PVP_TALK_DESC_8 = "ACT_PVP_TALK_DESC_8", ACT_PVP_TALK_DESC_9 = "ACT_PVP_TALK_DESC_9", + ACT_PVP_DESC_24 = "ACT_PVP_DESC_24", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skin_skill.lua b/lua/app/config/skin_skill.lua index 4f44f683..7d3766a1 100644 --- a/lua/app/config/skin_skill.lua +++ b/lua/app/config/skin_skill.lua @@ -520,7 +520,7 @@ local skin_skill = { ["name_act"]="skill01", ["fx_self"]=300111, ["bullet_time"]={ - 1333, + 2433, 3000, 400 }, @@ -590,7 +590,7 @@ local skin_skill = { ["name_act"]="skill01", ["fx_self"]=300164, ["bullet_time"]={ - 1666, + 1866, 3000, 400 }, diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index a56cdfc6..a1590637 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -604,7 +604,6 @@ local localization_global = ["ACT_PVP_DESC_21"] = "帮助文本1", ["ACT_PVP_DESC_22"] = "帮助文本2", ["ACT_PVP_DESC_23"] = "帮助文本3", - ["ACT_PVP_DESC_24"] = "停业中", ["ACT_PVP_TALK_DESC_1"] = "嗨~今天想来一局吗?", ["ACT_PVP_TALK_DESC_2"] = "强者,每天可以领取累胜奖励!", ["ACT_PVP_TALK_DESC_3"] = "嗯,这听起来很有趣,我们开始吧!", @@ -614,6 +613,7 @@ local localization_global = ["ACT_PVP_TALK_DESC_7"] = "梦魔我今日可算见着厉害的人了,10胜的大人欢迎再来!", ["ACT_PVP_TALK_DESC_8"] = "被打败啦?别灰心~再来呀!", ["ACT_PVP_TALK_DESC_9"] = "失败了没关系,下次用我梦魔出场一定赢。", + ["ACT_PVP_DESC_24"] = "停业中", } return localization_global \ No newline at end of file diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua index 9ad40d6b..545f22d0 100644 --- a/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua +++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua @@ -34,7 +34,9 @@ function ActBossRushRankUI:ctor() self.rankRewardList = {} self.rankRewardListCount = 0 local cfg = DataManager.ActBossRushData:getRankConfig() - for id, info in ipairs(cfg) do + local list = DataManager.ActBossRushData:getRankRewardList() + for index, id in ipairs(list) do + local info = cfg[id] table.insert(self.rankRewardList, {id = id, ranking1 = info.ranking[1], ranking2 = info.ranking[2], rewards = info.reward}) self.rankRewardListCount = self.rankRewardListCount + 1 end diff --git a/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua index df38e24c..0b21cfc7 100644 --- a/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua +++ b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua @@ -302,6 +302,22 @@ function ActBossRushData:getRankConfig() return ConfigManager:getConfig("activity_boss_rush_rank") end +function ActBossRushData:getRankRewardList() + if not self.rankRewardList then + self.rankRewardList = {} + local cfg = self:getRankConfig() + for id, info in ipairs(cfg) do + if info.activity == (self.activity_id or ACT_ID) then + table.insert(self.rankRewardList, id) + end + end + table.sort(self.rankRewardList, function(a, b) + return a < b + end) + end + return self.rankRewardList +end + function ActBossRushData:getRankRewards(rank) if not rank or rank <= 0 then -- 没参加就没有 return @@ -311,7 +327,9 @@ function ActBossRushData:getRankRewards(rank) end if not self.cacheRankRewardsMap[rank] then local cfg = self:getRankConfig() - for id, info in ipairs(cfg) do + local lsit = self:getRankRewardList() + for index, id in ipairs(lsit) do + local info = cfg[id] if info.ranking[1] and info.ranking[2] then if info.ranking[1] <= rank and rank <= info.ranking[2] then self.cacheRankRewardsMap[rank] = id