From 2f953375a569cffb0511d074d0e91e92cc0c3bd9 Mon Sep 17 00:00:00 2001 From: Fang Date: Sun, 8 Oct 2023 11:35:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9Bfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/act_gift.lua | 96 +- lua/app/config/activity.lua | 13 +- lua/app/config/activity_bounty_level.lua | 60 +- lua/app/config/activity_rank.lua | 116 +- lua/app/config/arena_bounty_level.lua | 1622 ++++++++++++++++- lua/app/config/arena_rank.lua | 156 +- lua/app/config/arena_time.lua | 2 +- lua/app/config/avatar_frame.lua | 12 +- lua/app/config/hero.lua | 3 +- lua/app/config/item.lua | 18 +- .../localization_global_const.lua | 1 + lua/app/config/skill.lua | 4 +- lua/app/config/skill_rogue.lua | 6 + lua/app/config/skin.lua | 28 +- lua/app/config/skin_skill.lua | 76 +- lua/app/config/strings/cn/avatar_frame.lua | 8 +- lua/app/config/strings/cn/global.lua | 5 +- lua/app/config/strings/cn/item.lua | 10 +- lua/app/config/strings/cn/skin.lua | 5 +- lua/app/config/strings/de/avatar_frame.lua | 8 +- lua/app/config/strings/de/item.lua | 8 +- lua/app/config/strings/de/skin.lua | 5 +- lua/app/config/strings/en/avatar_frame.lua | 8 +- lua/app/config/strings/en/global.lua | 26 +- lua/app/config/strings/en/item.lua | 12 +- lua/app/config/strings/en/skin.lua | 5 +- lua/app/config/strings/es/avatar_frame.lua | 8 +- lua/app/config/strings/es/global.lua | 38 +- lua/app/config/strings/es/item.lua | 14 +- lua/app/config/strings/es/skin.lua | 5 +- lua/app/config/strings/fr/avatar_frame.lua | 8 +- lua/app/config/strings/fr/item.lua | 8 +- lua/app/config/strings/fr/skin.lua | 5 +- lua/app/config/strings/id/avatar_frame.lua | 8 +- lua/app/config/strings/id/global.lua | 32 +- lua/app/config/strings/id/item.lua | 14 +- lua/app/config/strings/id/skin.lua | 5 +- lua/app/config/strings/ja/avatar_frame.lua | 8 +- lua/app/config/strings/ja/global.lua | 28 +- lua/app/config/strings/ja/item.lua | 12 +- lua/app/config/strings/ja/skin.lua | 5 +- lua/app/config/strings/ko/avatar_frame.lua | 8 +- lua/app/config/strings/ko/global.lua | 34 +- lua/app/config/strings/ko/item.lua | 12 +- lua/app/config/strings/ko/skin.lua | 5 +- lua/app/config/strings/pt/avatar_frame.lua | 8 +- lua/app/config/strings/pt/global.lua | 34 +- lua/app/config/strings/pt/item.lua | 12 +- lua/app/config/strings/pt/skin.lua | 5 +- lua/app/config/strings/ru/avatar_frame.lua | 8 +- lua/app/config/strings/ru/item.lua | 8 +- lua/app/config/strings/ru/skin.lua | 5 +- lua/app/config/strings/th/avatar_frame.lua | 8 +- lua/app/config/strings/th/global.lua | 28 +- lua/app/config/strings/th/item.lua | 12 +- lua/app/config/strings/th/skin.lua | 5 +- lua/app/config/strings/vi/avatar_frame.lua | 8 +- lua/app/config/strings/vi/global.lua | 32 +- lua/app/config/strings/vi/item.lua | 14 +- lua/app/config/strings/vi/skin.lua | 5 +- lua/app/config/strings/zh/avatar_frame.lua | 8 +- lua/app/config/strings/zh/global.lua | 24 +- lua/app/config/strings/zh/item.lua | 10 +- lua/app/config/strings/zh/skin.lua | 5 +- .../tourn_arena/tourn_arena_const.lua | 3 + .../tourn_arena/tourn_arena_manager.lua | 2 +- .../activity/tourn_wave/tourn_wave_const.lua | 3 + .../tourn_wave/tourn_wave_manager.lua | 2 +- .../tourn_arena/tourn_arena_rank_comp.lua | 51 +- .../activity/tourn_arena/tourn_arena_ui.lua | 3 +- .../tourn_wave/tourn_wave_rank_comp.lua | 51 +- .../ui/activity/tourn_wave/tourn_wave_ui.lua | 3 +- .../activity/tourn_arena/tourn_arena_data.lua | 35 +- .../activity/tourn_wave/tourn_wave_data.lua | 35 +- 74 files changed, 2565 insertions(+), 432 deletions(-) diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 3ee3f191..4e82b536 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -5954,16 +5954,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=42002, - ["num_for_nothing"]="UgpcA2c=" + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" } } }, @@ -5976,16 +5984,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=42003, - ["num_for_nothing"]="UgpcA2Y=" + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=3001, + ["num_for_nothing"]="VQhcAg==" } }, ["time_type"]=2, @@ -6001,16 +6017,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=42004, - ["num_for_nothing"]="UgpcA2E=" + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=3002, + ["num_for_nothing"]="VQhcAQ==" } }, ["time_type"]=2, @@ -6026,16 +6050,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=42005, - ["num_for_nothing"]="UgpcA2A=" + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=3003, + ["num_for_nothing"]="VQhcAA==" } }, ["time_type"]=2, @@ -6051,16 +6083,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=42006, - ["num_for_nothing"]="UgpcA2M=" + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=3004, + ["num_for_nothing"]="VQhcBw==" } }, ["time_type"]=2, @@ -6076,16 +6116,24 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=42007, - ["num_for_nothing"]="UgpcA2I=" + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=55, + ["id_for_nothing"]="Uw0=", + ["num"]=3005, + ["num_for_nothing"]="VQhcBg==" } }, ["time_type"]=2, diff --git a/lua/app/config/activity.lua b/lua/app/config/activity.lua index 398d7a96..c29eac4a 100644 --- a/lua/app/config/activity.lua +++ b/lua/app/config/activity.lua @@ -32,15 +32,20 @@ local activity = { [706]={ ["act_type"]=5, ["start_time"]="2023-10-16 00:00:00", - ["end_time"]="2023-10-24 00:00:00" + ["end_time"]="2023-10-25 00:00:00" }, [806]={ + ["act_type"]=2, + ["start_time"]="2023-10-24 00:00:00", + ["end_time"]="2023-11-01 00:00:00" + }, + [906]={ ["act_type"]=6, - ["start_time"]="2023-10-30 00:00:00", - ["end_time"]="2023-11-7 00:00:00" + ["start_time"]="2023-10-31 00:00:00", + ["end_time"]="2023-11-09 00:00:00" } } local config = { -data=activity,count=8 +data=activity,count=9 } 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 4230d447..35cf2875 100644 --- a/lua/app/config/activity_bounty_level.lua +++ b/lua/app/config/activity_bounty_level.lua @@ -4644,7 +4644,7 @@ local activity_bounty_level = { } }, [701]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4672,7 +4672,7 @@ local activity_bounty_level = { } }, [702]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4700,7 +4700,7 @@ local activity_bounty_level = { } }, [703]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4728,7 +4728,7 @@ local activity_bounty_level = { } }, [704]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4756,7 +4756,7 @@ local activity_bounty_level = { } }, [705]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4784,7 +4784,7 @@ local activity_bounty_level = { } }, [706]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4812,7 +4812,7 @@ local activity_bounty_level = { } }, [707]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4840,7 +4840,7 @@ local activity_bounty_level = { } }, [708]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4868,7 +4868,7 @@ local activity_bounty_level = { } }, [709]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4896,7 +4896,7 @@ local activity_bounty_level = { } }, [710]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4924,7 +4924,7 @@ local activity_bounty_level = { } }, [711]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4952,7 +4952,7 @@ local activity_bounty_level = { } }, [712]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -4980,7 +4980,7 @@ local activity_bounty_level = { } }, [713]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5008,7 +5008,7 @@ local activity_bounty_level = { } }, [714]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5036,7 +5036,7 @@ local activity_bounty_level = { } }, [715]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5064,7 +5064,7 @@ local activity_bounty_level = { } }, [716]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5092,7 +5092,7 @@ local activity_bounty_level = { } }, [717]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5120,7 +5120,7 @@ local activity_bounty_level = { } }, [718]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5148,7 +5148,7 @@ local activity_bounty_level = { } }, [719]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5176,7 +5176,7 @@ local activity_bounty_level = { } }, [720]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5204,7 +5204,7 @@ local activity_bounty_level = { } }, [721]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5232,7 +5232,7 @@ local activity_bounty_level = { } }, [722]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=30, ["reward"]={ ["type"]=1, @@ -5260,7 +5260,7 @@ local activity_bounty_level = { } }, [723]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=40, ["reward"]={ ["type"]=1, @@ -5288,7 +5288,7 @@ local activity_bounty_level = { } }, [724]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=40, ["reward"]={ ["type"]=1, @@ -5316,7 +5316,7 @@ local activity_bounty_level = { } }, [725]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=40, ["reward"]={ ["type"]=1, @@ -5344,7 +5344,7 @@ local activity_bounty_level = { } }, [726]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=40, ["reward"]={ ["type"]=1, @@ -5372,7 +5372,7 @@ local activity_bounty_level = { } }, [727]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=40, ["reward"]={ ["type"]=1, @@ -5400,7 +5400,7 @@ local activity_bounty_level = { } }, [728]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=40, ["reward"]={ ["type"]=1, @@ -5428,7 +5428,7 @@ local activity_bounty_level = { } }, [729]={ - ["act_id"]=806, + ["act_id"]=906, ["exp"]=40, ["reward"]={ ["type"]=1, @@ -5456,7 +5456,7 @@ local activity_bounty_level = { } }, [730]={ - ["act_id"]=806, + ["act_id"]=906, ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", diff --git a/lua/app/config/activity_rank.lua b/lua/app/config/activity_rank.lua index 11103eef..711b6218 100644 --- a/lua/app/config/activity_rank.lua +++ b/lua/app/config/activity_rank.lua @@ -453,7 +453,7 @@ local activity_rank = { ["act_id"]=706, ["ranking"]={ 11, - 50 + 99999999 }, ["reward"]={ { @@ -474,58 +474,8 @@ local activity_rank = { } } }, - [306]={ - ["act_id"]=706, - ["ranking"]={ - 51, - 500 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=55, - ["id_for_nothing"]="Uw0=", - ["num"]=300, - ["num_for_nothing"]="VQhc" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" - } - } - }, - [307]={ - ["act_id"]=706, - ["ranking"]={ - 501, - 99999999 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=55, - ["id_for_nothing"]="Uw0=", - ["num"]=200, - ["num_for_nothing"]="VAhc" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } - }, [401]={ - ["act_id"]=806, + ["act_id"]=906, ["ranking"]={ 1, 1 @@ -550,7 +500,7 @@ local activity_rank = { } }, [402]={ - ["act_id"]=806, + ["act_id"]=906, ["ranking"]={ 2, 2 @@ -575,7 +525,7 @@ local activity_rank = { } }, [403]={ - ["act_id"]=806, + ["act_id"]=906, ["ranking"]={ 3, 3 @@ -600,7 +550,7 @@ local activity_rank = { } }, [404]={ - ["act_id"]=806, + ["act_id"]=906, ["ranking"]={ 4, 10 @@ -625,10 +575,10 @@ local activity_rank = { } }, [405]={ - ["act_id"]=806, + ["act_id"]=906, ["ranking"]={ 11, - 50 + 99999999 }, ["reward"]={ { @@ -648,59 +598,9 @@ local activity_rank = { ["num_for_nothing"]="VA==" } } - }, - [406]={ - ["act_id"]=806, - ["ranking"]={ - 51, - 500 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=55, - ["id_for_nothing"]="Uw0=", - ["num"]=300, - ["num_for_nothing"]="VQhc" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" - } - } - }, - [407]={ - ["act_id"]=806, - ["ranking"]={ - 501, - 99999999 - }, - ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=55, - ["id_for_nothing"]="Uw0=", - ["num"]=200, - ["num_for_nothing"]="VAhc" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - } - } } } local config = { -data=activity_rank,count=28 +data=activity_rank,count=24 } return config \ No newline at end of file diff --git a/lua/app/config/arena_bounty_level.lua b/lua/app/config/arena_bounty_level.lua index 82bee2dd..e0342f20 100644 --- a/lua/app/config/arena_bounty_level.lua +++ b/lua/app/config/arena_bounty_level.lua @@ -4858,9 +4858,1629 @@ local arena_bounty_level = { ["num"]=1, ["num_for_nothing"]="Vw==" } + }, + [401]={ + ["season"]=3, + ["exp"]=150, + ["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"]=2400101, + ["id_for_nothing"]="VAxcA2RRfg==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [402]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [403]={ + ["season"]=3, + ["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==" + } + }, + [404]={ + ["season"]=3, + ["exp"]=150, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [405]={ + ["season"]=3, + ["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==" + } + }, + [406]={ + ["season"]=3, + ["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"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [407]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [408]={ + ["season"]=3, + ["exp"]=150, + ["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"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [409]={ + ["season"]=3, + ["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==" + } + }, + [410]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["reward_type"]=1 + }, + [411]={ + ["season"]=3, + ["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==" + } + }, + [412]={ + ["season"]=3, + ["exp"]=150, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [413]={ + ["season"]=3, + ["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==" + } + }, + [414]={ + ["season"]=3, + ["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==" + } + }, + [415]={ + ["season"]=3, + ["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==" + } + }, + [416]={ + ["season"]=3, + ["exp"]=150, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [417]={ + ["season"]=3, + ["exp"]=150, + ["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"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [418]={ + ["season"]=3, + ["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==" + } + }, + [419]={ + ["season"]=3, + ["exp"]=150, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [420]={ + ["season"]=3, + ["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"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [421]={ + ["season"]=3, + ["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==" + } + }, + [422]={ + ["season"]=3, + ["exp"]=200, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [423]={ + ["season"]=3, + ["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==" + } + }, + [424]={ + ["season"]=3, + ["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==" + } + }, + [425]={ + ["season"]=3, + ["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==" + } + }, + [426]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [427]={ + ["season"]=3, + ["exp"]=200, + ["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"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [428]={ + ["season"]=3, + ["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==" + } + }, + [429]={ + ["season"]=3, + ["exp"]=200, + ["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"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [430]={ + ["season"]=3, + ["exp"]=200, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [431]={ + ["season"]=3, + ["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==" + } + }, + [432]={ + ["season"]=3, + ["exp"]=200, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [433]={ + ["season"]=3, + ["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==" + } + }, + [434]={ + ["season"]=3, + ["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==" + } + }, + [435]={ + ["season"]=3, + ["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"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [436]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [437]={ + ["season"]=3, + ["exp"]=250, + ["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"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [438]={ + ["season"]=3, + ["exp"]=250, + ["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==" + } + }, + [439]={ + ["season"]=3, + ["exp"]=250, + ["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==" + } + }, + [440]={ + ["season"]=3, + ["exp"]=250, + ["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"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [441]={ + ["season"]=3, + ["exp"]=250, + ["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==" + } + }, + [442]={ + ["season"]=3, + ["exp"]=250, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [443]={ + ["season"]=3, + ["exp"]=250, + ["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==" + } + }, + [444]={ + ["season"]=3, + ["exp"]=250, + ["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==" + } + }, + [445]={ + ["season"]=3, + ["exp"]=250, + ["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"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [446]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [447]={ + ["season"]=3, + ["exp"]=250, + ["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"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [448]={ + ["season"]=3, + ["exp"]=250, + ["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==" + } + }, + [449]={ + ["season"]=3, + ["exp"]=250, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [450]={ + ["season"]=3, + ["exp"]=250, + ["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"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [451]={ + ["season"]=3, + ["exp"]=300, + ["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==" + } + }, + [452]={ + ["season"]=3, + ["exp"]=300, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [453]={ + ["season"]=3, + ["exp"]=300, + ["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==" + } + }, + [454]={ + ["season"]=3, + ["exp"]=300, + ["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==" + } + }, + [455]={ + ["season"]=3, + ["exp"]=300, + ["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"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [456]={ + ["season"]=3, + ["exp"]=300, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [457]={ + ["season"]=3, + ["exp"]=300, + ["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"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [458]={ + ["season"]=3, + ["exp"]=300, + ["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==" + } + }, + [459]={ + ["season"]=3, + ["exp"]=300, + ["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==" + } + }, + [460]={ + ["season"]=3, + ["exp"]=300, + ["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"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [461]={ + ["season"]=3, + ["exp"]=350, + ["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==" + } + }, + [462]={ + ["season"]=3, + ["exp"]=350, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [463]={ + ["season"]=3, + ["exp"]=350, + ["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==" + } + }, + [464]={ + ["season"]=3, + ["exp"]=350, + ["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==" + } + }, + [465]={ + ["season"]=3, + ["exp"]=350, + ["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"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [466]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [467]={ + ["season"]=3, + ["exp"]=350, + ["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"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + [468]={ + ["season"]=3, + ["exp"]=350, + ["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==" + } + }, + [469]={ + ["season"]=3, + ["exp"]=350, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [470]={ + ["season"]=3, + ["exp"]=350, + ["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"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [471]={ + ["season"]=3, + ["exp"]=400, + ["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==" + } + }, + [472]={ + ["season"]=3, + ["exp"]=400, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [473]={ + ["season"]=3, + ["exp"]=400, + ["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==" + } + }, + [474]={ + ["season"]=3, + ["exp"]=400, + ["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==" + } + }, + [475]={ + ["season"]=3, + ["exp"]=400, + ["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"]=11, + ["id_for_nothing"]="Vwk=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [476]={ + ["season"]=3, + ["exp"]=400, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_pro"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=22, + ["id_for_nothing"]="VAo=", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [477]={ + ["season"]=3, + ["exp"]=400, + ["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"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [478]={ + ["season"]=3, + ["exp"]=400, + ["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==" + } + }, + [479]={ + ["season"]=3, + ["exp"]=400, + ["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==" + } + }, + [480]={ + ["season"]=3, + ["exp"]=400, + ["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"]=18, + ["id_for_nothing"]="VwA=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["reward_type"]=1 + }, + [481]={ + ["season"]=3, + ["exp"]=1000, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=10, + ["id_for_nothing"]="Vwg=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } } } local config = { -data=arena_bounty_level,count=243 +data=arena_bounty_level,count=324 } return config \ No newline at end of file diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index 7ed06955..c3746e04 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -6370,11 +6370,11 @@ local arena_rank = { } }, ["rand_board"]={ - 1, - 2, - 3, - 4, - 5 + 61, + 62, + 63, + 64, + 65 }, ["effect"]={ { @@ -6536,11 +6536,11 @@ local arena_rank = { } }, ["rand_board"]={ - 1, - 2, - 3, - 4, - 5 + 61, + 62, + 63, + 64, + 65 }, ["effect"]={ { @@ -6702,11 +6702,11 @@ local arena_rank = { } }, ["rand_board"]={ - 1, - 2, - 3, - 4, - 5 + 61, + 62, + 63, + 64, + 65 }, ["effect"]={ { @@ -6741,8 +6741,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=24, - ["id_for_nothing"]="VAw=", + ["id"]=58, + ["id_for_nothing"]="UwA=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -6876,11 +6876,11 @@ local arena_rank = { } }, ["rand_board"]={ - 6, - 7, - 8, - 9, - 10 + 66, + 67, + 68, + 69, + 70 }, ["effect"]={ { @@ -6915,8 +6915,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=24, - ["id_for_nothing"]="VAw=", + ["id"]=58, + ["id_for_nothing"]="UwA=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -7050,11 +7050,11 @@ local arena_rank = { } }, ["rand_board"]={ - 6, - 7, - 8, - 9, - 10 + 66, + 67, + 68, + 69, + 70 }, ["effect"]={ { @@ -7089,8 +7089,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=24, - ["id_for_nothing"]="VAw=", + ["id"]=58, + ["id_for_nothing"]="UwA=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -7224,11 +7224,11 @@ local arena_rank = { } }, ["rand_board"]={ - 6, - 7, - 8, - 9, - 10 + 66, + 67, + 68, + 69, + 70 }, ["effect"]={ { @@ -7263,8 +7263,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=24, - ["id_for_nothing"]="VAw=", + ["id"]=58, + ["id_for_nothing"]="UwA=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -7398,11 +7398,11 @@ local arena_rank = { } }, ["rand_board"]={ - 6, - 7, - 8, - 9, - 10 + 66, + 67, + 68, + 69, + 70 }, ["effect"]={ { @@ -7437,8 +7437,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=59, + ["id_for_nothing"]="UwE=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -7572,11 +7572,11 @@ local arena_rank = { } }, ["rand_board"]={ - 11, - 12, - 13, - 14, - 15 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { @@ -7611,8 +7611,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=59, + ["id_for_nothing"]="UwE=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -7746,11 +7746,11 @@ local arena_rank = { } }, ["rand_board"]={ - 11, - 12, - 13, - 14, - 15 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { @@ -7785,8 +7785,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=59, + ["id_for_nothing"]="UwE=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -7920,11 +7920,11 @@ local arena_rank = { } }, ["rand_board"]={ - 11, - 12, - 13, - 14, - 15 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { @@ -7959,8 +7959,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=59, + ["id_for_nothing"]="UwE=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -8094,11 +8094,11 @@ local arena_rank = { } }, ["rand_board"]={ - 11, - 12, - 13, - 14, - 15 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { @@ -8133,8 +8133,8 @@ local arena_rank = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=25, - ["id_for_nothing"]="VA0=", + ["id"]=59, + ["id_for_nothing"]="UwE=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -8268,11 +8268,11 @@ local arena_rank = { } }, ["rand_board"]={ - 11, - 12, - 13, - 14, - 15 + 71, + 72, + 73, + 74, + 75 }, ["effect"]={ { diff --git a/lua/app/config/arena_time.lua b/lua/app/config/arena_time.lua index 806bb1e6..24006e15 100644 --- a/lua/app/config/arena_time.lua +++ b/lua/app/config/arena_time.lua @@ -21,7 +21,7 @@ local arena_time = { ["season"]=4, ["start_time"]="2023-10-16 00:00:00", ["end_time"]="2023-11-15 00:00:00", - ["ui_banner"]="ui_arena_bounty_banner_1" + ["ui_banner"]="ui_arena_bounty_banner_2" } } local config = { diff --git a/lua/app/config/avatar_frame.lua b/lua/app/config/avatar_frame.lua index d146ebee..f6de4051 100644 --- a/lua/app/config/avatar_frame.lua +++ b/lua/app/config/avatar_frame.lua @@ -34,9 +34,19 @@ local avatar_frame = { [30]={ ["iconId"]="avatar_frame_8", ["item"]=57 + }, + [31]={ + ["iconId"]="avatar_frame_4", + ["item"]=58, + ["unlock_show"]=true + }, + [32]={ + ["iconId"]="avatar_frame_5", + ["item"]=59, + ["unlock_show"]=true } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 78423357..a251ba6e 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -684,7 +684,8 @@ local hero = { ["is_show"]=1, ["collection_point"]=5, ["skin"]={ - 24001 + 24001, + 2400101 } }, [24002]={ diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index d33aa987..929a1854 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1655,6 +1655,16 @@ local item = { ["qlt"]=5, ["icon"]="57" }, + [58]={ + ["type"]=10, + ["qlt"]=4, + ["icon"]="58" + }, + [59]={ + ["type"]=10, + ["qlt"]=5, + ["icon"]="59" + }, [1001]={ ["type"]=2, ["qlt"]=1, @@ -2528,9 +2538,15 @@ local item = { ["parameter"]=5400401, ["qlt"]=4, ["icon"]="5400401" + }, + [2400101]={ + ["type"]=12, + ["parameter"]=2400101, + ["qlt"]=3, + ["icon"]="2400101" } } local config = { -data=item,count=129 +data=item,count=132 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 0784fa9f..bffc8bed 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -633,6 +633,7 @@ local LocalizationGlobalConst = ACT_TOURN_ARENEA_DESC_1 = "ACT_TOURN_ARENEA_DESC_1", ACT_TOURN_ARENEA_HELP = "ACT_TOURN_ARENEA_HELP", ACT_TOURN_WAVE_DESC_4 = "ACT_TOURN_WAVE_DESC_4", + EVENT_COUNTDOWN = "EVENT_COUNTDOWN", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 5ba2a4bd..2731988c 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -4923,7 +4923,7 @@ local skill = { { ["type"]="bleed", ["num"]=3500, - ["ratio"]=5000, + ["ratio"]=10000, ["round"]=2 } }, @@ -4937,7 +4937,7 @@ local skill = { { ["type"]="bleed", ["num"]=7000, - ["ratio"]=5000, + ["ratio"]=10000, ["round"]=2 } }, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 0a6541e0..9d9c980f 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1728,6 +1728,12 @@ local skill_rogue = { ["num"]=2200120, ["ratio"]=10000, ["round"]=1 + }, + { + ["type"]="skill_fire_times", + ["num"]=2200123, + ["ratio"]=10000, + ["round"]=1 } }, ["obj"]=4, diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index 1e7b365f..a524a465 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -143,6 +143,32 @@ local skin = { ["skin_point"]=0, ["hero_id"]=24001 }, + [2400101]={ + ["model_id"]="p0045", + ["qlt"]=3, + ["bonus"]={ + { + ["type"]="attr_skill_hurtp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_yellow", + ["num"]=1000 + } + }, + ["icon"]="17_1", + ["got"]=1, + ["skin_point"]=0, + ["hero_id"]=24001, + ["item_id"]=2400101, + ["skill_show"]={ + 24001011, + 24001012, + 24001013, + 24001014, + 24001015 + } + }, [24002]={ ["model_id"]="p0017", ["qlt"]=1, @@ -419,6 +445,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/skin_skill.lua b/lua/app/config/skin_skill.lua index f4273d28..12369eb5 100644 --- a/lua/app/config/skin_skill.lua +++ b/lua/app/config/skin_skill.lua @@ -595,9 +595,83 @@ local skin_skill = { ["fx_bg"]=300170, ["fx_self_mirror"]=400169, ["fx_bg_mirror"]=400170 + }, + [24001011]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000011 + }, + ["name_act"]="attack01", + ["fx_self"]=300028, + ["fx_self_mirror"]=400073 + }, + [24001012]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000012 + }, + ["name_act"]="attack02", + ["fx_self"]=300029, + ["fx_self_mirror"]=400074 + }, + [24001013]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=1, + ["sound_hit"]={ + 1000013 + }, + ["name_act"]="attack03", + ["fx_self"]=300030, + ["fx_self_mirror"]=400075 + }, + [24001014]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=100, + ["shake_type"]=2, + ["sound_hit"]={ + 1000014 + }, + ["name_act"]="attack04", + ["fx_self"]=300031, + ["fx_self_mirror"]=400076 + }, + [24001015]={ + ["skill_position"]={ + 2, + 0 + }, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound"]=24001200, + ["sound_delay"]=0.0, + ["name_act"]="skill01", + ["fx_self"]=300032, + ["bullet_time"]={ + 1366, + 3000, + 400 + }, + ["fx_self_mirror"]=400077 } } local config = { -data=skin_skill,count=40 +data=skin_skill,count=45 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/avatar_frame.lua b/lua/app/config/strings/cn/avatar_frame.lua index 363459c7..893cc208 100644 --- a/lua/app/config/strings/cn/avatar_frame.lua +++ b/lua/app/config/strings/cn/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="圆月庆典头像框。" + }, + [30]={ + ["desc"]="S4竞技场白银头像框，力量的证明。" + }, + [31]={ + ["desc"]="S4竞技场黄金头像框，英雄的光辉。" } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index b49b7ebb..93aa6cab 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -624,8 +624,8 @@ local localization_global = ["ACT_TOURN_WAVE_DESC_1"] = "累积通关波次，可获得战令奖励！", ["ACT_TOURN_WAVE_DESC_2"] = "距离下次分组：", ["ACT_TOURN_WAVE_DESC_3"] = "距离结算：", - ["ACT_TOURN_WAVE_HELP_1"] = " 活动期间，通关以下副本波次，可获得战令奖励：\n1. 主线章节 \n2. 每日挑战 \n3. 灯神之塔 \n4. 时空裂隙", - ["ACT_TOURN_WAVE_HELP_2"] = " 排行榜积分：\n活动期间，通关主线、每日挑战、灯神之塔、时空裂隙，排行榜根据通关的波次进行排行。\n注意：活动最后1天，通关波次不再计入积分，仅展示排名。\n\n 排行榜分组规则：\n活动开启后，每2天进行一次分组，根据玩家在2天内的积分数进行排名，冒险家们可于第3天在[上轮排行榜]中，领取排行奖励。", + ["ACT_TOURN_WAVE_HELP_1"] = " 活动期间，通关以下副本波次，可获得战令奖励：\n1. 主线章节 \n2. 每日挑战 \n3. 灯神之塔 \n4. 时空裂隙\n5. 深渊挑战", + ["ACT_TOURN_WAVE_HELP_2"] = " 排行榜积分：\n活动期间，通关主线、每日挑战、灯神之塔、时空裂隙、深渊挑战，排行榜根据通关的波次进行排行。\n注意：活动最后1天，通关波次不再计入积分，仅展示排名。\n\n 排行榜分组规则：\n活动开启后，每2天进行一次分组，根据玩家在2天内的积分数进行排名，冒险家们可于第3天在[上轮排行榜]中，领取排行奖励。", ["ACT_TOURN_WAVE_BTN_1"] = "当前排行榜", ["ACT_TOURN_WAVE_BTN_2"] = "上轮排行榜", ["ACT_TOURN_WAVE_BTN_3"] = "排行榜奖励", @@ -633,6 +633,7 @@ local localization_global = ["ACT_TOURN_ARENEA_DESC_1"] = "参与竞技场，可获得战令奖励！", ["ACT_TOURN_ARENEA_HELP"] = " 排行榜积分：\n活动期间，参与竞技场，根据排位及战斗结果，可获得若干积分，排行榜根据积分进行排行。\n\n 青铜2：胜利{0}分，失败{1}分；\n 青铜1：胜利{0}分，失败{1}分；\n 白银4：胜利{0}分，失败{1}分；\n 白银3：胜利{0}分，失败{1}分；\n 白银2：胜利{0}分，失败{1}分；\n 白银1：胜利{0}分，失败{1}分；\n 黄金5：胜利{0}分，失败{1}分；\n 黄金4：胜利{0}分，失败{1}分；\n 黄金3：胜利{0}分，失败{1}分；\n 黄金2：胜利{0}分，失败{1}分；\n 黄金1：胜利{0}分，失败{1}分；\n\n注意：活动最后1天，参与竞技场不再计入积分，仅展示排名。\n\n 排行榜分组规则：\n活动开启后，每2天进行一次分组，根据玩家在2天内的积分数进行排名，冒险家们可于第3天在“上轮排行榜”中，领取排行奖励。", ["ACT_TOURN_WAVE_DESC_4"] = "礼包", + ["EVENT_COUNTDOWN"] = "活动倒计时：", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 9f6378b9..ad3a7761 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -223,6 +223,14 @@ local item = { ["name"]="圆月庆典头像框。", ["desc"]="圆月庆典头像框。" }, + [58]={ + ["name"]="S4赛季白银头像框", + ["desc"]="S4竞技场白银头像框，力量的证明。" + }, + [59]={ + ["name"]="S4赛季黄金头像框", + ["desc"]="S4竞技场黄金头像框，英雄的光辉。" + }, [1001]={ ["name"]="暗淡陨铁", ["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。" @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skin.lua b/lua/app/config/strings/cn/skin.lua index d150dcfb..2620556d 100644 --- a/lua/app/config/strings/cn/skin.lua +++ b/lua/app/config/strings/cn/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="初始" }, + [2400101]={ + ["value"]="巨剑鬼王" + }, [24002]={ ["value"]="初始" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/avatar_frame.lua b/lua/app/config/strings/de/avatar_frame.lua index 64097339..3474d3fb 100644 --- a/lua/app/config/strings/de/avatar_frame.lua +++ b/lua/app/config/strings/de/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ + }, + [30]={ + + }, + [31]={ + } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/item.lua b/lua/app/config/strings/de/item.lua index 2d0c3aa0..cff8b4d9 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -166,6 +166,12 @@ local item = { }, [57]={ + }, + [58]={ + + }, + [59]={ + }, [1001]={ @@ -370,6 +376,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skin.lua b/lua/app/config/strings/de/skin.lua index 91905e66..8be8db69 100644 --- a/lua/app/config/strings/de/skin.lua +++ b/lua/app/config/strings/de/skin.lua @@ -40,6 +40,9 @@ local skin = { }, [24001]={ + }, + [2400101]={ + }, [24002]={ @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/avatar_frame.lua b/lua/app/config/strings/en/avatar_frame.lua index e84004db..d305554c 100644 --- a/lua/app/config/strings/en/avatar_frame.lua +++ b/lua/app/config/strings/en/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="Round Moon Festival Avatar Frame" + }, + [30]={ + ["desc"]="S4 Silver Arena Avatar Frame. Proof of your strength." + }, + [31]={ + ["desc"]="S4 Gold Arena Avatar Frame, shining with heroic radiance." } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index 2ba24f60..a236bc42 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -552,7 +552,7 @@ local localization_global = ["RUNES_DESC_25"] = "Keep at least 1 unlocked rune in refinement", ["RUNES_DESC_26"] = "Lv{0}", ["RUNES_DESC_27"] = "Unlocks at Rune Forge Level {0}", - ["RUNES_DESC_28"] = "You have an unlocked attribute of {0}-rank or higher, do you want to continue refining?", + ["RUNES_DESC_28"] = "You have S or higher stats that are not locked. Continue to refine?", ["RUNES_DESC_29"] = "Stop", ["RUNES_DESC_30"] = "Refine...", ["DUNGEON_RUNE_DESC_1"] = "Objective", @@ -571,7 +571,7 @@ local localization_global = ["ACTIVITY_MOON_DESC_3"] = "New Hero", ["ACTIVITY_MOON_DESC_4"] = "Hero Selection Pack!", ["ACTIVITY_MOON_DESC_5"] = "New Hero - Valkyrie", - ["ACTIVITY_MOON_DESC_6"] = "Please purchase the previous Package first", + ["ACTIVITY_MOON_DESC_6"] = "Please buy the previous pack first", ["ACTIVITY_MOON_DESC_7"] = "Hero Selection", ["ACTIVITY_MOON_DESC_8"] = "You can choose activated hero", ["ACTIVITY_MOON_DESC_9"] = "Limited-Time Round Moon Festival Skins!", @@ -579,7 +579,7 @@ local localization_global = ["ACTIVITY_MOON_DESC_11"] = "All quests are completed!", ["ACTIVITY_MOON_DESC_12"] = "Please choose", ["SEIZED_DESC_4"] = "We have detected that you are using an illegal client. You cannot continue playing the game. Please download the game from an authorized app store.", - ["ACT_PVP_DESC_1"] = "Do you want to consume {0} diamonds to enter the tavern?", + ["ACT_PVP_DESC_1"] = "Confirm to spend {0} Diamonds to enter the Tavern?", ["ACT_PVP_DESC_2"] = "Enter", ["ACT_PVP_DESC_3"] = "Wins: {0}/{1} Losses: {2}/{3}", ["ACT_PVP_DESC_4"] = "Tavern Fund", @@ -587,11 +587,11 @@ local localization_global = ["ACT_PVP_DESC_6"] = "Nightmare Tavern", ["ACT_PVP_DESC_7"] = "{0} Wins", ["ACT_PVP_DESC_8"] = "Select {0} Heroes", - ["ACT_PVP_DESC_9"] = "Click on the hero to view details", + ["ACT_PVP_DESC_9"] = "Tap a hero to view details", ["ACT_PVP_DESC_10"] = "Free Refresh", ["ACT_PVP_DESC_11"] = "Hero to be Selected", - ["ACT_PVP_DESC_12"] = "Select", - ["ACT_PVP_DESC_13"] = "Do you want to consume {0} diamonds to refresh?", + ["ACT_PVP_DESC_12"] = "Choose", + ["ACT_PVP_DESC_13"] = "Confirm to spend {0} Diamonds to refresh?", ["ACT_PVP_DESC_14"] = "Wins", ["ACT_PVP_DESC_15"] = "Tavern Points", ["ACT_PVP_DESC_16"] = "Welcome to invest in the Tavern Fund. Challenge opponents in the tavern to claim bonus rewards based on accumulated points~", @@ -620,6 +620,20 @@ local localization_global = ["RUNES_QLT_6"] = "A", ["RUNES_QLT_7"] = "S", ["RUNES_QLT_8"] = "SS", + ["ACT_TOURN_WAVE_TITLE"] = "Stage Championship", + ["ACT_TOURN_WAVE_DESC_1"] = "Clear enough waves to earn Battle Pass rewards!", + ["ACT_TOURN_WAVE_DESC_2"] = "Next grouping in:", + ["ACT_TOURN_WAVE_DESC_3"] = "Settle in:", + ["ACT_TOURN_WAVE_HELP_1"] = "During the event, clearing the following dungeons will earn Battle Pass rewards: \n1. Main Storyline Chapter \n2. Daily Challenge \n3. Tower of Lumens \n4. Time Rift", + ["ACT_TOURN_WAVE_HELP_2"] = "Ranking Points:\nDuring the event, you will be ranked based on waves cleared in Main Story Chapter, Daily Challenge, Tower of Lumens and Time Rift.\nNote: On the last day of the event, waves cleared no longer count toward points, only ranking will be displayed.\n\n Ranking Group Rules:\nAfter the event starts, grouping occurs every 2 days. Players are ranked based on points earned within 2 days. Adventurers can collect ranking rewards on the 3rd day in the [Previous Rankings].", + ["ACT_TOURN_WAVE_BTN_1"] = "Current Ranking", + ["ACT_TOURN_WAVE_BTN_2"] = "Previous Ranking", + ["ACT_TOURN_WAVE_BTN_3"] = "Ranking Reward", + ["ACT_TOURN_ARENEA_TITLE"] = "Arena Championship", + ["ACT_TOURN_ARENEA_DESC_1"] = "Participate in the arena to earn Battle Pass rewards!", + ["ACT_TOURN_ARENEA_HELP"] = "Ranking Points:\nDuring the event, earn points from rank and battle results. You will be ranked based on your points.\n\nBronze 2: Win - {0} points, Lose - {1} points;\nBronze 1: Win - {0} points, Lose - {1} points;\nSilver 4: Win - {0} points, Lose - {1} points;\nSilver 3: Win - {0} points, Lose - {1} points;\nSilver 2: Win - {0} points, Lose - {1} points;\nSilver 1: Win - {0} points, Lose - {1} points;\nGold 5: Win - {0} points, Lose - {1} points;\nGold 4: Win - {0} points, Lose - {1} points;\nGold 3: Win - {0} points, Lose - {1} points;\nGold 2: Win - {0} points, Lose - {1} points;\nGold 1: Win - {0} points, Lose - {1} points;\n\nNote: On the last day of the event, Arena no longer counts points, only ranking will be displayed.\n\nRanking Group Rules:\nAfter the event starts, grouping occurs every 2 days. Players are ranked based on points earned within 2 days. Adventurers can collect ranking rewards on the 3rd day in the [Previous Rankings].", + ["ACT_TOURN_WAVE_DESC_4"] = "Gift Pack", + ["EVENT_COUNTDOWN"] = "Event countdown:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index f2a307a1..b8029e3e 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -217,12 +217,20 @@ local item = { }, [56]={ ["name"]="Round Moon", - ["desc"]="The small moon of the Round Moon Festival." + ["desc"]="Little moon of Round Moon Festival." }, [57]={ ["name"]="Round Moon Festival Avatar Frame", ["desc"]="Round Moon Festival Avatar Frame" }, + [58]={ + ["name"]="S4 Silver Avatar Frame", + ["desc"]="S4 Silver Arena Avatar Frame. Proof of your strength." + }, + [59]={ + ["name"]="S4 Gold Avatar Frame", + ["desc"]="S4 Gold Arena Avatar Frame, shining with heroic radiance." + }, [1001]={ ["name"]="Dim Meteorite", ["desc"]="A dim meteorite that holds a mysterious energy." @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skin.lua b/lua/app/config/strings/en/skin.lua index 8f8897f3..456bd09c 100644 --- a/lua/app/config/strings/en/skin.lua +++ b/lua/app/config/strings/en/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="Initial" }, + [2400101]={ + ["value"]="Claymore Ghost King" + }, [24002]={ ["value"]="Initial" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/avatar_frame.lua b/lua/app/config/strings/es/avatar_frame.lua index 7d295066..e7dd7bd6 100644 --- a/lua/app/config/strings/es/avatar_frame.lua +++ b/lua/app/config/strings/es/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="Marco de avatar de celebración de luna llena" + }, + [30]={ + ["desc"]="Marco de avatar de plata de Arena S4, prueba de fuerza." + }, + [31]={ + ["desc"]="Marco de avatar de oro de Arena S1, gloria del héroe." } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/global.lua b/lua/app/config/strings/es/global.lua index 4cf6b2e3..5c8c4243 100644 --- a/lua/app/config/strings/es/global.lua +++ b/lua/app/config/strings/es/global.lua @@ -552,8 +552,8 @@ local localization_global = ["RUNES_DESC_25"] = "Mantén al menos 1 runa desbloqueada para forjar.", ["RUNES_DESC_26"] = "Nv.{0}", ["RUNES_DESC_27"] = "Desbloqueada la Forja de Runas Nv. {0}", - ["RUNES_DESC_28"] = "¿Tiene atributos por encima del nivel {0} que no están bloqueados, ¿ quiere seguir templando?", - ["RUNES_DESC_29"] = "Parar", + ["RUNES_DESC_28"] = "Tienes atributos de clase S o superior no bloqueados. ¿Quieres forjar?", + ["RUNES_DESC_29"] = "Terminar", ["RUNES_DESC_30"] = "Forjar...", ["DUNGEON_RUNE_DESC_1"] = "Objetivo", ["DUNGEON_RUNE_DESC_2"] = "Desafía de nuevo", @@ -566,20 +566,20 @@ local localization_global = ["DUNGEON_RUNE_DESC_9"] = "Temporada anterior", ["DUNGEON_RUNE_DESC_10"] = "Mejor récord: {0}", ["DUNGEON_RUNE_DESC_11"] = "Número de rondas: {0}", - ["ACTIVITY_MOON_DESC_1"] = "Celebración de luna llena", + ["ACTIVITY_MOON_DESC_1"] = "Celebración de Luna Llena", ["ACTIVITY_MOON_DESC_2"] = "Paquete de Selección", ["ACTIVITY_MOON_DESC_3"] = "Nuevo Héroe", ["ACTIVITY_MOON_DESC_4"] = "Paquete de Selección de Héroe", - ["ACTIVITY_MOON_DESC_5"] = "Nuevo Héroe - Valquiria", - ["ACTIVITY_MOON_DESC_6"] = "Por favor, compre el paquete de regalo anterior primero.", + ["ACTIVITY_MOON_DESC_5"] = "Nueva heroína: Valquiria", + ["ACTIVITY_MOON_DESC_6"] = "Compra primero el paquete anterior", ["ACTIVITY_MOON_DESC_7"] = "Selección de Héroe", ["ACTIVITY_MOON_DESC_8"] = "Puedes seleccionar héroes activados", ["ACTIVITY_MOON_DESC_9"] = "Skin de Celebración de Luna Llena, ¡disponible por tiempo limitado!", - ["ACTIVITY_MOON_DESC_10"] = "{0} Paquete de Skin", + ["ACTIVITY_MOON_DESC_10"] = "{0}Paquete de Skin", ["ACTIVITY_MOON_DESC_11"] = "¡Todas las misiones completadas!", ["ACTIVITY_MOON_DESC_12"] = "Selecciona", ["SEIZED_DESC_4"] = "Hemos detectado que estás utilizando un cliente ilegal, que no te permitirá seguir jugando. Por favor descarga la aplicación correcta en la tienda oficial de aplicaciones.", - ["ACT_PVP_DESC_1"] = "¿Se consumen {0} diamantes para entrar en la taberna?", + ["ACT_PVP_DESC_1"] = "¿Quieres entrar en la Taberna con {0} diamantes?", ["ACT_PVP_DESC_2"] = "Entrar", ["ACT_PVP_DESC_3"] = "Vitorias: {0}/{1} Derrotas: {2}/{3}", ["ACT_PVP_DESC_4"] = "Fondo de Taberna", @@ -587,11 +587,11 @@ local localization_global = ["ACT_PVP_DESC_6"] = "Taberna Íncubo", ["ACT_PVP_DESC_7"] = "{0} vitorias", ["ACT_PVP_DESC_8"] = "Elige {0} héroe", - ["ACT_PVP_DESC_9"] = "Haga clic en el héroe para ver los detalles", + ["ACT_PVP_DESC_9"] = "Pulsa un héroe para ver detalles", ["ACT_PVP_DESC_10"] = "Actualizar Gratis", ["ACT_PVP_DESC_11"] = "Héroes a elegir para la siguiente ronda", - ["ACT_PVP_DESC_12"] = "Selección", - ["ACT_PVP_DESC_13"] = "¿Se consumen {0} diamantes para refrescarse?", + ["ACT_PVP_DESC_12"] = "Elegir", + ["ACT_PVP_DESC_13"] = "¿Quieres actualizar con {0} diamantes?", ["ACT_PVP_DESC_14"] = "Victorias acumuladas", ["ACT_PVP_DESC_15"] = "Puntos de Taberna", ["ACT_PVP_DESC_16"] = "Bienvenido al Fondo de Taberna. Desafía oponentes en la Taberna, acumula puntos y colecta puntos extra!", @@ -599,7 +599,7 @@ local localization_global = ["ACT_PVP_DESC_18"] = "1. Todas las victorias en la taberna durante el evento serán acumuladas para la clasificación. \n2. El evento dura siete días y puedes recibir recompensas de clasificación el octavo día. \n3. Colecta las recompensas a tiempo antes de que caduquen.", ["ACT_PVP_DESC_19"] = "Vitorias: {0}", ["ACT_PVP_DESC_20"] = "Derrotas: {0}", - ["ACT_PVP_DESC_21"] = "1. La Taberna ofrece 1 entrada gratuita al día. Al entrar, primero elige 5 héroes aleatorios para formar tu equipo. Todos los héroes son proporcionados por la taberna y no comparten tus atributos.", + ["ACT_PVP_DESC_21"] = "1. La Taberna ofrece 1 entrada gratuita al día. Al entrar, primero elige 5 héroes aleatorios para formar tu equipo. Todos los héroes son proporcionados por la Taberna y no comparten tus atributos.", ["ACT_PVP_DESC_22"] = "2. Tras formar tu equipo, serás emparejado con un oponente con el mismo número de victorias. El héroe sube 1 nivel tras cada victoria. El nivel inicial de héroes de todas las cualidades es el nivel 6.", ["ACT_PVP_DESC_23"] = "3. Acumulando 10 victorias o 2 derrotas, saldrás de la taberna y necesitarás volver a entrar. Recibirás recompensas adicionales por victorias acumuladas durante el día.", ["ACT_PVP_TALK_DESC_1"] = "Oye, ¿quieres jugar un partido hoy?", @@ -611,7 +611,7 @@ local localization_global = ["ACT_PVP_TALK_DESC_7"] = "¡Qué genial eres! Vuelve pronto, ganador de 10 victorias.", ["ACT_PVP_TALK_DESC_8"] = "¿Derrotado? No te desanimes y desafía de nuevo.", ["ACT_PVP_TALK_DESC_9"] = "No importa ser derrotado. Con mi Íncubo ganarás la próxima vez.", - ["ACT_PVP_DESC_24"] = "Está cerrado", + ["ACT_PVP_DESC_24"] = "Cerrado", ["RUNES_QLT_1"] = "F", ["RUNES_QLT_2"] = "E", ["RUNES_QLT_3"] = "D", @@ -620,6 +620,20 @@ local localization_global = ["RUNES_QLT_6"] = "A", ["RUNES_QLT_7"] = "S", ["RUNES_QLT_8"] = "SS", + ["ACT_TOURN_WAVE_TITLE"] = "Torneo de Fases", + ["ACT_TOURN_WAVE_DESC_1"] = "Acumula las ondas de fases y ganarás recompensas de Pase de Batalla.", + ["ACT_TOURN_WAVE_DESC_2"] = "Próxima agrupación:", + ["ACT_TOURN_WAVE_DESC_3"] = "Próxima clasificación:", + ["ACT_TOURN_WAVE_HELP_1"] = "Durante el evento, podrás recibir recompensas de Pase de Batalla al completar las siguientes ondas de instancias: \n1. Capítulos de la historia principal \n2. Desafíos diarios \n3. Torre de Genio de Lámpara \n4. Grieta de Tiempo", + ["ACT_TOURN_WAVE_HELP_2"] = "Puntos de clasificación: \n Completa la Historia Principal, los Desafíos Diarios, la Torre de Genio de Lámpara y la Grieta de Tiempo, la clasificación durante el evento, y la clasificación se bass en la cantidad de ondas completadas. \nNota: El último día del evento, las ondas completadas no se contarán en puntos, y solo se mostrarán en la clasificación. \n\n Reglas de agrupación de clasificación: \nDespués de que comience el evento, se realizará la agrupación cada 2 días. La clasificación se basa en los puntos acumulados de los jugadores en los 2 días. Los aventureros podrán recibir recompensas de clasificación el día 3 en la [Clasificación Anterior].", + ["ACT_TOURN_WAVE_BTN_1"] = "Clasificación Actual", + ["ACT_TOURN_WAVE_BTN_2"] = "Clasificación Anterior", + ["ACT_TOURN_WAVE_BTN_3"] = "Recompensas de Clasificación", + ["ACT_TOURN_ARENEA_TITLE"] = "Torneo de Arena", + ["ACT_TOURN_ARENEA_DESC_1"] = "Participa en Arena y ganarás recompensas de Pase de Batalla.", + ["ACT_TOURN_ARENEA_HELP"] = "Puntos de clasificación: \nDurante el evento, participa en Arena para ganar puntos según tu clasificación y resultados de batallas. La clasificación se basa en los puntos. \nBronce 2: Victoria {0}puntos, Derrota {1}puntos; \nBronce 1: Victoria {0}puntos, Derrota {1}puntos; \nPlata 4: Victoria {0}puntos, Derrota {1}puntos; \nPlata 3: Victoria {0}puntos, Derrota {1}puntos; \nPlata 2: Victoria {0}puntos, Derrota {1}puntos; \nPlata 1: Victoria {0}puntos, Derrota {1}puntos; \nOro 5: Victoria {0}puntos, Derrota {1}puntos. \nOro 4: Victoria {0}puntos, Derrota {1}puntos; \nOro 3: Victoria {0}puntos, Derrota {1}puntos; \nOro 2: Victoria {0}puntos, Derrota {1}puntos; \nOro 1: Victoria {0}puntos, Derrota {1}puntos; \n\n El último día del evento, la participación en Arena no se contará en puntos, y solo se mostrará en la clasificación. \n\n Reglas de agrupación de clasificación: \nDespués de que comience el evento, se realizará la agrupación cada 2 días. La clasificación se basa en los puntos acumulados de los jugadores en los 2 días. Los aventureros podrán recibir recompensas de clasificación el día 3 en la [Clasificación Anterior].", + ["ACT_TOURN_WAVE_DESC_4"] = "Paquete", + ["EVENT_COUNTDOWN"] = "Cuenta regresiva del evento:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/es/item.lua b/lua/app/config/strings/es/item.lua index fa406799..840d495a 100644 --- a/lua/app/config/strings/es/item.lua +++ b/lua/app/config/strings/es/item.lua @@ -216,13 +216,21 @@ local item = { ["desc"]="Esencia rúnica, usada para forjar runas." }, [56]={ - ["name"]="Luna llena", - ["desc"]="La pequeña luna en la Celebración de luna llena." + ["name"]="Luna Llena", + ["desc"]="Luna pequeña de la Celebración de Luna Llena" }, [57]={ ["name"]="Marco de avatar de celebración de luna llena", ["desc"]="Marco de avatar de celebración de luna llena" }, + [58]={ + ["name"]="Marco de avatar de plata Temporada S4", + ["desc"]="Marco de avatar de plata de Arena S4, prueba de fuerza." + }, + [59]={ + ["name"]="Marco de avatar de oro Temporada S4", + ["desc"]="Marco de avatar de oro de Arena S1, gloria del héroe." + }, [1001]={ ["name"]="Meteorito Opaco", ["desc"]="Un trozo de meteorito opaco que contiene energía misteriosa." @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/skin.lua b/lua/app/config/strings/es/skin.lua index f2b56533..32b2e22f 100644 --- a/lua/app/config/strings/es/skin.lua +++ b/lua/app/config/strings/es/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="Inicial" }, + [2400101]={ + ["value"]="El Rey de la Espada" + }, [24002]={ ["value"]="Inicial" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/avatar_frame.lua b/lua/app/config/strings/fr/avatar_frame.lua index 64097339..3474d3fb 100644 --- a/lua/app/config/strings/fr/avatar_frame.lua +++ b/lua/app/config/strings/fr/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ + }, + [30]={ + + }, + [31]={ + } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/item.lua b/lua/app/config/strings/fr/item.lua index 2d0c3aa0..cff8b4d9 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -166,6 +166,12 @@ local item = { }, [57]={ + }, + [58]={ + + }, + [59]={ + }, [1001]={ @@ -370,6 +376,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skin.lua b/lua/app/config/strings/fr/skin.lua index 91905e66..8be8db69 100644 --- a/lua/app/config/strings/fr/skin.lua +++ b/lua/app/config/strings/fr/skin.lua @@ -40,6 +40,9 @@ local skin = { }, [24001]={ + }, + [2400101]={ + }, [24002]={ @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/avatar_frame.lua b/lua/app/config/strings/id/avatar_frame.lua index 9ab5281d..e5669d38 100644 --- a/lua/app/config/strings/id/avatar_frame.lua +++ b/lua/app/config/strings/id/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="Bingkai Avatar Festival Lunar" + }, + [30]={ + ["desc"]="Bingkai Avatar Silver Arena S4. Bukti Kekuatan." + }, + [31]={ + ["desc"]="Bingkai Avatar Emas Arena S4.Pahlawan mulia." } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/global.lua b/lua/app/config/strings/id/global.lua index ed71950e..bb22c266 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -552,7 +552,7 @@ local localization_global = ["RUNES_DESC_25"] = "Simpan setidaknya 1 rune yang terbuka dalam refine.", ["RUNES_DESC_26"] = "Lv{0}", ["RUNES_DESC_27"] = "Buka di Rune Forge Level {0}", - ["RUNES_DESC_28"] = "Anda memiliki atribut yang tidak terkunci di atas tingkat {0}, Anda ingin melanjutkan refining?", + ["RUNES_DESC_28"] = "Kamu memiliki atribut level S atau lebih tinggi yang terbuka. Lanjutkan refine?", ["RUNES_DESC_29"] = "Berhenti", ["RUNES_DESC_30"] = "Refine...", ["DUNGEON_RUNE_DESC_1"] = "Target", @@ -566,12 +566,12 @@ local localization_global = ["DUNGEON_RUNE_DESC_9"] = "Musim Terakhir", ["DUNGEON_RUNE_DESC_10"] = "Tertinggi: {0}", ["DUNGEON_RUNE_DESC_11"] = "Giliran: {0}", - ["ACTIVITY_MOON_DESC_1"] = "Festival Lunar", + ["ACTIVITY_MOON_DESC_1"] = "Festival Bulan", ["ACTIVITY_MOON_DESC_2"] = "Pack Pilihan", ["ACTIVITY_MOON_DESC_3"] = "Hero Baru", ["ACTIVITY_MOON_DESC_4"] = "Pack Pilihan Hero!", - ["ACTIVITY_MOON_DESC_5"] = "Hero Baru - Valkyrie", - ["ACTIVITY_MOON_DESC_6"] = "Harap beli paket sebelumnya dahulu", + ["ACTIVITY_MOON_DESC_5"] = "Hero baru - Valkyrie", + ["ACTIVITY_MOON_DESC_6"] = "Beli pack sebelumnya dahulu", ["ACTIVITY_MOON_DESC_7"] = "Pilihan Hero", ["ACTIVITY_MOON_DESC_8"] = "Bisa memilih hero yang aktif", ["ACTIVITY_MOON_DESC_9"] = "Skin Festival Lunar Waktu Terbatas!", @@ -579,7 +579,7 @@ local localization_global = ["ACTIVITY_MOON_DESC_11"] = "Semua quest selesai!", ["ACTIVITY_MOON_DESC_12"] = "Silahkan pilih", ["SEIZED_DESC_4"] = "Anda terdeteksi telah menggunakan platform tidak resmi, sehingga Anda tidak akan dapat memainkan game ini. Harap kunjungi aplikasi resmi untuk mengunduh. Terima kasih.", - ["ACT_PVP_DESC_1"] = "Apakah Anda ingin mengkonsumsi berlian {0} untuk memasuki tavern?", + ["ACT_PVP_DESC_1"] = "Gunakan {0} berlian untuk memasuki Tavern?", ["ACT_PVP_DESC_2"] = "Masuk", ["ACT_PVP_DESC_3"] = "Menang: {0}/{1} Kalah: {2}/{3}", ["ACT_PVP_DESC_4"] = "Dana Tavern", @@ -587,11 +587,11 @@ local localization_global = ["ACT_PVP_DESC_6"] = "Nightmare Tavern", ["ACT_PVP_DESC_7"] = "{0} menang", ["ACT_PVP_DESC_8"] = "Pilih {0} Hero", - ["ACT_PVP_DESC_9"] = "Klik pada pahlawan untuk melihat rincian", + ["ACT_PVP_DESC_9"] = "Klik hero untuk info detail", ["ACT_PVP_DESC_10"] = "Refresh Gratis", ["ACT_PVP_DESC_11"] = "Hero untuk Dipilih", ["ACT_PVP_DESC_12"] = "Pilih", - ["ACT_PVP_DESC_13"] = "Apakah itu memakan {0} berlian untuk menyegarkan?", + ["ACT_PVP_DESC_13"] = "Gunakan {0} berlian untuk refresh?", ["ACT_PVP_DESC_14"] = "Menang", ["ACT_PVP_DESC_15"] = "Poin Tavern", ["ACT_PVP_DESC_16"] = "Selamat datang untuk berinvestasi di Dana Tavern. Tantang lawan di tavern untuk mengklaim hadiah bonus berdasarkan poin yang terkumpul.", @@ -599,7 +599,7 @@ local localization_global = ["ACT_PVP_DESC_18"] = "1. Semua kemenangan Tavern akan dicatat secara kumulatif untuk peringkat selama event berlangsung. \n2. Event berlangsung selama total 7 hari, dan hadiah dapat diklaim pada hari ke-8.\n3. Harap klaim hadiah tepat waktu; hadiah tidak dapat dikompensasikan setelah kedaluwarsa.", ["ACT_PVP_DESC_19"] = "Menang: {0}", ["ACT_PVP_DESC_20"] = "Kalah: {0}", - ["ACT_PVP_DESC_21"] = "1. Tavern menawarkan 1 entri gratis per hari. Setelah masuk, pilih 5 hero secara acak untuk membangun tim sendiri. Semua hero disediakan oleh Tavern. Mereka tidak mewarisi statistikmu.", + ["ACT_PVP_DESC_21"] = "1. Tavern menawarkan 1 entri gratis per hari. Setelah masuk, pilih 5 hero secara acak untuk membangun tim. Semua hero disediakan oleh Tavern dan tidak mewarisi atributmu.", ["ACT_PVP_DESC_22"] = "2. Setelah membangun tim, kamu akan dipertemukan dengan lawan yang memiliki jumlah kemenangan yang sama denganmu untuk sesi ini. Setiap kemenangan akan menaikkan level hero sebesar 1. Semua hero dimulai dari level 6, terlepas dari kualitasnya.", ["ACT_PVP_DESC_23"] = "3. Kumpulkan 10 kemenangan atau 2 kekalahan untuk keluar dari Tavern. Kamu harus masuk kembali. Hadiah kemenangan ekstra dapat diklaim untuk kemenangan pada hari tertentu.", ["ACT_PVP_TALK_DESC_1"] = "Hai! Mau main game hari ini?", @@ -611,7 +611,7 @@ local localization_global = ["ACT_PVP_TALK_DESC_7"] = "Sungguh seorang pejuang yang tangguh. Semoga kita bisa bertemu lagi, pemenang ke-10!", ["ACT_PVP_TALK_DESC_8"] = "Kalah? Jangan menyerah. Coba lagi!", ["ACT_PVP_TALK_DESC_9"] = "Tidak apa-apa untuk gagal. Nightmare akan membantu menang di pertandingan berikutnya.", - ["ACT_PVP_DESC_24"] = "Di bawah penutupan", + ["ACT_PVP_DESC_24"] = "Tutup", ["RUNES_QLT_1"] = "F", ["RUNES_QLT_2"] = "E", ["RUNES_QLT_3"] = "D", @@ -620,6 +620,20 @@ local localization_global = ["RUNES_QLT_6"] = "A", ["RUNES_QLT_7"] = "S", ["RUNES_QLT_8"] = "SS", + ["ACT_TOURN_WAVE_TITLE"] = "Turnamen Stage", + ["ACT_TOURN_WAVE_DESC_1"] = "Selesaikan lebih banyak stage dan dapatkan hadiah Battle Pass!", + ["ACT_TOURN_WAVE_DESC_2"] = "Pengelompokan berikutnya:", + ["ACT_TOURN_WAVE_DESC_3"] = "Penyelesaian:", + ["ACT_TOURN_WAVE_HELP_1"] = "Lolos stage dungeon berikut untuk menerima hadiah Battle Pass selama evebt: \n1. Tantangan Harian \n2. Tantangan Utama \n3. Menara Lumen \n4. Celah Waktu", + ["ACT_TOURN_WAVE_HELP_2"] = "Poin Peringkat: \nLolos quest utama, tantangan harian, Menara Lumen, dan Celah Waktu selama periode event. Peringkat akan didasarkan pada jumlah stage yang diselesaikan.\nCatatan: Pada hari terakhir event, poin tidak lagi dihitung untuk menyelesaikan gelombang, hanya peringkat yang akan ditampilkan.\n\n Aturan pengelompokan peringkat:\nSetelah event dimulai, pemain akan dibagi menjadi beberapa grup setiap 2 hari, dan pemain akan diberi peringkat berdasarkan poin yang didapatkan dalam 2 hari. Petualang dapat menerima hadiah peringkat di [Peringkat Terakhir] pada hari ke-3.", + ["ACT_TOURN_WAVE_BTN_1"] = "Peringkat Saat Ini", + ["ACT_TOURN_WAVE_BTN_2"] = "Peringkat Terakhir", + ["ACT_TOURN_WAVE_BTN_3"] = "Hadiah Peringkat", + ["ACT_TOURN_ARENEA_TITLE"] = "Turnamen Arena", + ["ACT_TOURN_ARENEA_DESC_1"] = "Partisipasi Arena dan dapatkan hadiah Battle Pass!", + ["ACT_TOURN_ARENEA_HELP"] = "Poin Peringkat:\nPartisipasi Arena dan dapatkan sejumlah poin berdasarkan peringkat dan hasil battle selama event. Peringkat akan didasarkan pada poin.\n\n Bronze 2: Menang {0} poin, kalah {1} poin;\n Bronze 1：Menang {0} poin, kalah {1} poin;\n Silver 4：Menang {0} poin, kalah {1} poin;\n Silver 3：Menang {0} poin, kalah {1} poin;\n Silver 2：Menang {0} poin, kalah {1} poin;\n Silver 1：Menang {0} poin, kalah {1} poin;\n Emas 5：Menang {0} poin, kalah {1} poin;\n Emas 4：Menang {0} poin, kalah {1} poin;\n Emas 3：Menang {0} poin, kalah {1} poin;\n Emas 2：Menang {0} poin, kalah {1} poin;\n Emas 1：Menang {0} poin, kalah {1} poin;\n\nCatatan: Poin partisipasi arena tidak lagi dihitung sebagai poin pada hari terakhir event, hanya peringkat yang ditampilkan.\n\n Aturan pengelompokan peringkat:\nSetelah event dimulai, pemain akan dibagi menjadi beberapa grup setiap 2 hari, dan pemain akan diberi peringkat berdasarkan poin yang didapatkan dalam 2 hari. Petualang dapat menerima hadiah peringkat di \"Peringkat Terakhir\" pada hari ke-3.", + ["ACT_TOURN_WAVE_DESC_4"] = "Paket Hadiah", + ["EVENT_COUNTDOWN"] = "Hitung mundur acara:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index d734a42f..b42ec778 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -216,13 +216,21 @@ local item = { ["desc"]="Esensi Rune untuk memadamkan rune." }, [56]={ - ["name"]="Bulan penuh", - ["desc"]="Bulan kecil di Festival Bulan." + ["name"]="Bulan", + ["desc"]="Bulan kecil untuk festival." }, [57]={ ["name"]="Bingkai Avatar Festival Lunar", ["desc"]="Bingkai Avatar Festival Lunar" }, + [58]={ + ["name"]="Bingkai Avatar Silver Musim S4", + ["desc"]="Bingkai Avatar Silver Arena S4. Bukti Kekuatan." + }, + [59]={ + ["name"]="Bingkai Avatar Emas Musim S4", + ["desc"]="Bingkai Avatar Emas Arena S4.Pahlawan mulia." + }, [1001]={ ["name"]="Chondrite", ["desc"]="Meteorit redup yang menyimpan energi misterius." @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skin.lua b/lua/app/config/strings/id/skin.lua index 7878e0f6..82046134 100644 --- a/lua/app/config/strings/id/skin.lua +++ b/lua/app/config/strings/id/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="Awal" }, + [2400101]={ + ["value"]="Raja Hantu Pedang" + }, [24002]={ ["value"]="Awal" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/avatar_frame.lua b/lua/app/config/strings/ja/avatar_frame.lua index 40189a0e..51a95c68 100644 --- a/lua/app/config/strings/ja/avatar_frame.lua +++ b/lua/app/config/strings/ja/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="満月イベントのフレーム。" + }, + [30]={ + ["desc"]="S4闘技場シルバーフレーム。実力の証。" + }, + [31]={ + ["desc"]="S4闘技場ゴールドフレーム。ヒーローの輝き。" } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/global.lua b/lua/app/config/strings/ja/global.lua index 5d9365ba..e6c55fcc 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -552,8 +552,8 @@ local localization_global = ["RUNES_DESC_25"] = "", ["RUNES_DESC_26"] = "Lv{0}", ["RUNES_DESC_27"] = "ルーン合成台Lv{0}解放", - ["RUNES_DESC_28"] = "{0}レベル以上の属性がロックされていません。精製を続けますか？", - ["RUNES_DESC_29"] = "ストップ", + ["RUNES_DESC_28"] = "S級以上のステータスが未ロックになっています。精製を続けますか？", + ["RUNES_DESC_29"] = "停止", ["RUNES_DESC_30"] = "精製...", ["DUNGEON_RUNE_DESC_1"] = "目標", ["DUNGEON_RUNE_DESC_2"] = "再挑戦", @@ -579,7 +579,7 @@ local localization_global = ["ACTIVITY_MOON_DESC_11"] = "すべてのミッションが完了しました！", ["ACTIVITY_MOON_DESC_12"] = "選択してください", ["SEIZED_DESC_4"] = "不正なクライアントを使用していることが判明したため、引き続きプレイできません。アプリストアにてゲームをダウンロードしてください。", - ["ACT_PVP_DESC_1"] = "{0}ダイヤを消費して酒場に入るのか。", + ["ACT_PVP_DESC_1"] = "{0}ダイヤを消費して、酒場に入りますか？", ["ACT_PVP_DESC_2"] = "入る", ["ACT_PVP_DESC_3"] = "勝：{0}/{1} 敗：{2}/{3}", ["ACT_PVP_DESC_4"] = "酒場ファンド", @@ -587,11 +587,11 @@ local localization_global = ["ACT_PVP_DESC_6"] = "夢魔酒場", ["ACT_PVP_DESC_7"] = "{0}勝", ["ACT_PVP_DESC_8"] = "{0}ヒーローを選択してください", - ["ACT_PVP_DESC_9"] = "詳細は英雄をクリック", + ["ACT_PVP_DESC_9"] = "ヒーローをタップして詳細を確認する", ["ACT_PVP_DESC_10"] = "無料更新", ["ACT_PVP_DESC_11"] = "次のラウンドで選ばれるヒーロー", - ["ACT_PVP_DESC_12"] = "せんたく", - ["ACT_PVP_DESC_13"] = "{0}ダイヤ更新を消費しますか？", + ["ACT_PVP_DESC_12"] = "選択", + ["ACT_PVP_DESC_13"] = "{0}ダイヤを消費して、更新しますか？", ["ACT_PVP_DESC_14"] = "累計勝利数", ["ACT_PVP_DESC_15"] = "酒場ポイント", ["ACT_PVP_DESC_16"] = "酒場ファンドへようこそ。酒場で対戦相手に挑戦し、ポイントを貯めてボーナスを受け取りましょう~", @@ -599,7 +599,7 @@ local localization_global = ["ACT_PVP_DESC_18"] = "1.イベント期間中、酒場での勝利回数はすべてランキングのために累積され、記録されます。\n2.イベント期間は合計7日間で、8日目にランキング報酬を獲得できます。\n3.報酬は期限内に受け取る必要があり、期限を過ぎると受取できません。", ["ACT_PVP_DESC_19"] = "勝：{0}", ["ACT_PVP_DESC_20"] = "敗：{0}", - ["ACT_PVP_DESC_21"] = "1.1日1回無料で酒場に入ることができ、入るとランダムにヒーローを5体選択し、チームを編成する必要があります。すべてのヒーローは酒場から提供され、所有ヒーローのステータスは引き継がれませんが。", + ["ACT_PVP_DESC_21"] = "1.1日1回無料で酒場に入ることができ、入るとランダムにヒーローを5体選択し、チームを編成する必要があります。すべてのヒーローは酒場から提供され、所有ヒーローのステータスは引き継がれません。", ["ACT_PVP_DESC_22"] = "2.チームを編成した後、今回と同じ勝利回数の相手とマッチングします。勝利するたびにヒーローが1回レベルアップします。すべての品質のヒーローはLv6からスタートします。", ["ACT_PVP_DESC_23"] = "3.10勝または2敗すると酒場から退場し、再入場が必要となります。その日の勝利回数に応じて追加報酬を獲得できます。", ["ACT_PVP_TALK_DESC_1"] = "こんにちは~今日はいかが？", @@ -620,6 +620,20 @@ local localization_global = ["RUNES_QLT_6"] = "A", ["RUNES_QLT_7"] = "S", ["RUNES_QLT_8"] = "SS", + ["ACT_TOURN_WAVE_TITLE"] = "ステージ選手権大会", + ["ACT_TOURN_WAVE_DESC_1"] = "ステージをクリアすると、戦令報酬を獲得できます！", + ["ACT_TOURN_WAVE_DESC_2"] = "次回のグループ分けまで：", + ["ACT_TOURN_WAVE_DESC_3"] = "決算まで：", + ["ACT_TOURN_WAVE_HELP_1"] = "イベント期間中、以下ダンジョンのステージをクリアすると、戦令報酬を獲得できます。\n1. メインストーリーステージ \n2. デイリー挑戦\n3. ランプの魔神の塔\n4.時空の裂け目", + ["ACT_TOURN_WAVE_HELP_2"] = "ランキングポイント：\nイベント期間中、メインストーリー、デイリー挑戦、ランプの魔神の塔と時空の裂け目をクリアすると、クリアステージ数に応じてランキングが作成されます。\n注意：イベント最終日には、クリアステージはポイントとしてカウントされず、ランキングのみが表示されます。\n\nランキンググループ分けルール：\nイベント開始後、2日ごとにグループ分けを行い、2日間で獲得したポイントに応じてランキングが作成されます。冒険者様は3日目に[前のラウンドのランキング］にてランキング報酬を獲得できます。", + ["ACT_TOURN_WAVE_BTN_1"] = "現在のランキング", + ["ACT_TOURN_WAVE_BTN_2"] = "前のラウンドのランキング", + ["ACT_TOURN_WAVE_BTN_3"] = "ランキング報酬", + ["ACT_TOURN_ARENEA_TITLE"] = "闘技場選手権大会", + ["ACT_TOURN_ARENEA_DESC_1"] = "闘技場に参加すると、戦令報酬を獲得できます！", + ["ACT_TOURN_ARENEA_HELP"] = "ランキングポイント：\nイベント期間中、闘技場に参加すると、ランク及びバトル結果に応じてポイントを獲得できます。ポイントに応じてランキングが作成されます。\n\nブロンズ2：勝{0}ポイント、敗{1}ポイント。\nブロンズ1：勝{0}ポイント、敗{1}ポイント。\nシルバー4：勝{0}ポイント、敗{1}ポイント。\nシルバー3：勝{0}ポイント、敗{1}ポイント。\nシルバー2：勝{0}ポイント、敗{1}ポイント。\nシルバー1：勝{0}ポイント、敗{1}ポイント。\nゴールド5：勝{0}ポイント、敗{1}ポイント。\nゴールド4：勝{0}ポイント、敗{1}ポイント。\nゴールド3：勝{0}ポイント、敗{1}ポイント。\nゴールド2：勝{0}ポイント、敗{1}ポイント。\nゴールド1：勝{0}ポイント、敗{1}ポイント。\n\n注意：イベント最終日には、クリアステージはポイントとしてカウントされず、ランキングのみが表示されます。\n\nイベント開始後、2日ごとにグループ分けを行い、2日間で獲得したポイントに応じてランキングが作成されます。冒険者様は3日目に「前のラウンドのランキング」にてランキング報酬を獲得できます。", + ["ACT_TOURN_WAVE_DESC_4"] = "パック", + ["EVENT_COUNTDOWN"] = "イベントカウントダウン:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index 38200b08..c9de4fe5 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -217,12 +217,20 @@ local item = { }, [56]={ ["name"]="満月", - ["desc"]="満月イベントの小さな月。" + ["desc"]="満月イベントの月。" }, [57]={ ["name"]="満月イベントのフレーム。", ["desc"]="満月イベントのフレーム。" }, + [58]={ + ["name"]="S4シーズンシルバーフレーム", + ["desc"]="S4闘技場シルバーフレーム。実力の証。" + }, + [59]={ + ["name"]="S4シーズンゴールドフレーム", + ["desc"]="S4闘技場ゴールドフレーム。ヒーローの輝き。" + }, [1001]={ ["name"]="薄暗い隕石", ["desc"]="謎のエネルギーを秘めた隕石。" @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skin.lua b/lua/app/config/strings/ja/skin.lua index c97be9d1..206561d3 100644 --- a/lua/app/config/strings/ja/skin.lua +++ b/lua/app/config/strings/ja/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="デフォルト" }, + [2400101]={ + ["value"]="大剣鬼王" + }, [24002]={ ["value"]="デフォルト" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/avatar_frame.lua b/lua/app/config/strings/ko/avatar_frame.lua index 74abede7..3e253ced 100644 --- a/lua/app/config/strings/ko/avatar_frame.lua +++ b/lua/app/config/strings/ko/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="보름달 축제 아이콘 프레임" + }, + [30]={ + ["desc"]="S4 아레나 실버 아이콘 프레임, 강인함의 증명입니다." + }, + [31]={ + ["desc"]="S4 아레나 골드 아이콘 프레임, 영웅의 눈부신 업적입니다." } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/global.lua b/lua/app/config/strings/ko/global.lua index e077e990..95adc96b 100644 --- a/lua/app/config/strings/ko/global.lua +++ b/lua/app/config/strings/ko/global.lua @@ -552,8 +552,8 @@ local localization_global = ["RUNES_DESC_25"] = "룬 다듬기에서 잠긴 룬을 최소 하나 남기기", ["RUNES_DESC_26"] = "Lv{0}", ["RUNES_DESC_27"] = "룬 주조대 {0}레벨에 잠금 해제", - ["RUNES_DESC_28"] = "당신은 {0}레벨 이상의 속성이 잠기지 않았습니다. 계속 담금질하시겠습니까?", - ["RUNES_DESC_29"] = "정지", + ["RUNES_DESC_28"] = "S 레벨 이상의 속성이 잠기지 않았습니다. 계속하여 다듬으실 건가요?", + ["RUNES_DESC_29"] = "멈추기", ["RUNES_DESC_30"] = "다듬기...", ["DUNGEON_RUNE_DESC_1"] = "목표", ["DUNGEON_RUNE_DESC_2"] = "다시 도전하기", @@ -566,12 +566,12 @@ local localization_global = ["DUNGEON_RUNE_DESC_9"] = "지난 시즌", ["DUNGEON_RUNE_DESC_10"] = "최고: {0}", ["DUNGEON_RUNE_DESC_11"] = "턴 횟수: {0}", - ["ACTIVITY_MOON_DESC_1"] = "보름달 축하", + ["ACTIVITY_MOON_DESC_1"] = "보름달 축제", ["ACTIVITY_MOON_DESC_2"] = "커스텀 패키지", ["ACTIVITY_MOON_DESC_3"] = "신규 영웅", ["ACTIVITY_MOON_DESC_4"] = "영웅 커스텀 패키지!", - ["ACTIVITY_MOON_DESC_5"] = "신규 영웅 - 발키리", - ["ACTIVITY_MOON_DESC_6"] = "이전 패키지를 먼저 구매해 주세요.", + ["ACTIVITY_MOON_DESC_5"] = "신규 영웅-발키리", + ["ACTIVITY_MOON_DESC_6"] = "먼저 이전 패키지를 구매하세요.", ["ACTIVITY_MOON_DESC_7"] = "영웅 커스텀", ["ACTIVITY_MOON_DESC_8"] = "활성화된 영웅을 선택할 수 있습니다.", ["ACTIVITY_MOON_DESC_9"] = "보름달 축제 스킨, 한정 출시!", @@ -579,7 +579,7 @@ local localization_global = ["ACTIVITY_MOON_DESC_11"] = "모든 미션을 전부 완료했습니다!", ["ACTIVITY_MOON_DESC_12"] = "선택해주세요", ["SEIZED_DESC_4"] = "불법 클라이언트 사용이 감지되었습니다. 게임을 진행할 수 없으며 스토어에 가서 공식 게임 어플을 다운 받아 주세요.", - ["ACT_PVP_DESC_1"] = "{0}다이아를 소비하여 술집에 입장하시겠습니까?", + ["ACT_PVP_DESC_1"] = "{0} 다이아를 소모하여 주점에 들어가시겠나요?", ["ACT_PVP_DESC_2"] = "입장", ["ACT_PVP_DESC_3"] = "승리: {0}/{1} 패배: {2}/{3}", ["ACT_PVP_DESC_4"] = "주점 펀드", @@ -587,11 +587,11 @@ local localization_global = ["ACT_PVP_DESC_6"] = "인큐버스 주점", ["ACT_PVP_DESC_7"] = "{0}승", ["ACT_PVP_DESC_8"] = "{0} 영웅을 선택해 주세요.", - ["ACT_PVP_DESC_9"] = "영웅을 클릭하면 상세 정보를 볼 수 있습니다", + ["ACT_PVP_DESC_9"] = "영웅을 클릭하면 자세한 내용을 볼 수 있습니다.", ["ACT_PVP_DESC_10"] = "무료 리셋", ["ACT_PVP_DESC_11"] = "다음 턴에 선정될 영웅", ["ACT_PVP_DESC_12"] = "선택", - ["ACT_PVP_DESC_13"] = "{0} 다이아를 소모하여 갱신하시겠습니까?", + ["ACT_PVP_DESC_13"] = "{0} 다이아를 소모하여 새로고침 하시겠나요?", ["ACT_PVP_DESC_14"] = "누적 승리", ["ACT_PVP_DESC_15"] = "주점 포인트", ["ACT_PVP_DESC_16"] = "주점 펀드에 가입하신 것을 환영합니다. 주점에서 상대에게 도전하여 포인트를 쌓으면 배당금 보상을 받을 수 있습니다~", @@ -599,7 +599,7 @@ local localization_global = ["ACT_PVP_DESC_18"] = "1. 이벤트 기간 주점에서 거둔 모든 승리는 누적되어 순위 결정에 사용됩니다. \n2. 이벤트는 총 7일간 진행되며 8일째에 랭킹 보상을 받을 수 있습니다. \n3. 마감일 내에 보상을 받아주세요. 만료된 보상은 재발급되지 않습니다.", ["ACT_PVP_DESC_19"] = "승리: {0}", ["ACT_PVP_DESC_20"] = "패배: {0}", - ["ACT_PVP_DESC_21"] = "1. 주점은 매일 한 번 무료로 입장할 수 있습니다. 입장하면 무작위로 선택된 5명의 영웅으로 나만의 팀을 구성하게 됩니다. 모든 영웅은 주점에서 제공하며 당신의 속성을 상속받지 않지만.", + ["ACT_PVP_DESC_21"] = "1. 주점은 하루에 한 번 무료로 입장할 수 있으며 무작위로 선택한 5명 영웅으로 팀을 구축하게 됩니다. 모든 영웅은 주점에서 제공하며 당신의 속성을 물려받지 않습니다.", ["ACT_PVP_DESC_22"] = "2. 나만의 팀을 구성한 후, 같은 승수를 기록한 상대와 매칭되며 승리할 때마다 영웅이 한 번씩 업그레이드됩니다. 모든 영웅의 초기 레벨은 레벨 6에서 시작합니다.", ["ACT_PVP_DESC_23"] = "3. 누적 10번 승리하거나 2번 실패하면 주점에서 나가게 되며 다시 입장해야 합니다. 하루 동안 누적된 승리 횟수로 추가 보상을 받을 수 있습니다.", ["ACT_PVP_TALK_DESC_1"] = "안녕하세요~ 오늘 게임할래요?", @@ -611,7 +611,7 @@ local localization_global = ["ACT_PVP_TALK_DESC_7"] = "당신은 정말 강력한 워리어시네요. 꼭 다시 놀러 오세요, 10연승의 마스터님!", ["ACT_PVP_TALK_DESC_8"] = "패배하셨나요? 실망하지 마시고 또 놀러 오세요!", ["ACT_PVP_TALK_DESC_9"] = "실패해도 괜찮아요. 다음번엔 인큐버스와 함께 플레이하면 반드시 승리할 거예요.", - ["ACT_PVP_DESC_24"] = "휴업 중", + ["ACT_PVP_DESC_24"] = "휴식 중", ["RUNES_QLT_1"] = "F", ["RUNES_QLT_2"] = "E", ["RUNES_QLT_3"] = "D", @@ -620,6 +620,20 @@ local localization_global = ["RUNES_QLT_6"] = "A", ["RUNES_QLT_7"] = "S", ["RUNES_QLT_8"] = "SS", + ["ACT_TOURN_WAVE_TITLE"] = "스테이지 토너먼트", + ["ACT_TOURN_WAVE_DESC_1"] = "클리어 웨이브 수를 누적하면 배틀 패스 보상을 받을 수 있습니다.", + ["ACT_TOURN_WAVE_DESC_2"] = "다음 그룹 나누기까지:", + ["ACT_TOURN_WAVE_DESC_3"] = "거리 정산:", + ["ACT_TOURN_WAVE_HELP_1"] = "이벤트 기간 다음 서브 퀘스트의 웨이브를 클리어하면 배틀 패스 보상을 받을 수 있습니다. \n1. 메인라인 챕터 \n2. 데일리 챌린지 \n3. 램프신의 탑 \n4. 시공간의 균열", + ["ACT_TOURN_WAVE_HELP_2"] = "랭킹 포인트: \n이벤트 기간 메인라인 챕터, 데일리 챌린지, 램프신의 탑, 시공간의 균열을 클리어하면 클리어한 웨이브 수에 따라 랭킹 순위를 매깁니다. \n참고: 이벤트 마지막 날에 클리어한 웨이브 수는 더 이상 포인트에 누적되지 않으며 순위만 표시됩니다. \n\n 랭킹 그룹 나누기 규칙: \n이벤트가 시작되면 2일마다 한 번씩 그룹을 나눕니다. 유저가 이틀 동안 획득한 포인트에 따라 순위가 나뉘며 모험가들은 3일째 되는 날[이전 라운드 랭킹]에서 랭킹 보상을 획득할 수 있습니다.", + ["ACT_TOURN_WAVE_BTN_1"] = "현재 랭킹", + ["ACT_TOURN_WAVE_BTN_2"] = "이전 라운드 랭킹", + ["ACT_TOURN_WAVE_BTN_3"] = "랭킹 보상", + ["ACT_TOURN_ARENEA_TITLE"] = "아레나 토너먼트", + ["ACT_TOURN_ARENEA_DESC_1"] = "아레나에 참여하고 배틀 패스 보상을 받으세요!", + ["ACT_TOURN_ARENEA_HELP"] = "랭킹 포인트:\n이벤트 기간 동안 아레나에 참여하면 순위와 전투 결과에 따라 포인트를 얻을 수 있습니다. 순위는 포인트에 따라 결정됩니다. \n\n 브론즈 2: 승리 시 {0}점, 실패 시 {1}점;\n 브론즈 1: 승리 시 {0}점, 실패 시 {1}점;\n 실버 4: 실패 시 {0}점 승리, 실패 시 {1}점;\n 실버 3: 승리 시 {0}점, 실패 시 {1}점;\n 실버 2: 승리 시 {0}점, 실패 시 {1}점;\n 실버 1: 승리 시 {0}점, 실패 시 {1}점; \n 골드 5: 승리 시 {0}점, 실패 시 {1}점;\n 골드 4: 승리 시 {0}점, 실패 시 {1}점;\n 골드 3: 승리 시 {0}점, 실패 시 {1}점; \n 골드 2: 승리 시 {0}점, 실패 시 {1}점;\n 골드 1: 승리 시 {0}점, 실패 시 {1}점;\n\n참고: 이벤트 마지막 날 아레나에 참여하면 더는 포인트를 누적하지 않으며 순위만 표시됩니다. \n\n랭킹 그룹 나누기 규칙:\n이벤트가 시작되면 2일마다 한 번씩 그룹을 나눕니다. 유저가 이틀 동안 획득한 포인트에 따라 순위가 나뉘며 모험가들은 3일째 되는 날‘이전 라운드 랭킹’에서 랭킹 보상을 획득할 수 있습니다.", + ["ACT_TOURN_WAVE_DESC_4"] = "패키지", + ["EVENT_COUNTDOWN"] = "이벤트 카운트다운:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index 5080c16e..1d5e96cc 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -217,12 +217,20 @@ local item = { }, [56]={ ["name"]="보름달", - ["desc"]="보름달 축하의 작은 달." + ["desc"]="보름달 축제의 작은 달입니다." }, [57]={ ["name"]="보름달 축제 아이콘 프레임", ["desc"]="보름달 축제 아이콘 프레임" }, + [58]={ + ["name"]="S4 시즌 실버 아이콘 프레임", + ["desc"]="S4 아레나 실버 아이콘 프레임, 강인함의 증명입니다." + }, + [59]={ + ["name"]="S4 시즌 골드 아이콘 프레임", + ["desc"]="S4 아레나 골드 아이콘 프레임, 영웅의 눈부신 업적입니다." + }, [1001]={ ["name"]="알렌데 운석", ["desc"]="암흑의 운석 한 조각, 신비한 에너지를 품고 있습니다." @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skin.lua b/lua/app/config/strings/ko/skin.lua index c3b88f79..c56d38e3 100644 --- a/lua/app/config/strings/ko/skin.lua +++ b/lua/app/config/strings/ko/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="초기" }, + [2400101]={ + ["value"]="대검귀신의 왕" + }, [24002]={ ["value"]="초기" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/avatar_frame.lua b/lua/app/config/strings/pt/avatar_frame.lua index 27c23795..b588b821 100644 --- a/lua/app/config/strings/pt/avatar_frame.lua +++ b/lua/app/config/strings/pt/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="Moldura de Avatar do Festival da Lua Cheia." + }, + [30]={ + ["desc"]="Moldura de avatar de prata da Arena S4, uma testemunha da força." + }, + [31]={ + ["desc"]="Moldura de avatar de ouro da Arena S4, o brilho de um herói." } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/global.lua b/lua/app/config/strings/pt/global.lua index afff49f0..e489e6cf 100644 --- a/lua/app/config/strings/pt/global.lua +++ b/lua/app/config/strings/pt/global.lua @@ -552,7 +552,7 @@ local localization_global = ["RUNES_DESC_25"] = "É preciso manter pelo menos 1 runa não bloqueada para forjar.", ["RUNES_DESC_26"] = "Nv.{0}", ["RUNES_DESC_27"] = "Desbloqueada com a Forja de Runas Nv.{0}", - ["RUNES_DESC_28"] = "Você tem atributos desbloqueados acima do nível {0}, você quer continuar refinando?", + ["RUNES_DESC_28"] = "Você tem atributos da classe S não bloqueados. Deseja forjar?", ["RUNES_DESC_29"] = "Parar", ["RUNES_DESC_30"] = "Forjar...", ["DUNGEON_RUNE_DESC_1"] = "Objetivo", @@ -570,16 +570,16 @@ local localization_global = ["ACTIVITY_MOON_DESC_2"] = "Pacote de Seleção", ["ACTIVITY_MOON_DESC_3"] = "Novo Herói", ["ACTIVITY_MOON_DESC_4"] = "Pacote de seleção de heróis!", - ["ACTIVITY_MOON_DESC_5"] = "Novo Herói - Valquíria", - ["ACTIVITY_MOON_DESC_6"] = "Compre o pacote prévio primeiro, por favor.", + ["ACTIVITY_MOON_DESC_5"] = "Nova Heroína: Valquíria", + ["ACTIVITY_MOON_DESC_6"] = "Compre o pacote anterior primeiro.", ["ACTIVITY_MOON_DESC_7"] = "Seleção de Heróis", ["ACTIVITY_MOON_DESC_8"] = "Pode escolher heróis já ativados.", ["ACTIVITY_MOON_DESC_9"] = "Skin do Festival da Lua Cheia disponível por tempo limitado!", - ["ACTIVITY_MOON_DESC_10"] = "{0} Pacote de Skins", + ["ACTIVITY_MOON_DESC_10"] = "Pacote de Skins de {0}", ["ACTIVITY_MOON_DESC_11"] = "Todas as missões foram concluídas!", ["ACTIVITY_MOON_DESC_12"] = "Faça sua escolha", ["SEIZED_DESC_4"] = "Detectamos que está operando um programa não oficial e, por isso, você não pode continuar jogando. Por favor, vá até a uma loja de aplicativos oficial para baixar nosso jogo.", - ["ACT_PVP_DESC_1"] = "Você quer consumir {0} diamantes para entrar na taverna?", + ["ACT_PVP_DESC_1"] = "Deseja entrar na Taverna com {0} diamantes?", ["ACT_PVP_DESC_2"] = "Entrar", ["ACT_PVP_DESC_3"] = "Vitórias: {0}/{1} Derrotas: {2}/{3}", ["ACT_PVP_DESC_4"] = "Fundo da Taverna", @@ -587,11 +587,11 @@ local localization_global = ["ACT_PVP_DESC_6"] = "Taverna do Íncubo", ["ACT_PVP_DESC_7"] = "{0} vitórias", ["ACT_PVP_DESC_8"] = "Escolha um herói {0}.", - ["ACT_PVP_DESC_9"] = "Clique no herói para ver detalhes", + ["ACT_PVP_DESC_9"] = "Toque num herói para ver suas informações.", ["ACT_PVP_DESC_10"] = "Atualizar Grátis", ["ACT_PVP_DESC_11"] = "Heróis a serem escolhidos na próxima rodada", - ["ACT_PVP_DESC_12"] = "Seleccionar", - ["ACT_PVP_DESC_13"] = "Consumo {0} diamantes para refrescar?", + ["ACT_PVP_DESC_12"] = "Escolher", + ["ACT_PVP_DESC_13"] = "Deseja entrar atualizar com {0} diamantes?", ["ACT_PVP_DESC_14"] = "Vitórias acumuladas", ["ACT_PVP_DESC_15"] = "Pontos da Taverna", ["ACT_PVP_DESC_16"] = "Bem-vindo(a) ao Fundo da Taverna. Desafie seus oponentes na Taverna, acumule pontos e colete recompensas de dividendos!", @@ -599,7 +599,7 @@ local localization_global = ["ACT_PVP_DESC_18"] = "1. Todas as vitórias na Taverna durante o evento serão acumuladas para a classificação. \n2. O evento dura sete dias, e as recompensas de classificação podem ser coletadas no oitavo dia. \n3. Não se esqueça de coletar suas recompensas a tempo, pois não as poderá coletar depois da expiração.", ["ACT_PVP_DESC_19"] = "Vitórias: {0}", ["ACT_PVP_DESC_20"] = "Derrotas: {0}", - ["ACT_PVP_DESC_21"] = "1. A Taverna oferece 1 chance gratuita de entrada por dia. Após entrar, você precisa selecionar 5 heróis aleatórios para construir sua equipe. Todos os heróis são fornecidos pela Taverna e, não compartilhando seus atributos.", + ["ACT_PVP_DESC_21"] = "1. Você tem 1 ingresso gratuito à Taverna todos os dias. Após entrar, você precisa selecionar 5 heróis aleatórios para construir sua equipe. Todos os heróis são fornecidos pela Taverna e não compartilham seus atributos.", ["ACT_PVP_DESC_22"] = "2. Após construir sua equipe, você será pareado(a) com um oponente com o mesmo número de vitórias nesta rodada. A cada vitória, seus heróis sobem de 1 nível. O nível inicial de todos os heróis de todas as qualidades é de 6.", ["ACT_PVP_DESC_23"] = "3. Você sairá da Taverna depois de acumular 10 vitórias ou 2 derrotas. Você precisará entrar novamente. Você pode coletar recompensas extras pelas vitórias acumuladas por hoje.", ["ACT_PVP_TALK_DESC_1"] = "Oi! Quer jogar uma rodada hoje?", @@ -611,7 +611,7 @@ local localization_global = ["ACT_PVP_TALK_DESC_7"] = "Admiro sua conquista! Volte sempre, vencedor(a) de 10 partidas!", ["ACT_PVP_TALK_DESC_8"] = "Foi derrotado(a)? Não desanime e desafie de novo!", ["ACT_PVP_TALK_DESC_9"] = "Umas derrotas não importam. Quando eu Íncubo apareço no campo, você vencerá.", - ["ACT_PVP_DESC_24"] = "Sob fecho", + ["ACT_PVP_DESC_24"] = "Fechada", ["RUNES_QLT_1"] = "F", ["RUNES_QLT_2"] = "E", ["RUNES_QLT_3"] = "D", @@ -620,6 +620,20 @@ local localization_global = ["RUNES_QLT_6"] = "A", ["RUNES_QLT_7"] = "S", ["RUNES_QLT_8"] = "SS", + ["ACT_TOURN_WAVE_TITLE"] = "Torneio de Fases", + ["ACT_TOURN_WAVE_DESC_1"] = "Conclua mais ondas nas fases e ganhe recompensas da Ordem de Batalha!", + ["ACT_TOURN_WAVE_DESC_2"] = "Até o próximo agrupamento:", + ["ACT_TOURN_WAVE_DESC_3"] = "Até a classificação:", + ["ACT_TOURN_WAVE_HELP_1"] = "Receberá recompensas da Ordem de Batalha após limpar as ondas nas seguintes masmorras durante o evento: \n1. Capítulos da História \n2. Desafios Diários \n3. Torre do Gênio da Lâmpada \n4. Fenda Espaço-temporal.", + ["ACT_TOURN_WAVE_HELP_2"] = "Pontuação da tabela de classificação:\nConclua os capítulos História, os Desafios Diários, a Torre do Gênio da Lâmpada e a Fenda Espaço-temporal para entrar na tabela de classificação, cuja pontuação é baseada nas ondas completas. \nATENÇÃO: no último dia do evento, as ondas completas não serão consideradas na pontuação. Esse dia será apenas para a exibição do ranking.\n\n Regras de agrupamento na tabela: \nApós o início do evento, um agrupamento é realizado a cada 2 dias, com base na pontuação dos jogadores nesses 2 dias. Os aventureiros podem receber recompensas de ranking no [Ranking Anter.] no 3.º dia.", + ["ACT_TOURN_WAVE_BTN_1"] = "Ranking Atual", + ["ACT_TOURN_WAVE_BTN_2"] = "Ranking Anter.", + ["ACT_TOURN_WAVE_BTN_3"] = "Recompensas", + ["ACT_TOURN_ARENEA_TITLE"] = "Torneio da Arena", + ["ACT_TOURN_ARENEA_DESC_1"] = "Combata na Arena e ganhe recompensas da Ordem de Batalha!", + ["ACT_TOURN_ARENEA_HELP"] = "Pontuação da tabela de classificação:\nDurante o evento, você pode ganhar uma certa quantidade de pontos participando da Arena. A pontuação é definida pelo seu ranking e resultados das batalhas, e a classificação é realizada de acordo com essa pontuação.\n\n Bronze 2 — Vitória: {0} pts., Derrota: {1} pts.;\n Bronze 1— Vitória: {0} pts., Derrota: {1} pts.; \n Prata 4— Vitória: {0} pts., Derrota: {1} pts.; \n Prata 3— Vitória: {0} pts., Derrota: {1} pts.; \n Prata 2— Vitória: {0} pts., Derrota: {1} pts.; \n Prata 1— Vitória: {0} pts., Derrota: {1} pts.; \n Ouro 5— Vitória: {0} pts., Derrota: {1} pts.; \n Ouro 4— Vitória: {0} pts., Derrota: {1} pts.; \n Ouro 3— Vitória: {0} pts., Derrota: {1} pts.; \n Ouro 2— Vitória: {0} pts., Derrota: {1} pts.; \n Ouro 1— Vitória: {0} pts., Derrota: {1} pts.; \n\nATENÇÃO: no último dia do evento, as ondas completas não serão consideradas na pontuação. Esse dia será apenas para a exibição do ranking.\n\n Regras de agrupamento na tabela: \nApós o início do evento, um agrupamento é realizado a cada 2 dias, com base na pontuação dos jogadores nesses 2 dias. Os aventureiros podem receber recompensas de ranking no [Ranking Anter.] no 3.º dia.", + ["ACT_TOURN_WAVE_DESC_4"] = "Pacote", + ["EVENT_COUNTDOWN"] = "Contagem regressiva do evento:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index 354edc4d..eaf07d8b 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -217,12 +217,20 @@ local item = { }, [56]={ ["name"]="Lua Cheia", - ["desc"]="A pequena lua da Festival da Lua Cheia." + ["desc"]="Uma luazinha da Festival da Lua Cheia." }, [57]={ ["name"]="Moldura de Avatar do Festival da Lua Cheia.", ["desc"]="Moldura de Avatar do Festival da Lua Cheia." }, + [58]={ + ["name"]="Moldura de Avatar de Prata da S4", + ["desc"]="Moldura de avatar de prata da Arena S4, uma testemunha da força." + }, + [59]={ + ["name"]="Moldura de Avatar de Ouro da S4", + ["desc"]="Moldura de avatar de ouro da Arena S4, o brilho de um herói." + }, [1001]={ ["name"]="Ferro Meteórico Opaco", ["desc"]="Uma peça de ferro meteórico opaco, contendo energia misteriosa." @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skin.lua b/lua/app/config/strings/pt/skin.lua index 3cb54135..355e6ed6 100644 --- a/lua/app/config/strings/pt/skin.lua +++ b/lua/app/config/strings/pt/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="Inicial" }, + [2400101]={ + ["value"]="O Rei Demônio da Espada" + }, [24002]={ ["value"]="Inicial" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/avatar_frame.lua b/lua/app/config/strings/ru/avatar_frame.lua index 64097339..3474d3fb 100644 --- a/lua/app/config/strings/ru/avatar_frame.lua +++ b/lua/app/config/strings/ru/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ + }, + [30]={ + + }, + [31]={ + } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/item.lua b/lua/app/config/strings/ru/item.lua index 2d0c3aa0..cff8b4d9 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -166,6 +166,12 @@ local item = { }, [57]={ + }, + [58]={ + + }, + [59]={ + }, [1001]={ @@ -370,6 +376,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skin.lua b/lua/app/config/strings/ru/skin.lua index 91905e66..8be8db69 100644 --- a/lua/app/config/strings/ru/skin.lua +++ b/lua/app/config/strings/ru/skin.lua @@ -40,6 +40,9 @@ local skin = { }, [24001]={ + }, + [2400101]={ + }, [24002]={ @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/avatar_frame.lua b/lua/app/config/strings/th/avatar_frame.lua index aa2013c3..ef36c149 100644 --- a/lua/app/config/strings/th/avatar_frame.lua +++ b/lua/app/config/strings/th/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="กรอบรูปงานฉลองพระจันทร์เต็มดวง" + }, + [30]={ + ["desc"]="กรอบรูปเงินของอารีน่า S4 พิสูจน์ของพลังงาน" + }, + [31]={ + ["desc"]="กรอบรูปทองของอารีน่า S4 ความรุ่งโรจน์ของฮีโร่" } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/global.lua b/lua/app/config/strings/th/global.lua index e70a9033..90148a59 100644 --- a/lua/app/config/strings/th/global.lua +++ b/lua/app/config/strings/th/global.lua @@ -552,7 +552,7 @@ local localization_global = ["RUNES_DESC_25"] = "การหล่อรูนต้องรักษารูนที่ปลดล็อคไว้อย่างน้อย 1 อัน", ["RUNES_DESC_26"] = "Lv{0}", ["RUNES_DESC_27"] = "แท่นหล่อรูน Lv.{0} จะปลดล็อค", - ["RUNES_DESC_28"] = "คุณมีแอตทริบิวต์สูงกว่า {0}-class ที่ไม่ได้ล็อคไว้ คุณต้องการที่จะชุบแข็งต่อไปหรือไม่?", + ["RUNES_DESC_28"] = "คุณมีสเตตัสระดับ S ที่ยังไม่ได้ปลด ยืนยันจะหล่อต่อไปหรือไม่?", ["RUNES_DESC_29"] = "หยุด", ["RUNES_DESC_30"] = "หล่อ...", ["DUNGEON_RUNE_DESC_1"] = "เป้าหมาย", @@ -570,16 +570,16 @@ local localization_global = ["ACTIVITY_MOON_DESC_2"] = "แพ็คเลือกเอง", ["ACTIVITY_MOON_DESC_3"] = "ฮีโร่ใหม่", ["ACTIVITY_MOON_DESC_4"] = "แพ็คเลือกฮีโร่!", - ["ACTIVITY_MOON_DESC_5"] = "ฮีโร่ใหม่-วาลคิรี", - ["ACTIVITY_MOON_DESC_6"] = "กรุณาซื้อแพ็กเกจก่อนหน้าก่อน", + ["ACTIVITY_MOON_DESC_5"] = "ฮีโร่ใหม่ - วาลคิรี", + ["ACTIVITY_MOON_DESC_6"] = "กรุณาซื้อแพ็ก่อนหน้านี้ก่อน", ["ACTIVITY_MOON_DESC_7"] = "เลือกฮีโร่", ["ACTIVITY_MOON_DESC_8"] = "สามารถเลือกฮีโร่ที่เปิดใช้งานได้", ["ACTIVITY_MOON_DESC_9"] = "สกินงานฉลองพระจันทร์เต็มดวง เปิดตัวอย่างจำกัดเวลา!", - ["ACTIVITY_MOON_DESC_10"] = "{0}แพ็คสกิน", + ["ACTIVITY_MOON_DESC_10"] = "แพ็คสกิน{0}", ["ACTIVITY_MOON_DESC_11"] = "บรรลุภารกิจทั้งหมดแล้ว!", ["ACTIVITY_MOON_DESC_12"] = "โปรดเลือก", ["SEIZED_DESC_4"] = "เราตรวจพบว่าคุณกำลังใช้ไคลเอนต์ที่ผิดกฎหมาย คุณจะไม่สามารถเล่นเกมได้ โปรดไปที่ App Store อย่างเป็นทางการเพื่อดาวน์โหลด", - ["ACT_PVP_DESC_1"] = "ใช้เพชร {0} เข้าไปในโรงเตี๊ยมหรือไม่?", + ["ACT_PVP_DESC_1"] = "ใช้ {0} เพชรเพื่อเข้าสู่โรงเตี๊ยมหรือไม่?", ["ACT_PVP_DESC_2"] = "เข้า", ["ACT_PVP_DESC_3"] = "ชนะ: {0}/{1} แพ้: {2}/{3}", ["ACT_PVP_DESC_4"] = "กองทุนโรงเตี๊ยม", @@ -587,7 +587,7 @@ local localization_global = ["ACT_PVP_DESC_6"] = "โรงเตี๊ยมฝันร้าย", ["ACT_PVP_DESC_7"] = "ชนะ{0}", ["ACT_PVP_DESC_8"] = "โปรดเลือก{0}ฮีโร่", - ["ACT_PVP_DESC_9"] = "คลิกฮีโร่เพื่อดูรายละเอียด", + ["ACT_PVP_DESC_9"] = "คลิกที่ฮีโร่เพื่อดูรายละเอียด", ["ACT_PVP_DESC_10"] = "รีเฟรชฟรี", ["ACT_PVP_DESC_11"] = "ฮีโร่ที่จะเลือกในรอบต่อไป", ["ACT_PVP_DESC_12"] = "เลือก", @@ -611,7 +611,7 @@ local localization_global = ["ACT_PVP_TALK_DESC_7"] = "ฝันร้ายวันนี้ฉันได้พบกับผู้แข็งแกร่งแล้ว ท่านที่ชนะ 10 ครั้ง ยินดีต้อนรับกลับมา!", ["ACT_PVP_TALK_DESC_8"] = "พ่ายแพ้เหรอ? อย่าท้อนะ~ มาเล่นอีกสิ!", ["ACT_PVP_TALK_DESC_9"] = "แพ็ก็ไม่เป็นไร ครั้งหน้าฉันจะชนะอย่างแน่นอน", - ["ACT_PVP_DESC_24"] = "อยู่ระหว่างการปิดกิจการ", + ["ACT_PVP_DESC_24"] = "ปิดอยู่", ["RUNES_QLT_1"] = "F", ["RUNES_QLT_2"] = "E", ["RUNES_QLT_3"] = "D", @@ -620,6 +620,20 @@ local localization_global = ["RUNES_QLT_6"] = "A", ["RUNES_QLT_7"] = "S", ["RUNES_QLT_8"] = "SS", + ["ACT_TOURN_WAVE_TITLE"] = "การแข่งขันด่าน", + ["ACT_TOURN_WAVE_DESC_1"] = "สะสมจำนวนจำนวนรอบของการผ่านด่านเพื่อได้รับรางวัลป้ายรบ!", + ["ACT_TOURN_WAVE_DESC_2"] = "แบ่งทีมอีกครั้งในอีก:", + ["ACT_TOURN_WAVE_DESC_3"] = "คำนวณในอีก:", + ["ACT_TOURN_WAVE_HELP_1"] = "ในช่วงกิจกรรม ผ่านด่านจำนวนรอบต่อไปนี้จะได้รับรางวัลป้ายรบ: \n1. บทสายหลัก\n2. ท้าทายสายหลัก\n3. หอคอยเทพตะเกียง\n4. รอยแยกกาลอวกาศ", + ["ACT_TOURN_WAVE_HELP_2"] = "ชาร์ตอันดับแต้ม:\nในระหว่างกิจกรรม หลังจากผ่านด่านสายหลัก ท้าทายรายวัน หอคอยเทพตะเกียง และรอยแยกกาลอวกาศแล้ว ชาร์ตอันดับจะจัดอันดับตามจำนวนรอบที่ผ่านได้\nหมายเหตุ: ในวันสุดท้ายของกิจกรรม จำนวนรอบที่ผ่านจะไม่ถูกนับในแต้มอีกต่อไป จะแสดงเฉพาะอันดับเท่านั้น\n\nกติกาแบ่งทีมของชาร์ตอันดับ:\nหลังจากกิจกรรมเริ่มต้นขึ้น จะมีการแบ่งกลุ่มทุกๆ 2 วัน ผู้เล่นจะได้รับอันดับตามแต้มของพวกเขาใน 2 วัน นักผจญภัยสามารถรับรางวัลใน [ชาร์ตอันดับรอบสุดท้าย] ได้ในวันที่ 3", + ["ACT_TOURN_WAVE_BTN_1"] = "ชาร์ตอันดับปัจจุบัน", + ["ACT_TOURN_WAVE_BTN_2"] = "ชาร์ตอันดับรอบสุดท้าย", + ["ACT_TOURN_WAVE_BTN_3"] = "รางวัลชาร์ตอันดับ", + ["ACT_TOURN_ARENEA_TITLE"] = "การแข่งขันอารีน่า", + ["ACT_TOURN_ARENEA_DESC_1"] = "เข้าร่วมอารีน่าจะได้รับรางวัลป้ายรบ", + ["ACT_TOURN_ARENEA_HELP"] = "แต้มชาร์ตอันดับ:\nในระหว่างกิจกรรม การเข้าร่วมในอารีน่าจะทำให้คุณได้รับแต้มจำนวนหนึ่งตามอันดับและผลการต่อสู้ของคุณ ชาร์ตอันดับจะจัดอันดับตามคะแนนของคุณ\n\nทองแดง 2: ชนะได้ {0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\nทองแดง 1: ชนะได้ {0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\nเงิน 4: ชนะได้รับ{0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\nเงิน 3: ชนะได้รับ {0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\n เงิน 2: ชนะได้รับ {0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\nเงิน 1: ชนะได้รับ {0} พ่ายแพ้ได้รับ {1} แต้ม\nทอง 5: ชนะได้รับ {0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\nทอง 4: ชนะได้รับ {0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\nทอง 3: ชนะได้รับ {0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\nทอง 2: ชนะได้รับ {0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\nทอง 1: ชนะได้รับ {0} แต้ม พ่ายแพ้ได้รับ {1} แต้ม\n\nหมายเหตุ: ในวันสุดท้ายของกิจกรรม การเข้าร่วมในอารีน่าจะไม่นับรวมในแต้มอีกต่อไป และจะแสดงอันดับเท่านั้น\n\nกติกาแบ่งทีมของชาร์ตอันดับ:\nหลังจากกิจกรรมเริ่มต้นขึ้น จะมีการแบ่งกลุ่มทุกๆ 2 วัน ผู้เล่นจะได้รับอันดับตามแต้มของพวกเขาใน 2 วัน นักผจญภัยสามารถรับรางวัลใน \"ชาร์ตอันดับรอบสุดท้าย\" ได้ในวันที่ 3", + ["ACT_TOURN_WAVE_DESC_4"] = "แพ็คของขวัญ", + ["EVENT_COUNTDOWN"] = "นับถอยหลังเหตุการณ์:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index 687ff7fe..18c45076 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -217,12 +217,20 @@ local item = { }, [56]={ ["name"]="พระจันทร์เต็มดวง", - ["desc"]="พระจันทร์น้อยในงานเฉลิมฉลองพระจันทร์เต็มดวง" + ["desc"]="พระจันทร์ดวงน้อยของงานฉลองพระจันทร์เต็มดวง" }, [57]={ ["name"]="กรอบรูปงานฉลองพระจันทร์เต็มดวง", ["desc"]="กรอบรูปงานฉลองพระจันทร์เต็มดวง" }, + [58]={ + ["name"]="กรอบรูปเงินซีซั่น S4", + ["desc"]="กรอบรูปเงินของอารีน่า S4 พิสูจน์ของพลังงาน" + }, + [59]={ + ["name"]="กรอบรูปทองซีซั่น S4", + ["desc"]="กรอบรูปทองของอารีน่า S4 ความรุ่งโรจน์ของฮีโร่" + }, [1001]={ ["name"]="อุกกาบาตทื่อ", ["desc"]="อุกกาบาตสลัวๆ ที่มีพลังงานลึกลับ" @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skin.lua b/lua/app/config/strings/th/skin.lua index 6902e09c..82c9941c 100644 --- a/lua/app/config/strings/th/skin.lua +++ b/lua/app/config/strings/th/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="เริ่มต้น" }, + [2400101]={ + ["value"]="ราชาแห่งดาบยักษ์" + }, [24002]={ ["value"]="เริ่มต้น" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/avatar_frame.lua b/lua/app/config/strings/vi/avatar_frame.lua index c0773e6c..bd66eadf 100644 --- a/lua/app/config/strings/vi/avatar_frame.lua +++ b/lua/app/config/strings/vi/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="Khung Avatar Tiệc Trăng Tròn" + }, + [30]={ + ["desc"]="Khung Avatar Bạc Đấu Trường S4, biểu tượng sức mạnh." + }, + [31]={ + ["desc"]="Khung Avatar Vàng Đấu Trường S4, anh hùng tỏa sáng." } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/global.lua b/lua/app/config/strings/vi/global.lua index 10773fae..3b6edb41 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -552,8 +552,8 @@ local localization_global = ["RUNES_DESC_25"] = "Tôi Luyện Phù Văn ít nhất phải giữ lại 1 Phù Văn chưa khóa", ["RUNES_DESC_26"] = "Lv{0}", ["RUNES_DESC_27"] = "Đài Đúc Phù Văn Lv{0} mở khóa", - ["RUNES_DESC_28"] = "Bạn có các thuộc tính trên cấp {0} không bị khóa, bạn có muốn tiếp tục làm nguội không?", - ["RUNES_DESC_29"] = "Dừng lại", + ["RUNES_DESC_28"] = "Bạn có thuộc tính cấp S trở lên chưa mở, tiếp tục Tôi Luyện chứ?", + ["RUNES_DESC_29"] = "Dừng", ["RUNES_DESC_30"] = "Tôi Luyện...", ["DUNGEON_RUNE_DESC_1"] = "Mục tiêu", ["DUNGEON_RUNE_DESC_2"] = "Khiêu chiến lại", @@ -570,16 +570,16 @@ local localization_global = ["ACTIVITY_MOON_DESC_2"] = "Quà Chọn", ["ACTIVITY_MOON_DESC_3"] = "Anh Hùng mới", ["ACTIVITY_MOON_DESC_4"] = "Quà Chọn Anh Hùng!", - ["ACTIVITY_MOON_DESC_5"] = "Anh Hùng mới - Valkyrie", - ["ACTIVITY_MOON_DESC_6"] = "Hãy mua Quà trước đó trước", + ["ACTIVITY_MOON_DESC_5"] = "Anh Hùng Mới-Valkyrie", + ["ACTIVITY_MOON_DESC_6"] = "Hãy mua quà phía trước đã", ["ACTIVITY_MOON_DESC_7"] = "Tùy Chọn Anh Hùng", ["ACTIVITY_MOON_DESC_8"] = "Có thể chọn Anh Hùng đã kích hoạt", ["ACTIVITY_MOON_DESC_9"] = "Skin Tiệc Trăng Tròn, ra mắt hạn giờ!", - ["ACTIVITY_MOON_DESC_10"] = "{0} Quà Skin", + ["ACTIVITY_MOON_DESC_10"] = "Quà Skin {0}", ["ACTIVITY_MOON_DESC_11"] = "Mọi nhiệm vụ đã hoàn thành!", ["ACTIVITY_MOON_DESC_12"] = "Vui lòng chọn", ["SEIZED_DESC_4"] = "Chúng tôi phát hiện bạn đang sử dụng client không hợp lệ, không thể vào game được, hãy đến Cửa Hàng ứng dụng chính thống tải về", - ["ACT_PVP_DESC_1"] = "Có nên dùng {0} viên kim cương để vào quán rượu không?", + ["ACT_PVP_DESC_1"] = "Có tiêu hao {0} Kim Cương vào Quán Rượu?", ["ACT_PVP_DESC_2"] = "Vào", ["ACT_PVP_DESC_3"] = "Thắng: {0}/{1} Thua: {2}/{3}", ["ACT_PVP_DESC_4"] = "Quỹ Quán Rượu", @@ -587,11 +587,11 @@ local localization_global = ["ACT_PVP_DESC_6"] = "Quán Rượu Incubus", ["ACT_PVP_DESC_7"] = "{0} thắng", ["ACT_PVP_DESC_8"] = "Hãy chọn Anh Hùng {0}", - ["ACT_PVP_DESC_9"] = "Nhấp vào Hero để xem chi tiết", + ["ACT_PVP_DESC_9"] = "Ấn vào Anh Hùng có thể xem chi tiết", ["ACT_PVP_DESC_10"] = "Làm mới miễn phí", ["ACT_PVP_DESC_11"] = "Anh Hùng đợi chọn ở vòng sau", ["ACT_PVP_DESC_12"] = "Chọn", - ["ACT_PVP_DESC_13"] = "Có nên sử dụng {0} Diamond Refresh không?", + ["ACT_PVP_DESC_13"] = "Có tiêu hao {0} Kim Cương để làm mới?", ["ACT_PVP_DESC_14"] = "Trận thắng tích lũy", ["ACT_PVP_DESC_15"] = "Điểm Quán Rượu", ["ACT_PVP_DESC_16"] = "Chào mừng tham gia Quỹ Quán Rượu, thách đấu đối thủ trong Quán Rượu, tích lũy điểm và nhận hoa hồng nhé!", @@ -611,7 +611,7 @@ local localization_global = ["ACT_PVP_TALK_DESC_7"] = "Incubus ta hôm nay xem như gặp được người lợi hại rồi, vị đại nhân thắng 10 ván liên tiếp, hoan nghênh lần sau quay lại nhé!", ["ACT_PVP_TALK_DESC_8"] = "Bị hạ gục rồi? Đừng nản, thử thêm lần nữa!", ["ACT_PVP_TALK_DESC_9"] = "Thua rồi không sao cả, lần sau dùng Incubus ta ra trận chắc chắn sẽ thắng.", - ["ACT_PVP_DESC_24"] = "Đang đóng cửa", + ["ACT_PVP_DESC_24"] = "Đã đóng", ["RUNES_QLT_1"] = "F", ["RUNES_QLT_2"] = "E", ["RUNES_QLT_3"] = "D", @@ -620,6 +620,20 @@ local localization_global = ["RUNES_QLT_6"] = "A", ["RUNES_QLT_7"] = "S", ["RUNES_QLT_8"] = "SS", + ["ACT_TOURN_WAVE_TITLE"] = "Giải Đấu Vượt Ải", + ["ACT_TOURN_WAVE_DESC_1"] = "Tích lũy đợt vượt ải, được nhận thưởng Chiến Lệnh!", + ["ACT_TOURN_WAVE_DESC_2"] = "Chia nhóm lần sau:", + ["ACT_TOURN_WAVE_DESC_3"] = "Tổng kết sau:", + ["ACT_TOURN_WAVE_HELP_1"] = "Trong sự kiện, vượt ải các đợt phụ bản dưới đây, có thể nhận thưởng Chiến Lệnh: \n1. Chương Tuyến Chính \n2. Khiêu Chiến Ngày \n3. Tháp Thần Đèn \n4. Khe Nứt Không Gian", + ["ACT_TOURN_WAVE_HELP_2"] = "Điểm Bảng Xếp Hạng:\nTrong sự kiện, vượt ải Chính Tuyến, Khiêu Chiến Ngày, Tháp Thần Đèn, Khe Nứt Không Gian, tiến hành xếp hạng dự theo đợt vượt ải.\nChú ý: 1 ngày cuối cùng của sự kiện, đợt vượt ải sẽ không tính điểm, chỉ hiển thị xếp hạng.\n\n Quy tắc chia nhóm BXH:\nSau khi mở sự kiện, cứ 2 ngày chia nhóm 1 lần, xếp hạng dựa theo số điểm trong 2 ngày này của người chơi, các nhà thám hiểm có thể nhận thưởng xếp hạng trong [BXH Vòng Trước] ở ngày thứ 3.", + ["ACT_TOURN_WAVE_BTN_1"] = "BXH Hiện Tại", + ["ACT_TOURN_WAVE_BTN_2"] = "BXH Vòng Trước", + ["ACT_TOURN_WAVE_BTN_3"] = "Thưởng BXH", + ["ACT_TOURN_ARENEA_TITLE"] = "Giải Đấu Trường", + ["ACT_TOURN_ARENEA_DESC_1"] = "Tham gia Đấu Trường, được nhận thưởng Chiến Lệnh!", + ["ACT_TOURN_ARENEA_HELP"] = "Điểm Bảng Xếp Hạng:\nTrong sự kiện, tham gia Đấu Trường, được nhận một số Điểm dựa theo cấp bậc và kết quả chiến đấu, rồi tiến hành xếp hạng dựa theo Điểm.\n\n Đồng 2: Thắng {0} điểm, thua {1} điểm;\n Đồng 1: Thắng {0} điểm, thua {1} điểm;\n Bạc 4: Thắng {0} điểm, thua {1} điểm;\n Bạc 3: Thắng {0} điểm, thua {1} điểm;\n Bạc 2: Thắng {0} điểm, thua {1} điểm;\n Bạc 1: Thắng {0} điểm, thua {1} điểm;\n Vàng 5: Thắng {0} điểm, thua {1} điểm;\n Vàng 4: Thắng {0} điểm, thua {1} điểm;\n Vàng 3: Thắng {0} điểm, thua {1} điểm;\n Vàng 2: Thắng {0} điểm, thua {1} điểm;\n Vàng 1: Thắng {0} điểm, thua {1} điểm;\n\nChú ý: 1 ngày cuối cùng của sự kiện, tham gia Đấu Trường sẽ không tính điểm, chỉ hiển thị xếp hạng.\n\n Quy tắc chia nhóm BXH:\nSau khi mở sự kiện, cứ 2 ngày chia nhóm 1 lần, xếp hạng dựa theo số điểm trong 2 ngày này của người chơi, các nhà thám hiểm có thể nhận thưởng xếp hạng trong \"BXH Vòng Trước\" ở ngày thứ 3.", + ["ACT_TOURN_WAVE_DESC_4"] = "Quà Tặng", + ["EVENT_COUNTDOWN"] = "Sự kiện đếm ngược:", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index d624a364..67db32b3 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -216,13 +216,21 @@ local item = { ["desc"]="Tinh Túy Phù Văn, dùng tôi luyện Phù Văn." }, [56]={ - ["name"]="Trăng tròn", - ["desc"]="Mặt trăng nhỏ trong Tiệc Trăng Tròn" + ["name"]="Trăng Tròn", + ["desc"]="Ánh trăng Tiệc Trăng Tròn." }, [57]={ ["name"]="Khung Avatar Tiệc Trăng Tròn", ["desc"]="Khung Avatar Tiệc Trăng Tròn" }, + [58]={ + ["name"]="Khung Avatar Bạc S4", + ["desc"]="Khung Avatar Bạc Đấu Trường S4, biểu tượng sức mạnh." + }, + [59]={ + ["name"]="Khung Avatar Vàng S4", + ["desc"]="Khung Avatar Vàng Đấu Trường S4, anh hùng tỏa sáng." + }, [1001]={ ["name"]="Thiên Thạch Ảm Đạm", ["desc"]="Một thiên thạch ảm đảm, chứa năng lượng thần bí." @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skin.lua b/lua/app/config/strings/vi/skin.lua index e662bc54..3b85073b 100644 --- a/lua/app/config/strings/vi/skin.lua +++ b/lua/app/config/strings/vi/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="Ban Đầu" }, + [2400101]={ + ["value"]="Đại Kiếm Quỷ Vương" + }, [24002]={ ["value"]="Ban Đầu" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/avatar_frame.lua b/lua/app/config/strings/zh/avatar_frame.lua index c0609fef..74d5441a 100644 --- a/lua/app/config/strings/zh/avatar_frame.lua +++ b/lua/app/config/strings/zh/avatar_frame.lua @@ -22,9 +22,15 @@ local avatar_frame = { }, [30]={ ["desc"]="圓月慶典頭像框。" + }, + [30]={ + ["desc"]="S4競技場白銀頭像框，力量的證明。" + }, + [31]={ + ["desc"]="S4競技場黃金頭像框，英雄的光輝。" } } local config = { -data=avatar_frame,count=8 +data=avatar_frame,count=10 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index b2a078d6..afa99b74 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -552,7 +552,7 @@ local localization_global = ["RUNES_DESC_25"] = "符文淬鍊至少保留1個未鎖符文", ["RUNES_DESC_26"] = "LV{0}", ["RUNES_DESC_27"] = "符文鑄台{0}級解鎖", - ["RUNES_DESC_28"] = "您有{0}級以上的内容未鎖定，是否要繼續淬鍊？", + ["RUNES_DESC_28"] = "您有S級以上的屬性未鎖定，是否要繼續淬鍊？", ["RUNES_DESC_29"] = "停止", ["RUNES_DESC_30"] = "淬鍊...", ["DUNGEON_RUNE_DESC_1"] = "目標", @@ -571,7 +571,7 @@ local localization_global = ["ACTIVITY_MOON_DESC_3"] = "新英雄", ["ACTIVITY_MOON_DESC_4"] = "英雄自選禮包！", ["ACTIVITY_MOON_DESC_5"] = "新英雄-女武神", - ["ACTIVITY_MOON_DESC_6"] = "請先購買前面的禮包", + ["ACTIVITY_MOON_DESC_6"] = "請先購買上一禮包", ["ACTIVITY_MOON_DESC_7"] = "英雄自選", ["ACTIVITY_MOON_DESC_8"] = "可選擇已啟用的英雄", ["ACTIVITY_MOON_DESC_9"] = "圓月慶典造型，限時登場！", @@ -579,7 +579,7 @@ local localization_global = ["ACTIVITY_MOON_DESC_11"] = "所有任務均已完成！", ["ACTIVITY_MOON_DESC_12"] = "請選擇", ["SEIZED_DESC_4"] = "我們檢測到您正在使用非法客戶端，您將無法進行遊戲，請前往正規應用商店下載。", - ["ACT_PVP_DESC_1"] = "是否消耗{0}鑽石進入酒館？", + ["ACT_PVP_DESC_1"] = "是否花費{0}鑽石進入酒館？", ["ACT_PVP_DESC_2"] = "進入", ["ACT_PVP_DESC_3"] = "勝：{0}/{1} 敗：{2}/{3}", ["ACT_PVP_DESC_4"] = "酒館基金", @@ -591,7 +591,7 @@ local localization_global = ["ACT_PVP_DESC_10"] = "免費刷新", ["ACT_PVP_DESC_11"] = "下輪待選英雄", ["ACT_PVP_DESC_12"] = "選擇", - ["ACT_PVP_DESC_13"] = "是否消耗{0}鑽石刷新？", + ["ACT_PVP_DESC_13"] = "是否花費{0}鑽石刷新?", ["ACT_PVP_DESC_14"] = "累積勝場", ["ACT_PVP_DESC_15"] = "酒館積分", ["ACT_PVP_DESC_16"] = "歡迎入股酒館基金，在酒館挑戰對手，累積積分可領取獎勵分紅喲~", @@ -599,7 +599,7 @@ local localization_global = ["ACT_PVP_DESC_18"] = "1.活動期間在酒館中的所有勝場都將累積記錄用於排名。 \n2.活動一共七天，第八天時可領取排名獎勵。 \n3.獎勵請及時領取，過期將無法補發。", ["ACT_PVP_DESC_19"] = "勝：{0}", ["ACT_PVP_DESC_20"] = "敗：{0}", - ["ACT_PVP_DESC_21"] = "1.酒館每日有1次免費進入機會，進入後先隨機選取5名英雄組成自己的隊伍。所有英雄由酒館提供，不繼承你的屬性。", + ["ACT_PVP_DESC_21"] = "1.酒館每日有1次免費進入機會，進入後先隨機選取5位英雄建立自己的隊伍。所有英雄均由酒館提供，不繼承你的屬性。", ["ACT_PVP_DESC_22"] = "2.組建好自己的隊伍後，您將匹配跟自己本次勝場數相同的對手，每次勝利後英雄將提高1次等級。所有品質的英雄起始都為6級。", ["ACT_PVP_DESC_23"] = "3.累積勝利10次或失敗2次都將退出酒館，需要重新進入。今日內的勝場累積可領取額外連勝獎勵。", ["ACT_PVP_TALK_DESC_1"] = "嗨~今天想來一局嗎？", @@ -620,6 +620,20 @@ local localization_global = ["RUNES_QLT_6"] = "A", ["RUNES_QLT_7"] = "S", ["RUNES_QLT_8"] = "SS", + ["ACT_TOURN_WAVE_TITLE"] = "關卡錦標賽", + ["ACT_TOURN_WAVE_DESC_1"] = "累積通關波次，可獲得戰令獎勵！", + ["ACT_TOURN_WAVE_DESC_2"] = "距離下次分組：", + ["ACT_TOURN_WAVE_DESC_3"] = "距離結算：", + ["ACT_TOURN_WAVE_HELP_1"] = "活動期間，通關以下副本波次，可獲得戰令獎勵：\n1. 主線章節 \n2. 每日挑戰 \n3. 燈神之塔 \n4. 時空裂縫", + ["ACT_TOURN_WAVE_HELP_2"] = "排行榜積分：\n活動期間，通關主線、每日挑戰、燈神之塔、時空裂縫，排行榜依照通關的波次進行排行。 \n注意：活動最後1天，通關波次不再計入積分，僅顯示排名。 \n\n 排行榜分組規則：\n活動開啟後，每2天進行一次分組，根據玩家在2天內的積分數進行排名，冒險家們可於第3天在[上輪排行榜]中，領取排行獎勵。", + ["ACT_TOURN_WAVE_BTN_1"] = "目前排行榜", + ["ACT_TOURN_WAVE_BTN_2"] = "上輪排行榜", + ["ACT_TOURN_WAVE_BTN_3"] = "排行榜獎勵", + ["ACT_TOURN_ARENEA_TITLE"] = "競技場錦標賽", + ["ACT_TOURN_ARENEA_DESC_1"] = "參與競技場，可獲得戰令獎勵！", + ["ACT_TOURN_ARENEA_HELP"] = "排行榜積分：\n活動期間，參與競技場，依排位及戰鬥結果，可獲得若干積分，排行榜依積分排行。 \n\n 青銅2：勝利{0}分，失敗{1}分；\n 青銅1：勝利{0}分，失敗{1}分；\n 白銀4：勝利{0}分，失敗{1}分；\n 白銀3：勝利{0}分，失敗{1}分；\n 白銀2：勝利{0}分，失敗{1}分；\n 白銀1：勝利{0}分，失敗{1}分；\n 黃金5：勝利{0}分，失敗{1}分；\n 黃金4：勝利{0}分，失敗{1}分；\n 黃金3：勝利{0}分，失敗{1}分；\n 黃金2：勝利{0}分，失敗{1}分；\n 黃金1：勝利{0}分，失敗{1}分；\n\n注意：活動最後1天，參與競技場不再計入積分，僅顯示排名。 \n\n 排行榜分組規則：\n活動開啟後，每2天進行一次分組，根據玩家在2天內的積分數進行排名，冒險家們可於第3天在「上輪排行榜」中，領取排行獎勵。", + ["ACT_TOURN_WAVE_DESC_4"] = "禮包", + ["EVENT_COUNTDOWN"] = "活動倒數：", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 7e53f8e0..490e108d 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -223,6 +223,14 @@ local item = { ["name"]="圓月慶典頭像框。", ["desc"]="圓月慶典頭像框。" }, + [58]={ + ["name"]="S4賽季白銀頭像框", + ["desc"]="S4競技場白銀頭像框，力量的證明。" + }, + [59]={ + ["name"]="S4賽季黃金頭像框", + ["desc"]="S4競技場黃金頭像框，英雄的光輝。" + }, [1001]={ ["name"]="暗淡隕鐵", ["desc"]="一塊暗淡的隕鐵，蘊含著神秘的能量。" @@ -493,6 +501,6 @@ local item = { } } local config = { -data=item,count=123 +data=item,count=125 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skin.lua b/lua/app/config/strings/zh/skin.lua index 55f1c7da..365ac794 100644 --- a/lua/app/config/strings/zh/skin.lua +++ b/lua/app/config/strings/zh/skin.lua @@ -41,6 +41,9 @@ local skin = { [24001]={ ["value"]="初始" }, + [2400101]={ + ["value"]="巨劍鬼王" + }, [24002]={ ["value"]="初始" }, @@ -130,6 +133,6 @@ local skin = { } } local config = { -data=skin,count=43 +data=skin,count=44 } return config \ No newline at end of file diff --git a/lua/app/module/activity/tourn_arena/tourn_arena_const.lua b/lua/app/module/activity/tourn_arena/tourn_arena_const.lua index 7f317d36..e339c7c3 100644 --- a/lua/app/module/activity/tourn_arena/tourn_arena_const.lua +++ b/lua/app/module/activity/tourn_arena/tourn_arena_const.lua @@ -27,4 +27,7 @@ TournArenaConst.GIFT_IDS = { 240802, } +-- 轮次周期 +TournArenaConst.PRESENT_TURN_DAY = 2 + return TournArenaConst \ No newline at end of file diff --git a/lua/app/module/activity/tourn_arena/tourn_arena_manager.lua b/lua/app/module/activity/tourn_arena/tourn_arena_manager.lua index cb7e4532..5e56296c 100644 --- a/lua/app/module/activity/tourn_arena/tourn_arena_manager.lua +++ b/lua/app/module/activity/tourn_arena/tourn_arena_manager.lua @@ -80,7 +80,7 @@ function TournArenaManager:reqBuyBountyLevel() costId = costId, costNum = costNum, okFunc = function() - local id = DataManager.TournArenaData:getBountyCfgByLevel(DataManager.TournArenaData:getBountyLevel() + 1).id + local id = DataManager.TournArenaData:getBountyIdList()[DataManager.TournArenaData:getBountyLevel() + 1] -- Logger.logHighlight("购买战令等级:"..id) self:sendMessage(ProtoMsgType.FromMsgEnum.TournArenaBountyClaimByDiamondReq, {id = id}, {}, self.rspBuyBountyLevel, BIReport.ITEM_GET_TYPE.TOURN_ARENA_BOUNTY_LEVEL) end, diff --git a/lua/app/module/activity/tourn_wave/tourn_wave_const.lua b/lua/app/module/activity/tourn_wave/tourn_wave_const.lua index 662f7694..35fabcbc 100644 --- a/lua/app/module/activity/tourn_wave/tourn_wave_const.lua +++ b/lua/app/module/activity/tourn_wave/tourn_wave_const.lua @@ -27,4 +27,7 @@ TournWaveConst.GIFT_IDS = { 230802, } +-- 轮次周期 +TournWaveConst.PRESENT_TURN_DAY = 2 + return TournWaveConst \ No newline at end of file diff --git a/lua/app/module/activity/tourn_wave/tourn_wave_manager.lua b/lua/app/module/activity/tourn_wave/tourn_wave_manager.lua index 77d4e7b8..4a5e5677 100644 --- a/lua/app/module/activity/tourn_wave/tourn_wave_manager.lua +++ b/lua/app/module/activity/tourn_wave/tourn_wave_manager.lua @@ -74,7 +74,7 @@ function TournWaveManager:reqBuyBountyLevel() costId = costId, costNum = costNum, okFunc = function() - local id = DataManager.TournWaveData:getBountyCfgByLevel(DataManager.TournWaveData:getBountyLevel() + 1).id + local id = DataManager.TournWaveData:getBountyIdList()[DataManager.TournWaveData:getBountyLevel() + 1] -- Logger.logHighlight("购买战令等级:"..id) self:sendMessage(ProtoMsgType.FromMsgEnum.TournWaveBountyClaimByDiamondReq, {id = id}, {}, self.rspBuyBountyLevel, BIReport.ITEM_GET_TYPE.TOURN_WAVE_BOUNTY_LEVEL) end, diff --git a/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua b/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua index 595ab855..6bc51719 100644 --- a/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua +++ b/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua @@ -73,7 +73,8 @@ function TournArenaRankComp:init() self:refresh(SHOW_TYPE.CUR_RANK) end) self.btnLast:addClickListener(function() - ModuleManager.TournArenaManager:reqRankList(DataManager.TournArenaData:getCurRankStep() - 1) + local curStep = DataManager.TournArenaData:getCurRankStep() + ModuleManager.TournArenaManager:reqRankList(curStep > 0 and curStep - 1 or DataManager.TournArenaData:getTotalTurnCount()) self:refresh(SHOW_TYPE.LAST_RANK) end) self.btnReward:addClickListener(function() @@ -85,22 +86,22 @@ function TournArenaRankComp:init() end function TournArenaRankComp:refresh(showType) - self.showType = showType or self.showType or SHOW_TYPE.CUR_RANK + self.showType = showType or self.showType or (DataManager.TournArenaData:isFinalDay() and SHOW_TYPE.LAST_RANK or SHOW_TYPE.CUR_RANK) self.btnCur:setSprite(GConst.ATLAS_PATH.COMMON, self.showType == SHOW_TYPE.CUR_RANK and "common_board_130" or "common_board_134") self.btnLast:setSprite(GConst.ATLAS_PATH.COMMON, self.showType == SHOW_TYPE.LAST_RANK and "common_board_130" or "common_board_134") self.btnReward:setSprite(GConst.ATLAS_PATH.COMMON, self.showType == SHOW_TYPE.REWARD and "common_board_130" or "common_board_134") local curStep = DataManager.TournArenaData:getCurRankStep() - - self.btnLast:setActive(curStep > 1) + self.btnCur:setActive(DataManager.TournArenaData:isFinalDay() == false) + self.btnLast:setActive(curStep > 1 or curStep == 0) self.btns:RefreshLayout() if self.showType == SHOW_TYPE.CUR_RANK then self:showRankList(curStep) self:showSelfRank(curStep) elseif self.showType == SHOW_TYPE.LAST_RANK then - local lastStep = curStep - 1 + local lastStep = curStep > 0 and curStep - 1 or DataManager.TournArenaData:getTotalTurnCount() self:showRankList(lastStep) self:showSelfRank(lastStep) elseif self.showType == SHOW_TYPE.REWARD then @@ -185,23 +186,33 @@ function TournArenaRankComp:refreshCountdown() if self.countdownSid then self.baseObject:unscheduleGlobal(self.countdownSid) end - - local str = DataManager.TournArenaData:isFinalDay() and I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_DESC_3) or I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_DESC_2) - - self.txCountdown:setText(str .. Time:formatNumTimeStr(DataManager.TournArenaData:getCurRankStepRemainTime())) - self.countdownSid = self.baseObject:scheduleGlobal(function() + if DataManager.TournArenaData:isFinalDay() then + -- 活动最后一天 + self.txCountdown:setText(Time:formatNumTimeStr(DataManager.TournArenaData:getEndRemainTime())) + else + -- 分组中 local time = DataManager.TournArenaData:getCurRankStepRemainTime() - if time >= 0 then - self.txCountdown:setText(str .. Time:formatNumTimeStr(time)) - else - self.baseObject:unscheduleGlobal(self.countdownSid) - if self.showType == SHOW_TYPE.CUR_RANK then - ModuleManager.TournArenaManager:reqRankList(DataManager.TournArenaData:getCurRankStep()) - elseif self.showType == SHOW_TYPE.LAST_RANK then - ModuleManager.TournArenaManager:reqRankList(DataManager.TournArenaData:getCurRankStep() - 1) - end + if time < 0 then + return end - end, 1) + + local str = DataManager.TournArenaData:getCurRankStep() >= DataManager.TournArenaData:getTotalTurnCount() and I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_DESC_3) or I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_DESC_2) + + self.txCountdown:setText(str .. Time:formatNumTimeStr(time)) + self.countdownSid = self.baseObject:scheduleGlobal(function() + local time = DataManager.TournArenaData:getCurRankStepRemainTime() + if time >= 0 then + self.txCountdown:setText(str .. Time:formatNumTimeStr(time)) + else + self.baseObject:unscheduleGlobal(self.countdownSid) + if self.showType == SHOW_TYPE.CUR_RANK then + ModuleManager.TournArenaManager:reqRankList(DataManager.TournArenaData:getCurRankStep()) + elseif self.showType == SHOW_TYPE.LAST_RANK then + ModuleManager.TournArenaManager:reqRankList(DataManager.TournArenaData:getCurRankStep() - 1) + end + end + end, 1) + end end return TournArenaRankComp \ No newline at end of file diff --git a/lua/app/ui/activity/tourn_arena/tourn_arena_ui.lua b/lua/app/ui/activity/tourn_arena/tourn_arena_ui.lua index 9e15640f..10b0a6c7 100644 --- a/lua/app/ui/activity/tourn_arena/tourn_arena_ui.lua +++ b/lua/app/ui/activity/tourn_arena/tourn_arena_ui.lua @@ -179,7 +179,8 @@ function TournArenaUI:showRankInfo() self.countdown:setActive(false) self.bg:setActive(false) - ModuleManager.TournArenaManager:reqRankList(DataManager.TournArenaData:getCurRankStep()) + local curStep = DataManager.TournArenaData:getCurRankStep() + ModuleManager.TournArenaManager:reqRankList(curStep > 0 and curStep or DataManager.TournArenaData:getTotalTurnCount()) if not self.compRank then self.rankPanel:initPrefabHelper() self.rankPanel:genAllChildren() diff --git a/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua b/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua index 100dab5b..98d0435b 100644 --- a/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua +++ b/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua @@ -73,7 +73,8 @@ function TournWaveRankComp:init() self:refresh(SHOW_TYPE.CUR_RANK) end) self.btnLast:addClickListener(function() - ModuleManager.TournWaveManager:reqRankList(DataManager.TournWaveData:getCurRankStep() - 1) + local curStep = DataManager.TournWaveData:getCurRankStep() + ModuleManager.TournWaveManager:reqRankList(curStep > 0 and curStep - 1 or DataManager.TournWaveData:getTotalTurnCount()) self:refresh(SHOW_TYPE.LAST_RANK) end) self.btnReward:addClickListener(function() @@ -85,22 +86,22 @@ function TournWaveRankComp:init() end function TournWaveRankComp:refresh(showType) - self.showType = showType or self.showType or SHOW_TYPE.CUR_RANK + self.showType = showType or self.showType or (DataManager.TournWaveData:isFinalDay() and SHOW_TYPE.LAST_RANK or SHOW_TYPE.CUR_RANK) self.btnCur:setSprite(GConst.ATLAS_PATH.COMMON, self.showType == SHOW_TYPE.CUR_RANK and "common_board_130" or "common_board_134") self.btnLast:setSprite(GConst.ATLAS_PATH.COMMON, self.showType == SHOW_TYPE.LAST_RANK and "common_board_130" or "common_board_134") self.btnReward:setSprite(GConst.ATLAS_PATH.COMMON, self.showType == SHOW_TYPE.REWARD and "common_board_130" or "common_board_134") local curStep = DataManager.TournWaveData:getCurRankStep() - - self.btnLast:setActive(curStep > 1) + self.btnCur:setActive(DataManager.TournWaveData:isFinalDay() == false) + self.btnLast:setActive(curStep > 1 or curStep == 0) self.btns:RefreshLayout() if self.showType == SHOW_TYPE.CUR_RANK then self:showRankList(curStep) self:showSelfRank(curStep) elseif self.showType == SHOW_TYPE.LAST_RANK then - local lastStep = curStep - 1 + local lastStep = curStep > 0 and curStep - 1 or DataManager.TournWaveData:getTotalTurnCount() self:showRankList(lastStep) self:showSelfRank(lastStep) elseif self.showType == SHOW_TYPE.REWARD then @@ -185,23 +186,33 @@ function TournWaveRankComp:refreshCountdown() if self.countdownSid then self.baseObject:unscheduleGlobal(self.countdownSid) end - - local str = DataManager.TournWaveData:isFinalDay() and I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_DESC_3) or I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_DESC_2) - - self.txCountdown:setText(str .. Time:formatNumTimeStr(DataManager.TournWaveData:getCurRankStepRemainTime())) - self.countdownSid = self.baseObject:scheduleGlobal(function() + if DataManager.TournWaveData:isFinalDay() then + -- 活动最后一天 + self.txCountdown:setText(I18N:getGlobalText(I18N.GlobalConst.EVENT_COUNTDOWN) .. Time:formatNumTimeStr(DataManager.TournWaveData:getEndRemainTime())) + else + -- 分组中 local time = DataManager.TournWaveData:getCurRankStepRemainTime() - if time >= 0 then - self.txCountdown:setText(str .. Time:formatNumTimeStr(time)) - else - self.baseObject:unscheduleGlobal(self.countdownSid) - if self.showType == SHOW_TYPE.CUR_RANK then - ModuleManager.TournWaveManager:reqRankList(DataManager.TournWaveData:getCurRankStep()) - elseif self.showType == SHOW_TYPE.LAST_RANK then - ModuleManager.TournWaveManager:reqRankList(DataManager.TournWaveData:getCurRankStep() - 1) - end + if time < 0 then + return end - end, 1) + + local str = DataManager.TournWaveData:getCurRankStep() >= DataManager.TournWaveData:getTotalTurnCount() and I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_DESC_3) or I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_DESC_2) + + self.txCountdown:setText(str .. Time:formatNumTimeStr(time)) + self.countdownSid = self.baseObject:scheduleGlobal(function() + local time = DataManager.TournWaveData:getCurRankStepRemainTime() + if time >= 0 then + self.txCountdown:setText(str .. Time:formatNumTimeStr(time)) + else + self.baseObject:unscheduleGlobal(self.countdownSid) + if self.showType == SHOW_TYPE.CUR_RANK then + ModuleManager.TournWaveManager:reqRankList(DataManager.TournWaveData:getCurRankStep()) + elseif self.showType == SHOW_TYPE.LAST_RANK then + ModuleManager.TournWaveManager:reqRankList(DataManager.TournWaveData:getCurRankStep() - 1) + end + end + end, 1) + end end return TournWaveRankComp \ No newline at end of file diff --git a/lua/app/ui/activity/tourn_wave/tourn_wave_ui.lua b/lua/app/ui/activity/tourn_wave/tourn_wave_ui.lua index 90381114..646bceab 100644 --- a/lua/app/ui/activity/tourn_wave/tourn_wave_ui.lua +++ b/lua/app/ui/activity/tourn_wave/tourn_wave_ui.lua @@ -170,7 +170,8 @@ function TournWaveUI:showRankInfo() self.countdown:setActive(false) self.bg:setActive(false) - ModuleManager.TournWaveManager:reqRankList(DataManager.TournWaveData:getCurRankStep()) + local curStep = DataManager.TournWaveData:getCurRankStep() + ModuleManager.TournWaveManager:reqRankList(curStep > 0 and curStep or DataManager.TournWaveData:getTotalTurnCount()) if not self.compRank then self.rankPanel:initPrefabHelper() self.rankPanel:genAllChildren() diff --git a/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua b/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua index 944cbf67..4a5e3c7a 100644 --- a/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua +++ b/lua/app/userdata/activity/tourn_arena/tourn_arena_data.lua @@ -385,6 +385,14 @@ function TournArenaData:isFinalDay() return self:getEndRemainTime() <= 86400 end +-- 活动总轮次数 +function TournArenaData:getTotalTurnCount() + local totalTime = self.endTime - self.startTime + local day = totalTime / 86400 + + return math.floor(day / GConst.TournWaveConst.PRESENT_TURN_DAY) +end + -- 获取当前排行榜阶段 function TournArenaData:getCurRankStep() return self.rankStep @@ -439,7 +447,13 @@ function TournArenaData:isReachRankReward() return false end - local lastRank = self:getSelfRank(self:getCurRankStep() - 1) + local lastRank + if self:isFinalDay() then + lastRank = self:getSelfRank(self:getTotalTurnCount()) + else + lastRank = self:getSelfRank(self:getCurRankStep() - 1) + end + if lastRank and lastRank <= 0 then return false end @@ -452,8 +466,14 @@ function TournArenaData:isReceivedRankReward() return false end - local received = self.rankCollected[self:getCurRankStep() - 1] - return received ~= nil and received or false + local lastStep + if self:isFinalDay() then + lastStep = self:getTotalTurnCount() + else + lastStep = self:getCurRankStep() - 1 + end + + return self.rankCollected[lastStep] or false end -- 获取排行榜数据成功 @@ -468,7 +488,14 @@ end -- 领取排名奖励成功 function TournArenaData:onReceivedRankReward() - self.rankCollected[self:getCurRankStep() - 1] = true + local lastStep + if self:isFinalDay() then + lastStep = self:getTotalTurnCount() + else + lastStep = self:getCurRankStep() - 1 + end + + self.rankCollected[lastStep] = true self:setDirty() end diff --git a/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua b/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua index 9bb35465..7f9ae319 100644 --- a/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua +++ b/lua/app/userdata/activity/tourn_wave/tourn_wave_data.lua @@ -416,6 +416,14 @@ function TournWaveData:isFinalDay() return self:getEndRemainTime() <= 86400 end +-- 活动总轮次数 +function TournWaveData:getTotalTurnCount() + local totalTime = self.endTime - self.startTime + local day = totalTime / 86400 + + return math.floor(day / GConst.TournWaveConst.PRESENT_TURN_DAY) +end + -- 获取当前排行榜阶段 function TournWaveData:getCurRankStep() return self.rankStep @@ -470,7 +478,13 @@ function TournWaveData:isReachRankReward() return false end - local lastRank = self:getSelfRank(self:getCurRankStep() - 1) + local lastRank + if self:isFinalDay() then + lastRank = self:getSelfRank(self:getTotalTurnCount()) + else + lastRank = self:getSelfRank(self:getCurRankStep() - 1) + end + if lastRank and lastRank <= 0 then return false end @@ -483,8 +497,14 @@ function TournWaveData:isReceivedRankReward() return false end - local received = self.rankCollected[self:getCurRankStep() - 1] - return received ~= nil and received or false + local lastStep + if self:isFinalDay() then + lastStep = self:getTotalTurnCount() + else + lastStep = self:getCurRankStep() - 1 + end + + return self.rankCollected[lastStep] or false end -- 获取排行榜数据成功 @@ -499,7 +519,14 @@ end -- 领取排名奖励成功 function TournWaveData:onReceivedRankReward() - self.rankCollected[self:getCurRankStep() - 1] = true + local lastStep + if self:isFinalDay() then + lastStep = self:getTotalTurnCount() + else + lastStep = self:getCurRankStep() - 1 + end + + self.rankCollected[lastStep] = true self:setDirty() end