diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index 0f0942fb..d8f2ac06 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -6,24 +6,24 @@ local arena_rank = { ["reset_rank"]=201, ["inactive_reset_rank"]=201, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=40, + ["k2"]=350, ["season_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, ["win_reward"]={ @@ -32,16 +32,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["lose_reward"]={ @@ -50,16 +50,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["win_adbox"]={ @@ -148,32 +148,32 @@ local arena_rank = { ["reset_rank"]=201, ["inactive_reset_rank"]=201, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=35, + ["k2"]=290, ["season_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=3500, + ["num_for_nothing"]="VQ1cAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, ["win_reward"]={ @@ -182,16 +182,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["lose_reward"]={ @@ -200,16 +200,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=70, + ["num_for_nothing"]="UQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["win_adbox"]={ @@ -299,31 +299,31 @@ local arena_rank = { ["inactive_reset_rank"]=201, ["min_point"]=4, ["k1"]=30, - ["k2"]=130, + ["k2"]=200, ["season_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, ["win_reward"]={ @@ -332,16 +332,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3000, - ["num_for_nothing"]="VQhcAw==" + ["num"]=140, + ["num_for_nothing"]="Vwxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["lose_reward"]={ @@ -350,16 +350,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=90, + ["num_for_nothing"]="Xwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=25, - ["num_for_nothing"]="VA0=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["win_adbox"]={ @@ -449,39 +449,31 @@ local arena_rank = { ["inactive_reset_rank"]=201, ["min_point"]=4, ["k1"]=30, - ["k2"]=130, + ["k2"]=300, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=7000, + ["num_for_nothing"]="UQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=25, + ["num_for_nothing"]="VA0=" } }, ["win_reward"]={ @@ -490,16 +482,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=160, + ["num_for_nothing"]="Vw5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=64, + ["num_for_nothing"]="UAw=" } }, ["lose_reward"]={ @@ -508,16 +500,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=42, + ["num_for_nothing"]="Ugo=" } }, ["win_adbox"]={ @@ -606,40 +598,32 @@ local arena_rank = { ["reset_rank"]=204, ["inactive_reset_rank"]=201, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=28, + ["k2"]=250, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=40000, - ["num_for_nothing"]="UghcA2U=" + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=6, - ["num_for_nothing"]="UA==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=30, + ["num_for_nothing"]="VQg=" } }, ["win_reward"]={ @@ -648,16 +632,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=64, + ["num_for_nothing"]="UAw=" } }, ["lose_reward"]={ @@ -666,16 +650,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=2500, - ["num_for_nothing"]="VA1cAw==" + ["num"]=110, + ["num_for_nothing"]="Vwlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=35, - ["num_for_nothing"]="VQ0=" + ["num"]=42, + ["num_for_nothing"]="Ugo=" } }, ["win_adbox"]={ @@ -764,40 +748,32 @@ local arena_rank = { ["reset_rank"]=204, ["inactive_reset_rank"]=201, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=25, + ["k2"]=200, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=30, - ["num_for_nothing"]="VQg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=50000, - ["num_for_nothing"]="UwhcA2U=" + ["num"]=15000, + ["num_for_nothing"]="Vw1cA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=7, - ["num_for_nothing"]="UQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=35, + ["num_for_nothing"]="VQ0=" } }, ["win_reward"]={ @@ -806,16 +782,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6000, - ["num_for_nothing"]="UAhcAw==" + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=64, + ["num_for_nothing"]="UAw=" } }, ["lose_reward"]={ @@ -824,16 +800,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3000, - ["num_for_nothing"]="VQhcAw==" + ["num"]=130, + ["num_for_nothing"]="Vwtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=42, + ["num_for_nothing"]="Ugo=" } }, ["win_adbox"]={ @@ -922,40 +898,40 @@ local arena_rank = { ["reset_rank"]=204, ["inactive_reset_rank"]=201, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=23, + ["k2"]=150, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["num"]=18000, + ["num_for_nothing"]="VwBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=8, - ["num_for_nothing"]="Xg==" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=4, - ["num_for_nothing"]="Ug==" + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, ["win_reward"]={ @@ -964,16 +940,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=7000, - ["num_for_nothing"]="UQhcAw==" + ["num"]=220, + ["num_for_nothing"]="VApc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=90, - ["num_for_nothing"]="Xwg=" + ["num"]=64, + ["num_for_nothing"]="UAw=" } }, ["lose_reward"]={ @@ -982,16 +958,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3500, - ["num_for_nothing"]="VQ1cAw==" + ["num"]=140, + ["num_for_nothing"]="Vwxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=45, - ["num_for_nothing"]="Ug0=" + ["num"]=42, + ["num_for_nothing"]="Ugo=" } }, ["win_adbox"]={ @@ -1080,40 +1056,40 @@ local arena_rank = { ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=21, + ["k2"]=250, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=70000, - ["num_for_nothing"]="UQhcA2U=" + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=9, - ["num_for_nothing"]="Xw==" + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, ["win_reward"]={ @@ -1122,16 +1098,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=8000, - ["num_for_nothing"]="XghcAw==" + ["num"]=240, + ["num_for_nothing"]="VAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -1140,16 +1116,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ @@ -1238,40 +1214,40 @@ local arena_rank = { ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=20, + ["k2"]=180, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=60, - ["num_for_nothing"]="UAg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=80000, - ["num_for_nothing"]="XghcA2U=" + ["num"]=25000, + ["num_for_nothing"]="VA1cA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=6, - ["num_for_nothing"]="UA==" + ["num"]=2, + ["num_for_nothing"]="VA==" } }, ["win_reward"]={ @@ -1280,16 +1256,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=9000, - ["num_for_nothing"]="XwhcAw==" + ["num"]=260, + ["num_for_nothing"]="VA5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=110, - ["num_for_nothing"]="Vwlc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -1298,16 +1274,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4500, - ["num_for_nothing"]="Ug1cAw==" + ["num"]=170, + ["num_for_nothing"]="Vw9c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ @@ -1396,40 +1372,40 @@ local arena_rank = { ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=18, + ["k2"]=150, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=70, - ["num_for_nothing"]="UQg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=90000, - ["num_for_nothing"]="XwhcA2U=" + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=11, - ["num_for_nothing"]="Vwk=" + ["num"]=70, + ["num_for_nothing"]="UQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=7, - ["num_for_nothing"]="UQ==" + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, ["win_reward"]={ @@ -1438,16 +1414,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=280, + ["num_for_nothing"]="VABc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=120, - ["num_for_nothing"]="Vwpc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -1456,16 +1432,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ @@ -1554,40 +1530,40 @@ local arena_rank = { ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, - ["k1"]=30, + ["k1"]=16, ["k2"]=130, ["season_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=35000, + ["num_for_nothing"]="VQ1cA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=100000, - ["num_for_nothing"]="VwhcA2VR" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=12, - ["num_for_nothing"]="Vwo=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=8, - ["num_for_nothing"]="Xg==" + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["win_reward"]={ @@ -1596,16 +1572,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=11000, - ["num_for_nothing"]="VwlcA2U=" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -1614,16 +1590,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5500, - ["num_for_nothing"]="Uw1cAw==" + ["num"]=190, + ["num_for_nothing"]="VwFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=65, - ["num_for_nothing"]="UA0=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ @@ -1712,40 +1688,40 @@ local arena_rank = { ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=15, + ["k2"]=120, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=90, - ["num_for_nothing"]="Xwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=110000, - ["num_for_nothing"]="VwlcA2VR" + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=13, - ["num_for_nothing"]="Vws=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=9, - ["num_for_nothing"]="Xw==" + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["win_reward"]={ @@ -1754,16 +1730,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=12000, - ["num_for_nothing"]="VwpcA2U=" + ["num"]=320, + ["num_for_nothing"]="VQpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -1772,16 +1748,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6000, - ["num_for_nothing"]="UAhcAw==" + ["num"]=210, + ["num_for_nothing"]="VAlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ @@ -1868,24 +1844,24 @@ local arena_rank = { ["season"]=2, ["score"]=900, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=40, + ["k2"]=350, ["season_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, ["win_reward"]={ @@ -1894,16 +1870,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["lose_reward"]={ @@ -1912,16 +1888,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=15, - ["num_for_nothing"]="Vw0=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["win_adbox"]={ @@ -2008,32 +1984,32 @@ local arena_rank = { ["season"]=2, ["score"]=1000, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=35, + ["k2"]=290, ["season_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20000, - ["num_for_nothing"]="VAhcA2U=" + ["num"]=3500, + ["num_for_nothing"]="VQ1cAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, ["win_reward"]={ @@ -2042,16 +2018,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=120, + ["num_for_nothing"]="Vwpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["lose_reward"]={ @@ -2060,16 +2036,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=70, + ["num_for_nothing"]="UQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["win_adbox"]={ @@ -2157,31 +2133,31 @@ local arena_rank = { ["score"]=1100, ["min_point"]=4, ["k1"]=30, - ["k2"]=130, + ["k2"]=200, ["season_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, ["win_reward"]={ @@ -2190,16 +2166,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3000, - ["num_for_nothing"]="VQhcAw==" + ["num"]=140, + ["num_for_nothing"]="Vwxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["lose_reward"]={ @@ -2208,16 +2184,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1500, - ["num_for_nothing"]="Vw1cAw==" + ["num"]=90, + ["num_for_nothing"]="Xwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=25, - ["num_for_nothing"]="VA0=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["win_adbox"]={ @@ -2305,39 +2281,31 @@ local arena_rank = { ["score"]=1200, ["min_point"]=4, ["k1"]=30, - ["k2"]=130, + ["k2"]=300, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30000, - ["num_for_nothing"]="VQhcA2U=" + ["num"]=7000, + ["num_for_nothing"]="UQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=5, - ["num_for_nothing"]="Uw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=25, + ["num_for_nothing"]="VA0=" } }, ["win_reward"]={ @@ -2346,16 +2314,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=160, + ["num_for_nothing"]="Vw5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=64, + ["num_for_nothing"]="UAw=" } }, ["lose_reward"]={ @@ -2364,16 +2332,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=42, + ["num_for_nothing"]="Ugo=" } }, ["win_adbox"]={ @@ -2460,40 +2428,32 @@ local arena_rank = { ["season"]=2, ["score"]=1300, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=28, + ["k2"]=250, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=20, - ["num_for_nothing"]="VAg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=40000, - ["num_for_nothing"]="UghcA2U=" + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=6, - ["num_for_nothing"]="UA==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["num"]=30, + ["num_for_nothing"]="VQg=" } }, ["win_reward"]={ @@ -2502,16 +2462,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=64, + ["num_for_nothing"]="UAw=" } }, ["lose_reward"]={ @@ -2520,16 +2480,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=2500, - ["num_for_nothing"]="VA1cAw==" + ["num"]=110, + ["num_for_nothing"]="Vwlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=35, - ["num_for_nothing"]="VQ0=" + ["num"]=42, + ["num_for_nothing"]="Ugo=" } }, ["win_adbox"]={ @@ -2616,40 +2576,32 @@ local arena_rank = { ["season"]=2, ["score"]=1400, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=25, + ["k2"]=200, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=30, - ["num_for_nothing"]="VQg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=50000, - ["num_for_nothing"]="UwhcA2U=" + ["num"]=15000, + ["num_for_nothing"]="Vw1cA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=7, - ["num_for_nothing"]="UQ==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=6, - ["id_for_nothing"]="UA==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=35, + ["num_for_nothing"]="VQ0=" } }, ["win_reward"]={ @@ -2658,16 +2610,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6000, - ["num_for_nothing"]="UAhcAw==" + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["num"]=64, + ["num_for_nothing"]="UAw=" } }, ["lose_reward"]={ @@ -2676,16 +2628,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3000, - ["num_for_nothing"]="VQhcAw==" + ["num"]=130, + ["num_for_nothing"]="Vwtc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=40, - ["num_for_nothing"]="Ugg=" + ["num"]=42, + ["num_for_nothing"]="Ugo=" } }, ["win_adbox"]={ @@ -2772,40 +2724,40 @@ local arena_rank = { ["season"]=2, ["score"]=1600, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=23, + ["k2"]=150, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=40, - ["num_for_nothing"]="Ugg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=60000, - ["num_for_nothing"]="UAhcA2U=" + ["num"]=18000, + ["num_for_nothing"]="VwBcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=8, - ["num_for_nothing"]="Xg==" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=4, - ["num_for_nothing"]="Ug==" + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, ["win_reward"]={ @@ -2814,16 +2766,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=7000, - ["num_for_nothing"]="UQhcAw==" + ["num"]=220, + ["num_for_nothing"]="VApc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=90, - ["num_for_nothing"]="Xwg=" + ["num"]=64, + ["num_for_nothing"]="UAw=" } }, ["lose_reward"]={ @@ -2832,16 +2784,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=3500, - ["num_for_nothing"]="VQ1cAw==" + ["num"]=140, + ["num_for_nothing"]="Vwxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=45, - ["num_for_nothing"]="Ug0=" + ["num"]=42, + ["num_for_nothing"]="Ugo=" } }, ["win_adbox"]={ @@ -2928,40 +2880,40 @@ local arena_rank = { ["season"]=2, ["score"]=1800, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=21, + ["k2"]=250, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=70000, - ["num_for_nothing"]="UQhcA2U=" + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=9, - ["num_for_nothing"]="Xw==" + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=1, + ["num_for_nothing"]="Vw==" } }, ["win_reward"]={ @@ -2970,16 +2922,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=8000, - ["num_for_nothing"]="XghcAw==" + ["num"]=240, + ["num_for_nothing"]="VAxc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -2988,16 +2940,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ @@ -3084,40 +3036,40 @@ local arena_rank = { ["season"]=2, ["score"]=2000, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=20, + ["k2"]=180, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=60, - ["num_for_nothing"]="UAg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=80000, - ["num_for_nothing"]="XghcA2U=" + ["num"]=25000, + ["num_for_nothing"]="VA1cA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=6, - ["num_for_nothing"]="UA==" + ["num"]=2, + ["num_for_nothing"]="VA==" } }, ["win_reward"]={ @@ -3126,16 +3078,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=9000, - ["num_for_nothing"]="XwhcAw==" + ["num"]=260, + ["num_for_nothing"]="VA5c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=110, - ["num_for_nothing"]="Vwlc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -3144,16 +3096,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4500, - ["num_for_nothing"]="Ug1cAw==" + ["num"]=170, + ["num_for_nothing"]="Vw9c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=55, - ["num_for_nothing"]="Uw0=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ @@ -3240,40 +3192,40 @@ local arena_rank = { ["season"]=2, ["score"]=2300, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=18, + ["k2"]=150, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=70, - ["num_for_nothing"]="UQg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=90000, - ["num_for_nothing"]="XwhcA2U=" + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=11, - ["num_for_nothing"]="Vwk=" + ["num"]=70, + ["num_for_nothing"]="UQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=7, - ["num_for_nothing"]="UQ==" + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, ["win_reward"]={ @@ -3282,16 +3234,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=10000, - ["num_for_nothing"]="VwhcA2U=" + ["num"]=280, + ["num_for_nothing"]="VABc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=120, - ["num_for_nothing"]="Vwpc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -3300,16 +3252,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5000, - ["num_for_nothing"]="UwhcAw==" + ["num"]=180, + ["num_for_nothing"]="VwBc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=60, - ["num_for_nothing"]="UAg=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ @@ -3396,40 +3348,40 @@ local arena_rank = { ["season"]=2, ["score"]=2600, ["min_point"]=4, - ["k1"]=30, + ["k1"]=16, ["k2"]=130, ["season_reward"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=80, - ["num_for_nothing"]="Xgg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=35000, + ["num_for_nothing"]="VQ1cA2U=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=100000, - ["num_for_nothing"]="VwhcA2VR" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=12, - ["num_for_nothing"]="Vwo=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=8, - ["num_for_nothing"]="Xg==" + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["win_reward"]={ @@ -3438,16 +3390,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=11000, - ["num_for_nothing"]="VwlcA2U=" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=130, - ["num_for_nothing"]="Vwtc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -3456,16 +3408,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=5500, - ["num_for_nothing"]="Uw1cAw==" + ["num"]=190, + ["num_for_nothing"]="VwFc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=65, - ["num_for_nothing"]="UA0=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ @@ -3552,40 +3504,40 @@ local arena_rank = { ["season"]=2, ["score"]=2900, ["min_point"]=4, - ["k1"]=30, - ["k2"]=130, + ["k1"]=15, + ["k2"]=120, ["season_reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=90, - ["num_for_nothing"]="Xwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=110000, - ["num_for_nothing"]="VwlcA2VR" + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=13, - ["num_for_nothing"]="Vws=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=9, - ["num_for_nothing"]="Xw==" + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["win_reward"]={ @@ -3594,16 +3546,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=12000, - ["num_for_nothing"]="VwpcA2U=" + ["num"]=320, + ["num_for_nothing"]="VQpc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=140, - ["num_for_nothing"]="Vwxc" + ["num"]=68, + ["num_for_nothing"]="UAA=" } }, ["lose_reward"]={ @@ -3612,16 +3564,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=6000, - ["num_for_nothing"]="UAhcAw==" + ["num"]=210, + ["num_for_nothing"]="VAlc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=21, ["id_for_nothing"]="VAk=", - ["num"]=70, - ["num_for_nothing"]="UQg=" + ["num"]=45, + ["num_for_nothing"]="Ug0=" } }, ["win_adbox"]={ diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua index 933e3baa..7f23c36a 100644 --- a/lua/app/module/arena/arena_manager.lua +++ b/lua/app/module/arena/arena_manager.lua @@ -153,6 +153,9 @@ end -- 更新赛季信息 function ArenaManager:reqArenaInfo() + if not DataManager.ArenaData:isOpen() then + return + end self.isResetting = true self:sendMessage(ProtoMsgType.FromMsgEnum.PVPInfoReq, {}, {}, self.rspArenaInfo, nil) end diff --git a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua index ab3d6d96..11252f26 100644 --- a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua @@ -216,9 +216,9 @@ local _addSkillEffect = function(skillId, skillInfo, battleBaseData, battleContr if skillInfo.obj == BattleConst.SIDE_DEF then target = battleController:getOtherSideTeam(side):getMainUnit() elseif skillInfo.obj == BattleConst.SIDE_ATK then - target = actionTeam + target = actionTeam:getMainUnit() elseif skillInfo.obj == BattleConst.SIDE_ATK_ALL then - for matchtype, comp in pairs(actionTeam) do + for matchtype, comp in pairs(actionTeam:getUnitComp()) do local buffEntity = BattleBuffEntity:create() buffEntity:init(effect, comp.unitEntity) buffEntity:setTargetSide(skillInfo.obj) diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua index 91c2d3bf..761543de 100644 --- a/lua/app/module/chapter/chapter_manager.lua +++ b/lua/app/module/chapter/chapter_manager.lua @@ -116,6 +116,8 @@ function ChapterManager:endFightFinish(result) DataManager:tryOpenModules() -- 更新每日挑战数据 ModuleManager.DailyChallengeManager:onResetState() + -- 更新竞技场数据 + ModuleManager.ArenaManager:reqArenaInfo() -- 更新副本活动 DataManager.DungeonData:setDirty() -- 章节通关 标记可弹出章节礼包 diff --git a/lua/app/module/commerce/commerce_manager.lua b/lua/app/module/commerce/commerce_manager.lua index 85c83e06..8e47aba2 100644 --- a/lua/app/module/commerce/commerce_manager.lua +++ b/lua/app/module/commerce/commerce_manager.lua @@ -47,7 +47,13 @@ function CommerceManager:showBuyArenaTicketUI() end function CommerceManager:onBuyArenaTicket(isAd) - self:sendMessage(ProtoMsgType.FromMsgEnum.BuyTicketReq, {ad = isAd}, {}, self.onBuyArenaTicketFinish, nil) + local report = nil + if isAd then + report = BIReport.ITEM_GET_TYPE.ADS_BUY_ARENA_TICKET + else + report = BIReport.ITEM_GET_TYPE.GEM_BUY_ARENA_TICKET + end + self:sendMessage(ProtoMsgType.FromMsgEnum.BuyTicketReq, {ad = isAd}, {}, self.onBuyArenaTicketFinish, report) end function CommerceManager:onBuyArenaTicketFinish(data) @@ -55,12 +61,12 @@ function CommerceManager:onBuyArenaTicketFinish(data) return end - if data.costs then - -- 钻石购买 - DataManager.PlayerData:addArenaTicketGemBuyCount() - else + if data.reqData.ad then -- 激励视频 DataManager.PlayerData:addArenaTicketAdBuyCount() + else + -- 钻石购买 + DataManager.PlayerData:addArenaTicketGemBuyCount() end if data.rewards then GFunc.showRewardBox(data.rewards) diff --git a/lua/app/module/daily_challenge/daily_challenge_manager.lua b/lua/app/module/daily_challenge/daily_challenge_manager.lua index 3e7d759b..fd457bfd 100644 --- a/lua/app/module/daily_challenge/daily_challenge_manager.lua +++ b/lua/app/module/daily_challenge/daily_challenge_manager.lua @@ -127,6 +127,9 @@ function DailyChallengeManager:endChallengeFinish(result) end function DailyChallengeManager:onResetState() + if not DataManager.DailyChallengeData:isOpen() then + return + end if DataManager.DailyChallengeData:getIsInReset() then return end diff --git a/lua/app/ui/arena/arena_formation_ui.lua b/lua/app/ui/arena/arena_formation_ui.lua index f014ba92..5d4c1086 100644 --- a/lua/app/ui/arena/arena_formation_ui.lua +++ b/lua/app/ui/arena/arena_formation_ui.lua @@ -17,19 +17,19 @@ function ArenaFormationUI:onPressBackspace() self:closeUI() end -function ArenaFormationUI:getCurrencyParams() - if self.currencyParams == nil then - self.currencyParams = { - itemIds = { - GConst.ItemConst.ITEM_ID_GEM, - GConst.ItemConst.ITEM_ID_ARENA_TICKET - }, - showType = GConst.CURRENCY_TYPE.HORIZONTAL - } - end +-- function ArenaFormationUI:getCurrencyParams() +-- if self.currencyParams == nil then +-- self.currencyParams = { +-- itemIds = { +-- GConst.ItemConst.ITEM_ID_GEM, +-- GConst.ItemConst.ITEM_ID_ARENA_TICKET +-- }, +-- showType = GConst.CURRENCY_TYPE.HORIZONTAL +-- } +-- end - return self.currencyParams -end +-- return self.currencyParams +-- end function ArenaFormationUI:ctor(params) self.formationType = params diff --git a/lua/app/ui/arena/arena_match_ui.lua b/lua/app/ui/arena/arena_match_ui.lua index 4cb4b5f1..de47ff35 100644 --- a/lua/app/ui/arena/arena_match_ui.lua +++ b/lua/app/ui/arena/arena_match_ui.lua @@ -18,10 +18,6 @@ function ArenaMatchUI:onPressBackspace() end function ArenaMatchUI:getCurrencyParams() - if not self.showResult then - return nil - end - if self.currencyParams == nil then self.currencyParams = { itemIds = { @@ -137,7 +133,7 @@ end function ArenaMatchUI:showMatchLoading() self.matchLoading:setActive(true) self.matchResult:setActive(false) - self.showResult = false + UIManager:setBarsVisible(self, false) self.txSeason:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_21, DataManager.ArenaData:getSeason())) self.txLoading:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_22)) @@ -150,20 +146,19 @@ function ArenaMatchUI:showMatchLoading() self.waitSid = self:performWithDelayGlobal(function() self:showMatchResult() end, 1.5) - UIManager:updateBarsState(self) end -- 展示匹配结果页 function ArenaMatchUI:showMatchResult() local matchInfo = DataManager.ArenaData:getMatchInfo() if not matchInfo then - Logger.logError("没有匹配对象却进入了匹配结果页,检查是否是网络慢了等情况") + Logger.logError("没有匹配对象却进入了匹配结果页,有问题@.#") return end self.matchLoading:setActive(false) self.matchResult:setActive(true) - self.showResult = true + UIManager:setBarsVisible(self, true) self.spineVS:playAnimComplete("born", false, true, function() self.spineVS:playAnim("idle", true, true) @@ -223,7 +218,6 @@ function ArenaMatchUI:showMatchResult() self:refreshCountdown() end, 1) self:refreshCountdown() - UIManager:updateBarsState(self) end function ArenaMatchUI:refreshCountdown() @@ -231,6 +225,7 @@ function ArenaMatchUI:refreshCountdown() if self.freeRematchCD <= 0 then -- 冷却已好 self.txFreeCountdown:setActive(false) + self.imgAd:setActive(false) self:unscheduleGlobal(self.countdownSid) else diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index 260cf2ae..56fa9ee3 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -216,6 +216,7 @@ end function BattleResultUI:refreshArenaNode() if self.battleType ~= GConst.BattleConst.BATTLE_TYPE.ARENA then self.arenaNode:setVisible(false) + self.arenaBoxNode:setVisible(false) return end @@ -254,7 +255,6 @@ function BattleResultUI:refreshArenaNode() end -- 检查ad宝箱显示 - self.arenaBoxNode:setVisible(false) if self.isWin then if (self.arenaTotalCount % GFunc.getConstIntValue("arena_win_adbox")) == 0 then self.arenaBoxNode:setVisible(true) @@ -270,6 +270,8 @@ end function BattleResultUI:refreshRewards() self.animRewards = {} self.rewardNode:setVisible(true) + self.goldPigNode:setVisible(false) + self.rewardTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) self.continue:setText(I18N:getGlobalText(I18N.GlobalConst.CONTINUE_DESC)) self.rewardScrollRectComp:addInitCallback(function() diff --git a/lua/app/ui/main_city/component/arena_comp.lua b/lua/app/ui/main_city/component/arena_comp.lua index a38f57b9..d2aeae14 100644 --- a/lua/app/ui/main_city/component/arena_comp.lua +++ b/lua/app/ui/main_city/component/arena_comp.lua @@ -2,7 +2,7 @@ local MainCompBaseCell = require "app/ui/main_city/component/main_comp_base_cell local ArenaComp = class("ArenaComp", MainCompBaseCell) function ArenaComp:getIsOpen() - return DataManager.ArenaData:isOpen() + return DataManager.ArenaData:isOpen(true) end function ArenaComp:getEntranceName() @@ -120,7 +120,7 @@ function ArenaComp:refreshBounty() end function ArenaComp:refreshShow() - if not DataManager.ArenaData:isOpen() then + if not DataManager.ArenaData:isOpen(true) then return end @@ -137,7 +137,7 @@ function ArenaComp:refreshShow() end function ArenaComp:updateTimer() - if not DataManager.ArenaData:isOpen() then + if not DataManager.ArenaData:isOpen(true) then return end diff --git a/lua/app/ui/main_city/component/main_comp.lua b/lua/app/ui/main_city/component/main_comp.lua index e8c696d1..f609ee15 100644 --- a/lua/app/ui/main_city/component/main_comp.lua +++ b/lua/app/ui/main_city/component/main_comp.lua @@ -299,6 +299,7 @@ function MainComp:refresh() self:refreshStageFormaion() self:refreshChallenge() self:refreshDungeon() + self:refreshArena() end function MainComp:getCurModuleType() diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index 0e49d4b1..338ef4c6 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -267,6 +267,13 @@ function MainCityUI:_bind() end end end) + self:bind(DataManager.ArenaData, "isDirty", function() + if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.MAIN then + if self.subComps[self.selectedIndex] then + self.subComps[self.selectedIndex]:refreshArena() + end + end + end) end function MainCityUI:initBottomUI() diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index dbfd8a3c..335b513d 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -29,7 +29,12 @@ function ArenaData:init(data) self.curGradingId = self:getGradingIdFromScore(self.score) -- 当前所在段位id DataManager.FormationData:initArena(data.attack_array_heroes, data.defend_array_heroes) + DataManager.PlayerData:initArena(data.today_ticket_buy_count, data.today_ticket_ad_count) + -- 未找到相应赛季数据 + if not self:hasServerData() then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_30)) + end self:setDirty() end @@ -58,18 +63,22 @@ function ArenaData:getTimeCfg(season) return result end --- 是否开启 -function ArenaData:isOpen() +-- 是否开启,checkData:是否判断数据 +function ArenaData:isOpen(checkData) if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ARENA, true) then return false end - if self.cfgRank == nil or self.cfgTime == nil then - GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_30)) + if checkData and not self:hasServerData() then return false end return true end +-- 是否有服务器数据 +function ArenaData:hasServerData() + return self.season and self:getRankCfg(self.season) +end + -- 是否在赛季结算中 function ArenaData:isInSeasonSettlement() return self:getRemainSeasonTime() > 0 and self:getRemainSeasonSettlementTime() < 0 @@ -80,11 +89,6 @@ function ArenaData:getSeason() return self.season end --- 获取帮助文案 -function ArenaData:getHelpDesc() - return nil -end - -- 获取当前赛季段位id列表 function ArenaData:getGradingIdList() return table.keys(self.cfgRank) @@ -316,7 +320,7 @@ end -- 是否能看视频重新匹配 function ArenaData:canAdRematch() - return self.todayAdRematchCount < self:getRematchAdDailyMaxNum() and self:getFreeRematchCd() > 0 + return self:getFreeRematchCd() > 0 and self.todayAdRematchCount < self:getRematchAdDailyMaxNum() end -- 获取上赛季段位id diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index 8c1cabf1..9aa3502b 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -42,11 +42,6 @@ function PlayerData:init(data) self.data.vitGemCount = energyLimit.diamond_count or 0 self.data.vitADCount = energyLimit.ad_count or 0 - -- 竞技场入场券购买情况初始化 - local arenaTicketLimit = data.arena or GConst.EMPTY_TABLE - self.data.arenaTicketGemCount = arenaTicketLimit.today_ticket_buy_count or 0 - self.data.arenaTicketADCount = arenaTicketLimit.today_ticket_ad_count or 0 - self.lastLoginTime = basicInfo.lastLoginTime or Time:getBeginningOfServerToday() DataManager:registerCrossDayFunc("PlayerData", function() self:resetOnCrossDay() @@ -62,6 +57,12 @@ function PlayerData:init(data) self:initModuleUnlockInfo() end +-- 竞技场入场券购买情况初始化 +function PlayerData:initArena(gemCount, adCount) + self.data.arenaTicketGemCount = gemCount or 0 + self.data.arenaTicketADCount = adCount or 0 +end + function PlayerData:initModuleUnlockInfo() self.showModuleUnlockChapter = 0 if self.moduleUnlockChapterMap then @@ -492,7 +493,7 @@ function PlayerData:getShowFrameIds() return table.addArray(unlockIds, lockIds) end --- 竞技场战令 +-- 竞技场入场券 function PlayerData:getArenaTicket() return self.arenaTicket or 0