diff --git a/lua/app/config/arena_bounty_level.lua b/lua/app/config/arena_bounty_level.lua index d25c2d9b..b96e1fee 100644 --- a/lua/app/config/arena_bounty_level.lua +++ b/lua/app/config/arena_bounty_level.lua @@ -113,8 +113,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -294,8 +294,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -394,8 +394,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -595,8 +595,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -696,8 +696,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -897,8 +897,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1098,8 +1098,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1299,8 +1299,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1500,8 +1500,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1733,8 +1733,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1914,8 +1914,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2014,8 +2014,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2215,8 +2215,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2316,8 +2316,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2517,8 +2517,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2718,8 +2718,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2919,8 +2919,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3120,8 +3120,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3253,8 +3253,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=23, + ["id_for_nothing"]="VAs=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3353,8 +3353,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3506,18 +3506,18 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=13, + ["id_for_nothing"]="Vws=", ["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==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" } }, [315]={ @@ -3526,8 +3526,8 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=13, - ["id_for_nothing"]="Vws=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3606,18 +3606,18 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, [320]={ @@ -3634,8 +3634,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3707,18 +3707,18 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=13, + ["id_for_nothing"]="Vws=", ["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==" + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=2, + ["num_for_nothing"]="VA==" } }, [325]={ @@ -3727,8 +3727,8 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=13, - ["id_for_nothing"]="Vws=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3807,18 +3807,18 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=200, - ["num_for_nothing"]="VAhc" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, [330]={ @@ -3827,16 +3827,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -3916,8 +3916,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3936,8 +3936,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4109,16 +4109,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4137,8 +4137,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4310,16 +4310,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4338,8 +4338,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4511,16 +4511,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4539,8 +4539,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4712,16 +4712,16 @@ local arena_bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=8, + ["id_for_nothing"]="Xg==", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=9, + ["id_for_nothing"]="Xw==", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -4740,8 +4740,8 @@ local arena_bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=10, - ["id_for_nothing"]="Vwg=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/bounty_level.lua b/lua/app/config/bounty_level.lua index 7c599151..a600c933 100644 --- a/lua/app/config/bounty_level.lua +++ b/lua/app/config/bounty_level.lua @@ -274,8 +274,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -394,8 +394,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -475,8 +475,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -676,8 +676,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -869,16 +869,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1070,16 +1070,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1271,16 +1271,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1480,8 +1480,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -1894,8 +1894,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2014,8 +2014,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -2095,8 +2095,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2296,8 +2296,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2489,16 +2489,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2690,16 +2690,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -2891,16 +2891,16 @@ local bounty_level = { ["reward"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=11, - ["id_for_nothing"]="Vwk=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" }, ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=10, + ["id_for_nothing"]="Vwg=", ["num"]=1, ["num_for_nothing"]="Vw==" } @@ -3100,8 +3100,8 @@ local bounty_level = { ["reward_pro"]={ ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=18, - ["id_for_nothing"]="VwA=", + ["id"]=11, + ["id_for_nothing"]="Vwk=", ["num"]=1, ["num_for_nothing"]="Vw==" } diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index 2e09b5d0..2ffc0ae1 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -172,7 +172,7 @@ local hero = { ["model_id"]="p0009", ["icon"]="11", ["item_id"]=13002, - ["unlock_chapter"]=15, + ["unlock_chapter"]=9, ["is_show"]=1 }, [14001]={ @@ -195,43 +195,43 @@ local hero = { ["rouge_skill_7"]=1400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0011", ["icon"]="16", ["item_id"]=14001, - ["unlock_chapter"]=10, + ["unlock_chapter"]=14, ["is_show"]=1 }, [14002]={ @@ -254,38 +254,38 @@ local hero = { ["rouge_skill_7"]=1400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0018", ["icon"]="23", @@ -405,7 +405,7 @@ local hero = { ["model_id"]="p0010", ["icon"]="12", ["item_id"]=23001, - ["unlock_chapter"]=11, + ["unlock_chapter"]=8, ["is_show"]=1 }, [23002]={ @@ -464,7 +464,7 @@ local hero = { ["model_id"]="p0012", ["icon"]="7", ["item_id"]=23002, - ["unlock_chapter"]=7, + ["unlock_chapter"]=5, ["is_show"]=1 }, [24001]={ @@ -487,43 +487,43 @@ local hero = { ["rouge_skill_7"]=2400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0007", ["icon"]="17", ["item_id"]=24001, - ["unlock_chapter"]=4, + ["unlock_chapter"]=6, ["is_show"]=1 }, [24002]={ @@ -546,38 +546,38 @@ local hero = { ["rouge_skill_7"]=2400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0017", ["icon"]="22", @@ -756,7 +756,7 @@ local hero = { ["model_id"]="p0020", ["icon"]="13", ["item_id"]=33002, - ["unlock_chapter"]=13, + ["unlock_chapter"]=7, ["is_show"]=1 }, [34001]={ @@ -779,38 +779,38 @@ local hero = { ["rouge_skill_7"]=3400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0016", ["icon"]="18", @@ -838,38 +838,38 @@ local hero = { ["rouge_skill_7"]=3400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0024", ["icon"]="24", @@ -1048,7 +1048,7 @@ local hero = { ["model_id"]="p0021", ["icon"]="14", ["item_id"]=43002, - ["unlock_chapter"]=9, + ["unlock_chapter"]=7, ["is_show"]=1 }, [44001]={ @@ -1071,43 +1071,43 @@ local hero = { ["rouge_skill_7"]=4400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0008", ["icon"]="19", ["item_id"]=44001, - ["unlock_chapter"]=6, + ["unlock_chapter"]=10, ["is_show"]=1 }, [44002]={ @@ -1130,43 +1130,43 @@ local hero = { ["rouge_skill_7"]=4400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0025", ["icon"]="25", ["item_id"]=44002, - ["unlock_chapter"]=15, + ["unlock_chapter"]=18, ["is_show"]=1 }, [52001]={ @@ -1284,7 +1284,7 @@ local hero = { ["model_id"]="p0015", ["icon"]="10", ["item_id"]=53001, - ["unlock_chapter"]=16, + ["unlock_chapter"]=9, ["is_show"]=1 }, [53002]={ @@ -1366,38 +1366,38 @@ local hero = { ["rouge_skill_7"]=5400107, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0023", ["icon"]="20", @@ -1423,43 +1423,43 @@ local hero = { ["rouge_skill_7"]=5400207, ["begin_lv"]=5, ["hp"]={ - 18000000, - 20400000, - 22800000, - 25320000, - 27960000, - 30720000, - 33720000, - 36960000, - 40560000, - 44520000, - 48840000, - 53640000, - 59040000, - 65040000, - 71880000 + 12000000, + 13680000, + 15360000, + 17120000, + 18960000, + 20960000, + 24560000, + 28440000, + 32940000, + 37900000, + 43300000, + 49300000, + 56060000, + 63560000, + 72120000 }, ["atk"]={ - 9000000, - 10200000, - 11400000, - 12660000, - 13980000, - 15360000, - 16860000, - 18480000, - 20280000, - 22260000, - 24420000, - 26820000, - 29520000, - 32520000, - 35940000 + 6000000, + 6840000, + 7680000, + 8560000, + 9480000, + 10480000, + 12280000, + 14220000, + 16470000, + 18950000, + 21650000, + 24650000, + 28030000, + 31780000, + 36060000 }, ["model_id"]="p0026", ["icon"]="26", ["item_id"]=54002, - ["unlock_chapter"]=20, + ["unlock_chapter"]=22, ["is_show"]=1 } } diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index 870b2fc9..58a3c7bf 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -377,9 +377,29 @@ local item = { ["icon"]="19" }, [20]={ - ["type"]=1, + ["type"]=6, ["qlt"]=5, - ["icon"]="20" + ["icon"]="20", + ["box_drop"]={ + { + ["type"]=1, + ["id"]=4, + ["num"]=1, + ["weight"]=50 + }, + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=890 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=60 + } + } }, [21]={ ["type"]=1, diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 33d70eda..2016ea4f 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -1,7 +1,5 @@ local LocalizationGlobalConst = { - ["HERO_TRIAL_DESC_1"] = "HERO_TRIAL_DESC_1", - ["HERO_TRIAL_DESC_2"] = "HERO_TRIAL_DESC_2", MAIN_BTN_1 = "MAIN_BTN_1", QLT_DESC_1 = "QLT_DESC_1", QLT_DESC_2 = "QLT_DESC_2", @@ -332,6 +330,12 @@ local LocalizationGlobalConst = ARENA_BATTLEPASS_5 = "ARENA_BATTLEPASS_5", ARENA_BATTLEPASS_6 = "ARENA_BATTLEPASS_6", ARENA_BATTLEPASS_7 = "ARENA_BATTLEPASS_7", + HERO_TRIAL_DESC_1 = "HERO_TRIAL_DESC_1", + HERO_TRIAL_DESC_2 = "HERO_TRIAL_DESC_2", + HERO_TRIAL_DESC_3 = "HERO_TRIAL_DESC_3", + DISCORD_SETTING_DESC = "DISCORD_SETTING_DESC", + COMMUNITY_DESC = "COMMUNITY_DESC", + TWITTER_DESC = "TWITTER_DESC", } return LocalizationGlobalConst \ 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 2eec539e..eaeaa61b 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -330,8 +330,12 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "解锁高级战令", ["ARENA_BATTLEPASS_6"] = "获得高级战令，+10级，立即获得更多奖励！", ["ARENA_BATTLEPASS_7"] = "当你完成战令的所有内容,每1000个积分可以获取一个奖励宝箱", - ["HERO_TRIAL_DESC_1"] = "请试用S级英雄木兰挑战刚才战败的关卡！", + ["HERO_TRIAL_DESC_1"] = "请试用S级英雄木兰挑战刚才战败的关卡！", ["HERO_TRIAL_DESC_2"] = "试玩", + ["HERO_TRIAL_DESC_3"] = "木兰参战", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/de/global.lua b/lua/app/config/strings/de/global.lua index 37d94ad5..a4633cd1 100644 --- a/lua/app/config/strings/de/global.lua +++ b/lua/app/config/strings/de/global.lua @@ -27,6 +27,9 @@ local localization_global = ["MAINTENANCE_NOTICE_DEFAULT"] = "Serverkommunikation anormal, bitte versuche es später erneut", ["RATE_DESC_1"] = "Wie findest du unser Spiel?", ["RATE_DESC_2"] = "Später", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ 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 3521c11b..0e43bb01 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -330,6 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "Unlock Premium Battle Pass", ["ARENA_BATTLEPASS_6"] = "Obtain Premium Battle Pass for 10 more levels and richer rewards!", ["ARENA_BATTLEPASS_7"] = "Upon completing all content of the Arena Battle Pass, you can receive a reward chest for every 1000 points.", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ 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 bccf7c3c..49ef7b53 100644 --- a/lua/app/config/strings/es/global.lua +++ b/lua/app/config/strings/es/global.lua @@ -330,6 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "Desbloquea Pase de Batalla Premium", ["ARENA_BATTLEPASS_6"] = "¡Obtiene Pase de Batalla Premium, gana +10 niveles, y recibe más recompensas ya!", ["ARENA_BATTLEPASS_7"] = "Al completar todo el contenido del pase, podrás obtener un cofre de recompensa por cada 1000 puntos.", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/fr/global.lua b/lua/app/config/strings/fr/global.lua index 6d1d84b1..67661397 100644 --- a/lua/app/config/strings/fr/global.lua +++ b/lua/app/config/strings/fr/global.lua @@ -28,6 +28,9 @@ local localization_global = ["RATE_DESC_1"] = "Comment aimez-vous notre jeu?", ["RATE_DESC_2"] = "Plus tard", ["BATTLE_DESC_12"] = "Pas de compétence renforcée", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ 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 beb92efb..b44da5bd 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -330,6 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "Buka Pass Premium", ["ARENA_BATTLEPASS_6"] = "Dapat Pass Premium, +10 level dan hadiah lainnya!", ["ARENA_BATTLEPASS_7"] = "Dapat menerima peti hadiah untuk setiap 1.000 poin setelah menyelesaikan semua konten Pass Battle Arena.", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ 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 198c9a83..d21f7e36 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -330,6 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "プレミアム戦令を解放する", ["ARENA_BATTLEPASS_6"] = "プレミアム戦令を購入すると、レベルが+10、即座に報酬を獲得できる！", ["ARENA_BATTLEPASS_7"] = "全ての闘技場戦令ミッションを達成した後、1000ポイントごとに報酬宝箱を1箱獲得できる", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ 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 9aebf258..ecd3309a 100644 --- a/lua/app/config/strings/ko/global.lua +++ b/lua/app/config/strings/ko/global.lua @@ -330,6 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "고급 배틀 패스 잠금 해제", ["ARENA_BATTLEPASS_6"] = "고급 배틀 패스를 획득하고 +10 레벨, 즉시 더 많은 보상을 받으세요!", ["ARENA_BATTLEPASS_7"] = "아레나 배틀 패스의 모든 콘텐츠를 완료하면 1000포인트마다 보물 상자 하나를 받을 수 있습니다.", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ 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 39636e05..572aeaed 100644 --- a/lua/app/config/strings/pt/global.lua +++ b/lua/app/config/strings/pt/global.lua @@ -330,6 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "Desbloquear Ordem Premium", ["ARENA_BATTLEPASS_6"] = "Obtenha a Ordem de Batalha Premium, ganhe +10 níveis e receba mais recompensas de imediato!", ["ARENA_BATTLEPASS_7"] = "Após completar todo o critério do Ordem da Arena, você pode receber um Baú de Recompensas por cada 1000 pontos.", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/ru/global.lua b/lua/app/config/strings/ru/global.lua index b2e17626..edf6bd08 100644 --- a/lua/app/config/strings/ru/global.lua +++ b/lua/app/config/strings/ru/global.lua @@ -1,6 +1,9 @@ local localization_global = { ["COMBO_DESC"] = "Combo", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ 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 bc3bc02b..616f7581 100644 --- a/lua/app/config/strings/th/global.lua +++ b/lua/app/config/strings/th/global.lua @@ -330,6 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "ปลดล็อกป้ายรบขั้นสูง", ["ARENA_BATTLEPASS_6"] = "ได้รับป้ายรบขั้นสูง +10 เลเวล รับรางวัลเพิ่มเติมทันที!", ["ARENA_BATTLEPASS_7"] = "เมื่อคุณบรรลุเนื้อหาทั้งหมดของป้ายรบอารีน่า คุณจะได้รับหีบรางวัล 1 หีบสำหรับทุกๆ 1,000 คะแนน", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ 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 3dfe78fd..c0746576 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -330,6 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "Mở khóa Chiến Lệnh Cao", ["ARENA_BATTLEPASS_6"] = "Nhận được Chiến Lệnh Cao, +10 cấp, nhận ngay thêm phần thưởng!", ["ARENA_BATTLEPASS_7"] = "Khi bạn hoàn thành tất cả nội dung của Chiến Lệnh Đấu Trường, cứ 1000 điểm được nhận 1 Rương Thưởng", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ 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 e655114e..92445e47 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -330,6 +330,9 @@ local localization_global = ["ARENA_BATTLEPASS_5"] = "解鎖高級戰令", ["ARENA_BATTLEPASS_6"] = "獲得高級戰令，+10級，立即獲得更多獎勵！", ["ARENA_BATTLEPASS_7"] = "當你完成戰令的所有內容,之後每1000積分可以獲取一個獎勵寶箱", + ["DISCORD_SETTING_DESC"] = "Discord", + ["COMMUNITY_DESC"] = "Facebook", + ["TWITTER_DESC"] = "Twitter", } return localization_global \ No newline at end of file diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 18815aa5..22744f75 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -15,6 +15,7 @@ local CONST_PATHS = { ShopConst = "app/module/shop/shop_const", SummonConst = "app/module/summon/summon_const", MailConst = "app/module/mail/mail_const", + GameSettingConst = "app/module/game_setting/game_setting_const", } if EDITOR_MODE then diff --git a/lua/app/module/game_setting/game_setting_const.lua b/lua/app/module/game_setting/game_setting_const.lua new file mode 100644 index 00000000..5d0da85c --- /dev/null +++ b/lua/app/module/game_setting/game_setting_const.lua @@ -0,0 +1,41 @@ +local GameSettingConst = {} + +-- 社区链接 discord之类 +GameSettingConst.COMMUNITY_URL = { + [GConst.LANGUAGE.ENGLISH] = "https://discord.gg/7wzzZ3GR5B", + [GConst.LANGUAGE.JAPANESE] = "https://discord.gg/JRPQ8AcRc4", + [GConst.LANGUAGE.CHINESE_TC] = "https://discord.gg/zQaWZJsmRb", +} + +GameSettingConst.COMMUNITY_ICON = { + [GConst.LANGUAGE.ENGLISH] = "setting_discord", + [GConst.LANGUAGE.JAPANESE] = "setting_discord", + [GConst.LANGUAGE.CHINESE_TC] = "setting_discord", +} + +GameSettingConst.COMMUNITY_TXT = { + [GConst.LANGUAGE.ENGLISH] = I18N.GlobalConst.DISCORD_SETTING_DESC, + [GConst.LANGUAGE.JAPANESE] = I18N.GlobalConst.DISCORD_SETTING_DESC, + [GConst.LANGUAGE.CHINESE_TC] = I18N.GlobalConst.DISCORD_SETTING_DESC, +} + +-- 社交链接 fb之类 +GameSettingConst.SOCIAL_URL = { + [GConst.LANGUAGE.ENGLISH] = "https://www.facebook.com/KnightsComboOfficial", + [GConst.LANGUAGE.JAPANESE] = "https://twitter.com/KnightsCombo_jp", + [GConst.LANGUAGE.CHINESE_TC] = "https://www.facebook.com/KnightsComboTWofficial/", +} + +GameSettingConst.SOCIAL_ICON = { + [GConst.LANGUAGE.ENGLISH] = "setting_facebook", + [GConst.LANGUAGE.JAPANESE] = "setting_twitter", + [GConst.LANGUAGE.CHINESE_TC] = "setting_facebook", +} + +GameSettingConst.SOCIAL_DESC = { + [GConst.LANGUAGE.ENGLISH] = I18N.GlobalConst.COMMUNITY_DESC, + [GConst.LANGUAGE.JAPANESE] = I18N.GlobalConst.TWITTER_DESC, + [GConst.LANGUAGE.CHINESE_TC] = I18N.GlobalConst.COMMUNITY_DESC, +} + +return GameSettingConst \ No newline at end of file diff --git a/lua/app/module/game_setting/game_setting_const.lua.meta b/lua/app/module/game_setting/game_setting_const.lua.meta new file mode 100644 index 00000000..15603cad --- /dev/null +++ b/lua/app/module/game_setting/game_setting_const.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3a5c1881fe276c14eb7ab1bf2e4c3748 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/game_setting/game_setting_ui.lua b/lua/app/ui/game_setting/game_setting_ui.lua index 4dcdbc26..c990f0fd 100644 --- a/lua/app/ui/game_setting/game_setting_ui.lua +++ b/lua/app/ui/game_setting/game_setting_ui.lua @@ -1,6 +1,8 @@ local GameSettingUI = class("GameSettingUI", BaseUI) local CHECK_WHITE_LIST_COUNT = 5 +local GameSettingConst = GConst.GameSettingConst +local BG_DEFAULT_H = 881 function GameSettingUI:ctor() self.clickMusicCount = 0 @@ -51,6 +53,7 @@ function GameSettingUI:_display() self:initSupportBtn() self:refreshMusic() self:refreshVoice() + self:refreshLinkBtns() end function GameSettingUI:initLoginBtn() @@ -263,4 +266,52 @@ function GameSettingUI:refreshAccountInfo() end end +function GameSettingUI:refreshLinkBtns() + local uiMap = self.root:genAllChildren() + local bg = uiMap["game_setting_ui.bg"] + local node = uiMap["game_setting_ui.bg.community_node"] + local curLanguage = I18N:getCurLanguage() + local showLinkBtns = false + if GameSettingConst.COMMUNITY_URL[curLanguage] then + showLinkBtns = true + end + if not showLinkBtns then + bg:setSizeDeltaY(BG_DEFAULT_H) + node:setVisible(false) + return + end + bg:setSizeDeltaY(BG_DEFAULT_H + 100) + node:setVisible(true) + local communityDesc = uiMap["game_setting_ui.bg.community_node.discord_desc"] + local communityBtn = uiMap["game_setting_ui.bg.community_node.discord"] + local socialDesc = uiMap["game_setting_ui.bg.community_node.facebook_desc"] + local socialBtn = uiMap["game_setting_ui.bg.community_node.facebook"] + + communityDesc:setText(I18N:getGlobalText(GameSettingConst.COMMUNITY_TXT[curLanguage])) + communityBtn:addClickListener(function() + local url = GameSettingConst.COMMUNITY_URL[I18N:getCurLanguage()] + if not url then + url = GameSettingConst.COMMUNITY_URL[GConst.LANGUAGE.ENGLISH] + end + GFunc.openUrl(url) + end) + communityBtn:setVisible(false) + communityBtn:setSprite(GConst.ATLAS_PATH.UI_SETTING, GameSettingConst.COMMUNITY_ICON[curLanguage], function() + communityBtn:setVisible(true) + end) + + socialDesc:setText(I18N:getGlobalText(GameSettingConst.SOCIAL_DESC[curLanguage])) + socialBtn:addClickListener(function() + local url = GameSettingConst.SOCIAL_URL[I18N:getCurLanguage()] + if not url then + url = GameSettingConst.SOCIAL_URL[GConst.LANGUAGE.ENGLISH] + end + GFunc.openUrl(url) + end) + socialBtn:setVisible(false) + socialBtn:setSprite(GConst.ATLAS_PATH.UI_SETTING, GameSettingConst.SOCIAL_ICON[curLanguage], function() + socialBtn:setVisible(true) + end) +end + return GameSettingUI \ No newline at end of file