diff --git a/lua/app/common/local_data.lua b/lua/app/common/local_data.lua index 56f64601..ab355cb1 100644 --- a/lua/app/common/local_data.lua +++ b/lua/app/common/local_data.lua @@ -34,6 +34,7 @@ local LOCAL_DATA_KEY = { NEW_AVATAR_AND_FRAME = "NEW_AVATAR_AND_FRAME", SHOP_DISCOUNT_RED_POINT_TIME = "SHOP_DISCOUNT_RED_POINT_TIME", ARENA_BOUNTY_POP_TIME = "ARENA_BOUNTY_POP_TIME", + LINK_TOUCH_CANCEL_COUNT = "LINK_TOUCH_CANCEL_COUNT", } LocalData.KEYS = LOCAL_DATA_KEY @@ -402,4 +403,12 @@ function LocalData:getArenaBountyPopTime() return self:getInt(LOCAL_DATA_KEY.ARENA_BOUNTY_POP_TIME, 0) end +function LocalData:setLinkTouchCancelCount(count) + self:setInt(LOCAL_DATA_KEY.LINK_TOUCH_CANCEL_COUNT, count) +end + +function LocalData:getLinkTouchCancelCount() + return self:getInt(LOCAL_DATA_KEY.LINK_TOUCH_CANCEL_COUNT, 0) +end + return LocalData \ No newline at end of file diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index f74ae350..e24873b2 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -518,8 +518,8 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=500, - ["num_for_nothing"]="Uwhc" + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" }, { ["type"]=1, @@ -543,32 +543,32 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["time_type"]=1, @@ -586,32 +586,32 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["time_type"]=1, @@ -629,32 +629,32 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["time_type"]=1, @@ -672,32 +672,32 @@ local act_gift = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=100, - ["num_for_nothing"]="Vwhc" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=6, ["id_for_nothing"]="UA==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["time_type"]=1, diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua index 4afb71ca..bf124a70 100644 --- a/lua/app/config/arena_rank.lua +++ b/lua/app/config/arena_rank.lua @@ -67,24 +67,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6, + ["num_for_nothing"]="UA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["lose_adbox"]={ @@ -93,24 +101,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, ["rand_board"]={ @@ -123,7 +139,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -217,24 +233,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6, + ["num_for_nothing"]="UA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["lose_adbox"]={ @@ -243,24 +267,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, ["rand_board"]={ @@ -273,7 +305,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -367,24 +399,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6, + ["num_for_nothing"]="UA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["lose_adbox"]={ @@ -393,24 +433,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, ["rand_board"]={ @@ -423,7 +471,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -517,24 +565,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["lose_adbox"]={ @@ -543,24 +599,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["rand_board"]={ @@ -573,7 +637,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -593,7 +657,7 @@ local arena_rank = { }, [105]={ ["season"]=1, - ["score"]=1300, + ["score"]=1400, ["reset_rank"]=204, ["inactive_reset_rank"]=201, ["min_point"]=4, @@ -667,24 +731,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["lose_adbox"]={ @@ -693,24 +765,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["rand_board"]={ @@ -723,7 +803,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -743,7 +823,7 @@ local arena_rank = { }, [106]={ ["season"]=1, - ["score"]=1400, + ["score"]=1600, ["reset_rank"]=204, ["inactive_reset_rank"]=201, ["min_point"]=4, @@ -817,24 +897,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["lose_adbox"]={ @@ -843,24 +931,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["rand_board"]={ @@ -873,7 +969,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -893,7 +989,7 @@ local arena_rank = { }, [107]={ ["season"]=1, - ["score"]=1600, + ["score"]=1800, ["reset_rank"]=204, ["inactive_reset_rank"]=201, ["min_point"]=4, @@ -975,24 +1071,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["lose_adbox"]={ @@ -1001,24 +1105,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["rand_board"]={ @@ -1031,7 +1143,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -1051,7 +1163,7 @@ local arena_rank = { }, [108]={ ["season"]=1, - ["score"]=1800, + ["score"]=2000, ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, @@ -1133,16 +1245,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -1151,6 +1263,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -1159,16 +1279,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -1177,6 +1297,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -1189,7 +1317,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -1209,7 +1337,7 @@ local arena_rank = { }, [109]={ ["season"]=1, - ["score"]=2000, + ["score"]=2200, ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, @@ -1291,16 +1419,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -1309,6 +1437,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -1317,16 +1453,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -1335,6 +1471,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -1347,7 +1491,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -1367,7 +1511,7 @@ local arena_rank = { }, [110]={ ["season"]=1, - ["score"]=2300, + ["score"]=2500, ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, @@ -1449,16 +1593,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -1467,6 +1611,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -1475,16 +1627,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -1493,6 +1645,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -1505,7 +1665,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -1525,7 +1685,7 @@ local arena_rank = { }, [111]={ ["season"]=1, - ["score"]=2600, + ["score"]=2800, ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, @@ -1607,16 +1767,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -1625,6 +1785,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -1633,16 +1801,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -1651,6 +1819,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -1663,7 +1839,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -1683,7 +1859,7 @@ local arena_rank = { }, [112]={ ["season"]=1, - ["score"]=2900, + ["score"]=3100, ["reset_rank"]=208, ["inactive_reset_rank"]=204, ["min_point"]=4, @@ -1765,16 +1941,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -1783,6 +1959,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -1791,16 +1975,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -1809,6 +1993,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -1821,7 +2013,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -1905,24 +2097,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6, + ["num_for_nothing"]="UA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["lose_adbox"]={ @@ -1931,24 +2131,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, ["rand_board"]={ @@ -1961,7 +2169,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -2053,24 +2261,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6, + ["num_for_nothing"]="UA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["lose_adbox"]={ @@ -2079,24 +2295,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, ["rand_board"]={ @@ -2109,7 +2333,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -2201,24 +2425,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6, + ["num_for_nothing"]="UA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["lose_adbox"]={ @@ -2227,24 +2459,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=300, + ["num_for_nothing"]="VQhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=12, + ["num_for_nothing"]="Vwo=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" } }, ["rand_board"]={ @@ -2257,7 +2497,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -2349,24 +2589,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["lose_adbox"]={ @@ -2375,24 +2623,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["rand_board"]={ @@ -2405,7 +2661,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -2425,7 +2681,7 @@ local arena_rank = { }, [205]={ ["season"]=2, - ["score"]=1300, + ["score"]=1400, ["min_point"]=4, ["k1"]=28, ["k2"]=250, @@ -2497,24 +2753,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["lose_adbox"]={ @@ -2523,24 +2787,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["rand_board"]={ @@ -2553,7 +2825,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -2573,7 +2845,7 @@ local arena_rank = { }, [206]={ ["season"]=2, - ["score"]=1400, + ["score"]=1600, ["min_point"]=4, ["k1"]=25, ["k2"]=200, @@ -2645,24 +2917,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["lose_adbox"]={ @@ -2671,24 +2951,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["rand_board"]={ @@ -2701,7 +2989,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -2721,7 +3009,7 @@ local arena_rank = { }, [207]={ ["season"]=2, - ["score"]=1600, + ["score"]=1800, ["min_point"]=4, ["k1"]=23, ["k2"]=150, @@ -2801,24 +3089,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8, + ["num_for_nothing"]="Xg==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["lose_adbox"]={ @@ -2827,24 +3123,32 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=400, + ["num_for_nothing"]="Ughc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=7, + ["num_for_nothing"]="UQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" } }, ["rand_board"]={ @@ -2857,7 +3161,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -2877,7 +3181,7 @@ local arena_rank = { }, [208]={ ["season"]=2, - ["score"]=1800, + ["score"]=2000, ["min_point"]=4, ["k1"]=21, ["k2"]=250, @@ -2957,16 +3261,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -2975,6 +3279,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -2983,16 +3295,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -3001,6 +3313,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -3013,7 +3333,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -3033,7 +3353,7 @@ local arena_rank = { }, [209]={ ["season"]=2, - ["score"]=2000, + ["score"]=2200, ["min_point"]=4, ["k1"]=20, ["k2"]=180, @@ -3113,16 +3433,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -3131,6 +3451,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -3139,16 +3467,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -3157,6 +3485,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -3169,7 +3505,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -3189,7 +3525,7 @@ local arena_rank = { }, [210]={ ["season"]=2, - ["score"]=2300, + ["score"]=2500, ["min_point"]=4, ["k1"]=18, ["k2"]=150, @@ -3269,16 +3605,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -3287,6 +3623,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -3295,16 +3639,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -3313,6 +3657,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -3325,7 +3677,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -3345,7 +3697,7 @@ local arena_rank = { }, [211]={ ["season"]=2, - ["score"]=2600, + ["score"]=2800, ["min_point"]=4, ["k1"]=16, ["k2"]=130, @@ -3425,16 +3777,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -3443,6 +3795,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -3451,16 +3811,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -3469,6 +3829,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -3481,7 +3849,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, @@ -3501,7 +3869,7 @@ local arena_rank = { }, [212]={ ["season"]=2, - ["score"]=2900, + ["score"]=3100, ["min_point"]=4, ["k1"]=15, ["k2"]=120, @@ -3581,16 +3949,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=2, - ["num_for_nothing"]="VA==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, @@ -3599,6 +3967,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" } }, ["lose_adbox"]={ @@ -3607,16 +3983,16 @@ local arena_rank = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=9, + ["num_for_nothing"]="Xw==" }, { ["type"]=1, @@ -3625,6 +4001,14 @@ local arena_rank = { ["id_for_nothing"]="Ug==", ["num"]=20, ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["rand_board"]={ @@ -3637,7 +4021,7 @@ local arena_rank = { ["effect"]={ { ["type"]="hpp_add", - ["num"]=30000, + ["num"]=10000, ["ratio"]=10000, ["round"]=0 }, diff --git a/lua/app/config/arena_robot.lua b/lua/app/config/arena_robot.lua index 969d322f..923c437f 100644 --- a/lua/app/config/arena_robot.lua +++ b/lua/app/config/arena_robot.lua @@ -2,7 +2,7 @@ local arena_robot = { [1]={ ["name"]="Gresham", ["score"]=917, - ["level"]=15, + ["level"]=12, ["avatar"]=3001, ["avatar_frame"]=1000, ["hero_id"]={ @@ -31,7 +31,7 @@ local arena_robot = { [2]={ ["name"]="Gilroy", ["score"]=929, - ["level"]=15, + ["level"]=13, ["avatar"]=1001, ["avatar_frame"]=1000, ["hero_id"]={ @@ -59,8 +59,8 @@ local arena_robot = { }, [3]={ ["name"]="Landry", - ["score"]=946, - ["level"]=17, + ["score"]=941, + ["level"]=13, ["avatar"]=4001, ["avatar_frame"]=1000, ["hero_id"]={ @@ -88,8 +88,8 @@ local arena_robot = { }, [4]={ ["name"]="Eva", - ["score"]=957, - ["level"]=18, + ["score"]=953, + ["level"]=12, ["avatar"]=2001, ["avatar_frame"]=1000, ["hero_id"]={ @@ -106,8 +106,8 @@ local arena_robot = { 5 }, { - 42001, - 5 + 43001, + 3 }, { 52001, @@ -118,7 +118,7 @@ local arena_robot = { [5]={ ["name"]="Prosperous", ["score"]=959, - ["level"]=15, + ["level"]=12, ["avatar"]=5001, ["avatar_frame"]=1000, ["hero_id"]={ @@ -135,8 +135,8 @@ local arena_robot = { 5 }, { - 42001, - 5 + 43001, + 3 }, { 52001, @@ -147,7 +147,7 @@ local arena_robot = { [6]={ ["name"]="Fleming", ["score"]=964, - ["level"]=14, + ["level"]=11, ["avatar"]=4001, ["avatar_frame"]=1000, ["hero_id"]={ @@ -161,11 +161,11 @@ local arena_robot = { }, { 33001, - 5 + 3 }, { 43001, - 5 + 4 }, { 52001, @@ -175,8 +175,8 @@ local arena_robot = { }, [7]={ ["name"]="Lola", - ["score"]=964, - ["level"]=14, + ["score"]=969, + ["level"]=11, ["avatar"]=5001, ["avatar_frame"]=1000, ["hero_id"]={ @@ -186,15 +186,15 @@ local arena_robot = { }, { 22001, - 5 + 6 }, { 33001, - 5 + 3 }, { 43001, - 5 + 4 }, { 52001, @@ -204,22 +204,22 @@ local arena_robot = { }, [8]={ ["name"]="Frances", - ["score"]=967, - ["level"]=16, + ["score"]=978, + ["level"]=12, ["avatar"]=3001, ["avatar_frame"]=1000, ["hero_id"]={ { 12001, - 5 + 6 }, { 22001, - 5 + 6 }, { 33001, - 5 + 3 }, { 43001, @@ -233,22 +233,22 @@ local arena_robot = { }, [9]={ ["name"]="Keith", - ["score"]=971, - ["level"]=17, + ["score"]=987, + ["level"]=10, ["avatar"]=2001, ["avatar_frame"]=1000, ["hero_id"]={ { 12001, - 5 + 6 }, { 22001, - 5 + 6 }, { 33001, - 5 + 4 }, { 43001, @@ -262,19 +262,48 @@ local arena_robot = { }, [10]={ ["name"]="Winston", - ["score"]=988, - ["level"]=17, + ["score"]=996, + ["level"]=14, ["avatar"]=1001, ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, - 5 + 13001, + 3 }, { 22001, + 6 + }, + { + 33001, + 4 + }, + { + 43001, 5 }, + { + 52001, + 6 + } + } + }, + [11]={ + ["name"]="Halsey", + ["score"]=1006, + ["level"]=15, + ["avatar"]=5001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 13001, + 3 + }, + { + 22001, + 6 + }, { 33001, 5 @@ -285,49 +314,20 @@ local arena_robot = { }, { 52001, - 5 - } - } - }, - [11]={ - ["name"]="Halsey", - ["score"]=1007, - ["level"]=15, - ["avatar"]=5001, - ["avatar_frame"]=1000, - ["hero_id"]={ - { - 12001, - 6 - }, - { - 22001, - 6 - }, - { - 33001, - 6 - }, - { - 43001, - 6 - }, - { - 53002, 6 } } }, [12]={ ["name"]="Stuart", - ["score"]=1027, - ["level"]=19, + ["score"]=1018, + ["level"]=17, ["avatar"]=5001, ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, - 6 + 13001, + 4 }, { 22001, @@ -335,14 +335,14 @@ local arena_robot = { }, { 33001, - 6 + 5 }, { 43001, - 6 + 5 }, { - 53002, + 52001, 6 } } @@ -355,8 +355,8 @@ local arena_robot = { ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, - 6 + 13001, + 4 }, { 22001, @@ -364,28 +364,28 @@ local arena_robot = { }, { 33001, - 6 + 5 }, { 43001, - 6 + 5 }, { - 53002, + 52001, 6 } } }, [14]={ ["name"]="Hilda", - ["score"]=1033, - ["level"]=16, + ["score"]=1036, + ["level"]=13, ["avatar"]=2001, ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, - 6 + 13001, + 5 }, { 22001, @@ -393,28 +393,28 @@ local arena_robot = { }, { 33001, - 6 + 5 }, { 43001, 6 }, { - 53002, + 52001, 6 } } }, [15]={ ["name"]="Idelle", - ["score"]=1037, - ["level"]=19, + ["score"]=1046, + ["level"]=16, ["avatar"]=2001, ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, - 6 + 13001, + 5 }, { 22001, @@ -422,7 +422,7 @@ local arena_robot = { }, { 33001, - 6 + 5 }, { 43001, @@ -430,20 +430,20 @@ local arena_robot = { }, { 53002, - 6 + 4 } } }, [16]={ ["name"]="Sibley", - ["score"]=1082, - ["level"]=19, + ["score"]=1055, + ["level"]=14, ["avatar"]=3001, ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, - 6 + 13001, + 5 }, { 22001, @@ -459,24 +459,24 @@ local arena_robot = { }, { 53002, - 6 + 4 } } }, [17]={ ["name"]="Wolf", - ["score"]=1083, - ["level"]=17, + ["score"]=1065, + ["level"]=14, ["avatar"]=1001, ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, - 6 + 13001, + 5 }, { 22001, - 6 + 7 }, { 33001, @@ -488,24 +488,24 @@ local arena_robot = { }, { 53002, - 6 + 4 } } }, [18]={ ["name"]="Renata", - ["score"]=1092, - ["level"]=18, + ["score"]=1073, + ["level"]=16, ["avatar"]=3001, ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, + 13001, 6 }, { 22001, - 6 + 7 }, { 33001, @@ -517,24 +517,24 @@ local arena_robot = { }, { 53002, - 6 + 4 } } }, [19]={ ["name"]="Lane", - ["score"]=1094, - ["level"]=15, + ["score"]=1084, + ["level"]=13, ["avatar"]=4001, ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, + 13001, 6 }, { 22001, - 6 + 7 }, { 33001, @@ -546,24 +546,24 @@ local arena_robot = { }, { 53002, - 6 + 5 } } }, [20]={ ["name"]="Fabian", - ["score"]=1098, - ["level"]=19, + ["score"]=1095, + ["level"]=16, ["avatar"]=4001, ["avatar_frame"]=1000, ["hero_id"]={ { - 12001, + 13001, 6 }, { - 22001, - 6 + 23002, + 4 }, { 33001, @@ -575,28 +575,115 @@ local arena_robot = { }, { 53002, - 6 + 5 } } }, [21]={ ["name"]="Peace", - ["score"]=1101, + ["score"]=1104, ["level"]=17, ["avatar"]=1001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13002, - 7 + 13001, + 6 }, { - 23001, - 7 + 23002, + 4 }, { - 33002, - 7 + 33001, + 6 + }, + { + 43001, + 6 + }, + { + 53002, + 5 + } + } + }, + [22]={ + ["name"]="Tanya", + ["score"]=1110, + ["level"]=18, + ["avatar"]=2001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 13001, + 6 + }, + { + 23002, + 4 + }, + { + 33001, + 6 + }, + { + 43001, + 6 + }, + { + 53002, + 5 + } + } + }, + [23]={ + ["name"]="Trix", + ["score"]=1118, + ["level"]=16, + ["avatar"]=5001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 13001, + 6 + }, + { + 23002, + 5 + }, + { + 33001, + 6 + }, + { + 43001, + 6 + }, + { + 53002, + 6 + } + } + }, + [24]={ + ["name"]="Eugene", + ["score"]=1129, + ["level"]=19, + ["avatar"]=5001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 13001, + 6 + }, + { + 23002, + 5 + }, + { + 33001, + 6 }, { 43001, @@ -604,101 +691,14 @@ local arena_robot = { }, { 53002, - 7 - } - } - }, - [22]={ - ["name"]="Tanya", - ["score"]=1106, - ["level"]=19, - ["avatar"]=2001, - ["avatar_frame"]=1000, - ["hero_id"]={ - { - 13001, - 7 - }, - { - 23001, - 7 - }, - { - 33002, - 7 - }, - { - 43002, - 7 - }, - { - 53001, - 7 - } - } - }, - [23]={ - ["name"]="Trix", - ["score"]=1110, - ["level"]=15, - ["avatar"]=5001, - ["avatar_frame"]=1000, - ["hero_id"]={ - { - 13001, - 7 - }, - { - 23002, - 7 - }, - { - 33001, - 7 - }, - { - 43001, - 7 - }, - { - 53001, - 7 - } - } - }, - [24]={ - ["name"]="Eugene", - ["score"]=1115, - ["level"]=15, - ["avatar"]=5001, - ["avatar_frame"]=1000, - ["hero_id"]={ - { - 13001, - 7 - }, - { - 23001, - 7 - }, - { - 33002, - 7 - }, - { - 43002, - 7 - }, - { - 53001, - 7 + 6 } } }, [25]={ ["name"]="Loralie", - ["score"]=1125, - ["level"]=16, + ["score"]=1140, + ["level"]=17, ["avatar"]=1001, ["avatar_frame"]=1000, ["hero_id"]={ @@ -708,10 +708,39 @@ local arena_robot = { }, { 23002, + 5 + }, + { + 33001, + 6 + }, + { + 43001, 7 }, { - 33002, + 53002, + 6 + } + } + }, + [26]={ + ["name"]="Henrietta", + ["score"]=1150, + ["level"]=16, + ["avatar"]=3001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 13001, + 7 + }, + { + 23002, + 5 + }, + { + 33001, 7 }, { @@ -719,44 +748,15 @@ local arena_robot = { 7 }, { - 53001, - 7 - } - } - }, - [26]={ - ["name"]="Henrietta", - ["score"]=1137, - ["level"]=16, - ["avatar"]=3001, - ["avatar_frame"]=1000, - ["hero_id"]={ - { - 13002, - 7 - }, - { - 23001, - 7 - }, - { - 33002, - 7 - }, - { - 43001, - 7 - }, - { - 53001, - 7 + 53002, + 6 } } }, [27]={ ["name"]="Willette", - ["score"]=1156, - ["level"]=15, + ["score"]=1159, + ["level"]=17, ["avatar"]=4001, ["avatar_frame"]=1000, ["hero_id"]={ @@ -766,10 +766,10 @@ local arena_robot = { }, { 23002, - 7 + 6 }, { - 33002, + 33001, 7 }, { @@ -777,28 +777,28 @@ local arena_robot = { 7 }, { - 53001, - 7 + 53002, + 6 } } }, [28]={ ["name"]="Orlena", - ["score"]=1161, - ["level"]=16, + ["score"]=1167, + ["level"]=17, ["avatar"]=3001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13002, + 13001, 7 }, { - 23001, - 7 + 23002, + 6 }, { - 33002, + 33001, 7 }, { @@ -813,13 +813,42 @@ local arena_robot = { }, [29]={ ["name"]="Irving", - ["score"]=1170, - ["level"]=14, + ["score"]=1178, + ["level"]=18, ["avatar"]=2001, ["avatar_frame"]=1000, ["hero_id"]={ { - 13002, + 13001, + 7 + }, + { + 23002, + 6 + }, + { + 33001, + 7 + }, + { + 43002, + 7 + }, + { + 53002, + 7 + } + } + }, + [30]={ + ["name"]="Phyllis", + ["score"]=1190, + ["level"]=19, + ["avatar"]=4001, + ["avatar_frame"]=1000, + ["hero_id"]={ + { + 13001, 7 }, { @@ -835,36 +864,7 @@ local arena_robot = { 7 }, { - 53001, - 7 - } - } - }, - [30]={ - ["name"]="Phyllis", - ["score"]=1181, - ["level"]=17, - ["avatar"]=4001, - ["avatar_frame"]=1000, - ["hero_id"]={ - { - 13002, - 7 - }, - { - 23001, - 7 - }, - { - 33002, - 7 - }, - { - 43001, - 7 - }, - { - 53001, + 53002, 7 } } diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index f6b734d3..08fd15c4 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -321,6 +321,7 @@ local LocalizationGlobalConst = ARENA_BATTLE_DESC_9 = "ARENA_BATTLE_DESC_9", ARENA_BATTLE_DESC_10 = "ARENA_BATTLE_DESC_10", ARENA_BATTLE_DESC_11 = "ARENA_BATTLE_DESC_11", + BATTLE_DESC_13 = "BATTLE_DESC_13", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index e0bd2376..9eb64b18 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -2823,7 +2823,7 @@ local skill = { ["effect"]={ { ["type"]="shield_rebound_200", - ["num"]=1000, + ["num"]=1500, ["ratio"]=10000, ["round"]=2 } @@ -2831,7 +2831,7 @@ local skill = { ["pvp_effect"]={ { ["type"]="shield_rebound_200", - ["num"]=333, + ["num"]=750, ["ratio"]=10000, ["round"]=2 } @@ -2859,7 +2859,7 @@ local skill = { ["effect"]={ { ["type"]="shield_rebound_400", - ["num"]=1000, + ["num"]=1500, ["ratio"]=10000, ["round"]=2 } @@ -2867,7 +2867,7 @@ local skill = { ["pvp_effect"]={ { ["type"]="shield_rebound_400", - ["num"]=333, + ["num"]=750, ["ratio"]=10000, ["round"]=2 } @@ -4675,7 +4675,7 @@ local skill = { ["effect"]={ { ["type"]="shield_ice", - ["num"]=3000, + ["num"]=1500, ["ratio"]=10000, ["round"]=2 } @@ -4683,7 +4683,7 @@ local skill = { ["pvp_effect"]={ { ["type"]="shield_ice", - ["num"]=1000, + ["num"]=750, ["ratio"]=10000, ["round"]=2 } @@ -4701,7 +4701,7 @@ local skill = { ["effect"]={ { ["type"]="shield_ice_rebound_400", - ["num"]=3000, + ["num"]=1500, ["ratio"]=10000, ["round"]=2 } @@ -4709,7 +4709,7 @@ local skill = { ["pvp_effect"]={ { ["type"]="shield_ice_rebound_400", - ["num"]=1000, + ["num"]=750, ["ratio"]=10000, ["round"]=2 } diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 224e52c5..9cab0923 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -321,6 +321,7 @@ local localization_global = ["ARENA_BATTLE_DESC_9"] = "上一页", ["ARENA_BATTLE_DESC_10"] = "下一页", ["ARENA_BATTLE_DESC_11"] = "退出将判定为战败，是否退出？", + ["BATTLE_DESC_13"] = "滑动至此处可取消连线", } return localization_global \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index bfb616ae..baf22390 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -824,6 +824,7 @@ function BattleBaseController:enterNextWave() end function BattleBaseController:enterRoundBegin() + self:hideTouchCancel() self:resetSideActionCount() self:setCurActionSide(SIDE_ATK) self.needWaitingBoardOver = nil @@ -1062,7 +1063,16 @@ function BattleBaseController:onTouchEvent(eventType, posId, isVirtual) BattleBoardTouchHelper:onTouchEvent(eventType, posId, isVirtual) end +function BattleBaseController:showTouchCancel() + self.battleUI:showTouchCancel() +end + +function BattleBaseController:hideTouchCancel() + self.battleUI:hideTouchCancel() +end + function BattleBaseController:clearGridSequence() + self:hideTouchCancel() local sequence = self.battleData:getGridSequence() local count = #sequence if count <= 0 then @@ -2729,6 +2739,7 @@ function BattleBaseController:_tick(dt, originDt) self:checkDelayEffectText(dt) self:checkSkillSlowDown(dt) self:tick(dt) + BattleBoardTouchHelper:tick(dt) end function BattleBaseController:battleEnd() diff --git a/lua/app/module/battle/helper/battle_board_touch_helper.lua b/lua/app/module/battle/helper/battle_board_touch_helper.lua index 29774a91..b21c13f7 100644 --- a/lua/app/module/battle/helper/battle_board_touch_helper.lua +++ b/lua/app/module/battle/helper/battle_board_touch_helper.lua @@ -2,6 +2,8 @@ local BattleBoardTouchHelper = class("BattleBoardTouchHelper") local BattleConst = GConst.BattleConst local ELIMINATION_TOUCH_EVENT = GConst.ELIMINATION_TOUCH_EVENT +local CLEAR_SEQUENCE_TIME = 1 + function BattleBoardTouchHelper:init(battleController) self.battleController = battleController self.battleUI = battleController.battleUI @@ -19,6 +21,7 @@ function BattleBoardTouchHelper:onTouchEvent(eventType, posId, isVirtual) if eventType == ELIMINATION_TOUCH_EVENT.DOWN then self:onLinkStart(entity, posId, isVirtual) + self.battleController:showTouchCancel() elseif eventType == ELIMINATION_TOUCH_EVENT.ENTER then if self.battleData:getIsVirtual() and not isVirtual then return @@ -29,6 +32,7 @@ function BattleBoardTouchHelper:onTouchEvent(eventType, posId, isVirtual) else -- 取消和抬起 self:onLinkCancelOrUp(entity, posId, isVirtual) + self.battleController:hideTouchCancel() end end @@ -68,6 +72,8 @@ function BattleBoardTouchHelper:onLinkStart(entity, posId, isVirtual) AudioManager:playEffect(AudioManager.EFFECT_ID.LINK_SKILL) end end + + self.clearSequenceTime = 0 end function BattleBoardTouchHelper:onLinkEnter(entity, posId, isVirtual) @@ -78,34 +84,24 @@ function BattleBoardTouchHelper:onLinkEnter(entity, posId, isVirtual) if not lastPosId then return end - local outLineMap = BattleConst.GRID_OUT_LINE_POS_ID[lastPosId] - if not outLineMap or not outLineMap[posId] then - return - end - if self.battleData:alreadyInsertSequence(posId) then + if self.battleData:alreadyInsertSequence(posId) and sequenceCount > 1 then local info = sequence[#sequence - 1] local beforePosId = info and info.posId if beforePosId == posId then -- 进入的是倒数第二个，则移除倒数第一个 - local snapshot = self.battleData:removeGridSequence(lastPosId) - if snapshot then -- 如果有快照，则恢复一次 - for posId, info in pairs(snapshot) do - self.battleData:setInfoBySnapshop(posId, info) - end - end - - local lastEntity = self.battleData:getGridEntity(beforePosId) - local lastSkillEntity = self.battleController:getSkillEntityBySkillId(lastEntity:getSkillId()) - local maskElementType = lastEntity:getElementType(lastSkillEntity) - - local _, skillPosId = self.battleData:getSequenceHadSkill() - self.battleUI:showBoardMask(maskElementType, skillPosId) - - self.battleController:findSkillInfluenceGrids() - self.battleController:onLinkChange() + self:clearSequenceByPosId(beforePosId) + else -- 如果不是倒数第二个，则记录时间 + self.clearSequencePosId = posId + self.clearSequenceTime = CLEAR_SEQUENCE_TIME end return end + self.clearSequenceTime = 0 + + local outLineMap = BattleConst.GRID_OUT_LINE_POS_ID[lastPosId] + if not outLineMap or not outLineMap[posId] then + return + end local skillId = entity:getSkillId() local skillEntity = self.battleController:getSkillEntityBySkillId(skillId) @@ -202,4 +198,53 @@ function BattleBoardTouchHelper:onLinkCancelOrUp(entity, posId, isVirtual) end end +function BattleBoardTouchHelper:tick(dt) + if self.clearSequenceTime and self.clearSequenceTime > 0 then + self.clearSequenceTime = self.clearSequenceTime - dt + if self.clearSequenceTime <= 0 then + self.clearSequenceTime = 0 + if self.clearSequencePosId and self.clearSequencePosId > 0 then + self:clearSequenceByPosId(self.clearSequencePosId) + end + end + end +end + +function BattleBoardTouchHelper:clearSequenceByPosId(posId) + if not posId then + return + end + + local sequence = self.battleData:getGridSequence() + local targetIndex = 0 + for index, info in ipairs(sequence) do + if info.posId == posId then + targetIndex = index + break + end + end + targetIndex = targetIndex + 1 + if targetIndex <= 1 then -- 没找到 + return + end + + local snapshot = self.battleData:removeGridSequenceByIndex(targetIndex) + if not snapshot then + return + end + + for posId, info in pairs(snapshot) do + self.battleData:setInfoBySnapshop(posId, info) + end + local gridEntity = self.battleData:getGridEntity(posId) + local skillEntity = self.battleController:getSkillEntityBySkillId(gridEntity:getSkillId()) + local maskElementType = gridEntity:getElementType(skillEntity) + + local _, skillPosId = self.battleData:getSequenceHadSkill() + self.battleUI:showBoardMask(maskElementType, skillPosId) + + self.battleController:findSkillInfluenceGrids() + self.battleController:onLinkChange() +end + return BattleBoardTouchHelper \ No newline at end of file diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index fde37e2d..301c5305 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -101,6 +101,8 @@ local ProtoMsgType = { [2731283225] = "MailExtractRsp", [2849800229] = "MailReadReq", [2849802062] = "MailReadRsp", + [2909093054] = "AIHelpUnreadReq", + [2909094887] = "AIHelpUnreadRsp", [3003864530] = "ActTriggerGiftNtf", [3013273736] = "PVPRankHeroesReq", [3013275569] = "PVPRankHeroesRsp", @@ -266,6 +268,8 @@ local ProtoMsgType = { MailExtractRsp = 2731283225, MailReadReq = 2849800229, MailReadRsp = 2849802062, + AIHelpUnreadReq = 2909093054, + AIHelpUnreadRsp = 2909094887, ActTriggerGiftNtf = 3003864530, PVPRankHeroesReq = 3013273736, PVPRankHeroesRsp = 3013275569, @@ -431,6 +435,8 @@ local ProtoMsgType = { MailExtractRsp = "MailExtractRsp", MailReadReq = "MailReadReq", MailReadRsp = "MailReadRsp", + AIHelpUnreadReq = "AIHelpUnreadReq", + AIHelpUnreadRsp = "AIHelpUnreadRsp", ActTriggerGiftNtf = "ActTriggerGiftNtf", PVPRankHeroesReq = "PVPRankHeroesReq", PVPRankHeroesRsp = "PVPRankHeroesRsp", diff --git a/lua/app/ui/battle/battle_base_ui.lua b/lua/app/ui/battle/battle_base_ui.lua index f06c90da..6c975094 100644 --- a/lua/app/ui/battle/battle_base_ui.lua +++ b/lua/app/ui/battle/battle_base_ui.lua @@ -207,6 +207,15 @@ end function BattleBaseUI:moveBattlefield(time) end +function BattleBaseUI:initTouchCancel() +end + +function BattleBaseUI:showTouchCancel() +end + +function BattleBaseUI:hideTouchCancel() +end + --------------------------------end按需重写的方法-------------------------------- function BattleBaseUI:getBGMId() @@ -266,6 +275,7 @@ function BattleBaseUI:_display() self:initCommonSkillDescTips() self:initBossEnterAni() self:initCounterAttack() + self:initTouchCancel() end function BattleBaseUI:_addListeners() diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 4498d61c..3da2b46e 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -3,6 +3,7 @@ local BattleUI = class("BattleUI", BattleBaseUI) local GRID_CELL = "app/ui/battle/cell/grid_cell" local SELECT_SKILL_CELL = "app/ui/battle/cell/select_skill_cell" local BATTLE_SELECT_SKILL_COMP = "app/ui/battle/battle_skill_select_comp" +local ELIMINATION_TOUCH_EVENT = GConst.ELIMINATION_TOUCH_EVENT local DEFAULT_X = 10000 local BOARD_POS_UP = BF.Vector2(0, 47) @@ -244,6 +245,42 @@ function BattleUI:showTutorialFinger(posIdList) self.showTutorialFingerSeq:SetLoops(-1) end +function BattleUI:initTouchCancel() + local uiMap = self.root:genAllChildren() + local touchCancelNode = uiMap["battle_ui.bg_2.board_node.board_center_node.touch_cancel_node"] + touchCancelNode:setVisible(false) + touchCancelNode:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_ELIMINATION_TOUCH_EVENT):AddTouchEventListener(function(eventType) + if eventType == ELIMINATION_TOUCH_EVENT.ENTER then -- 取消链接 + self.battleController:clearGridSequence() + AudioManager:playEffect(AudioManager.EFFECT_ID.LINK_CANCEL) + DataManager.ChapterData:addLinkTouchCancelCount() + end + end) + local allImg = uiMap["battle_ui.bg_2.board_node.board_center_node.touch_cancel_node.all_img"] + allImg:setVisible(false) + uiMap["battle_ui.bg_2.board_node.board_center_node.touch_cancel_node.all_img.tips_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_13)) +end + +function BattleUI:showTouchCancel() + local uiMap = self.root:genAllChildren() + local touchCancelNode = uiMap["battle_ui.bg_2.board_node.board_center_node.touch_cancel_node"] + touchCancelNode:setVisible(true) + + -- 判断是否显示提示框 + local allImg = uiMap["battle_ui.bg_2.board_node.board_center_node.touch_cancel_node.all_img"] + if DataManager.ChapterData:getNeedShowTouchCancelTips() then + allImg:setVisible(true) + else + allImg:setVisible(false) + end +end + +function BattleUI:hideTouchCancel() + local uiMap = self.root:genAllChildren() + local touchCancelNode = uiMap["battle_ui.bg_2.board_node.board_center_node.touch_cancel_node"] + touchCancelNode:setVisible(false) +end + --------------------------------end按需重写的方法-------------------------------- function BattleUI:getPrefabPath() diff --git a/lua/app/userdata/battle/battle_base_data.lua b/lua/app/userdata/battle/battle_base_data.lua index 33ec86e6..e9cba9eb 100644 --- a/lua/app/userdata/battle/battle_base_data.lua +++ b/lua/app/userdata/battle/battle_base_data.lua @@ -261,6 +261,22 @@ function BattleBaseData:removeGridSequence(posId) return snapshot end +function BattleBaseData:removeGridSequenceByIndex(index) + local count = #self.gridSequence + if count < index then + return + end + + local snapshot + for i = count, index, -1 do + local info = table.remove(self.gridSequence, i) + self.gridSequenceMap[info.posId] = false + snapshot = info.snapshot + end + + return snapshot +end + function BattleBaseData:getFirstSequenceSnapshot() if not self.gridSequence[1] then return diff --git a/lua/app/userdata/chapter/chapter_data.lua b/lua/app/userdata/chapter/chapter_data.lua index 32d5e814..47add62a 100644 --- a/lua/app/userdata/chapter/chapter_data.lua +++ b/lua/app/userdata/chapter/chapter_data.lua @@ -393,4 +393,29 @@ function ChapterData:getChapterMysteryBoxGotCount(chapterId) return #self.data.chapterInfo[chapterId].mystery_box_idx end +function ChapterData:getNeedShowTouchCancelTips() + if not self.linkTouchCancelCount then + self.linkTouchCancelCount = LocalData:getLinkTouchCancelCount() + self.linkTouchCancelHideCount = GFunc.getConstIntValue("canle_link_hide") + end + + if self.linkTouchCancelCount >= self.linkTouchCancelHideCount then + return false + end + + if not self.showTouchCancelChapter then + self.showTouchCancelChapter = GFunc.getConstIntValue("cancle_link_show") + end + return self:getChapterPassed(self.showTouchCancelChapter) +end + +function ChapterData:addLinkTouchCancelCount() + self:getNeedShowTouchCancelTips() + local newCount = self.linkTouchCancelHideCount + 1 + if self.linkTouchCancelCount < self.linkTouchCancelHideCount and newCount >= self.linkTouchCancelHideCount then + LocalData:setLinkTouchCancelCount(newCount) + end + self.linkTouchCancelCount = newCount +end + return ChapterData \ No newline at end of file