diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 36339ead..5817f146 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -37,8 +37,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["finish_reward"]={ @@ -47,8 +47,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["box_num"]={ @@ -58,16 +58,8 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=12001, - ["id_for_nothing"]="VwpcA2Q=", + ["id"]=4, + ["id_for_nothing"]="Ug==", ["num"]=3, ["num_for_nothing"]="VQ==" } @@ -106,23 +98,39 @@ local chapter = { 1501 }, ["wave_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=25, - ["num_for_nothing"]="VA0=" + ["num"]=6, + ["num_for_nothing"]="UA==" } }, ["finish_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=200, + ["num_for_nothing"]="VAhc" } }, ["box_num"]={ @@ -133,36 +141,28 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=5, + ["num_for_nothing"]="Uw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1001, - ["num_for_nothing"]="VwhcAg==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=32001, - ["id_for_nothing"]="VQpcA2Q=", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" } } }, @@ -218,8 +218,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=15, + ["num_for_nothing"]="Vw0=" } }, ["finish_reward"]={ @@ -228,16 +228,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=500, + ["num_for_nothing"]="Uwhc" } }, ["box_num"]={ @@ -248,28 +248,28 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=1001, - ["num_for_nothing"]="VwhcAg==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=52001, - ["id_for_nothing"]="UwpcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } } }, @@ -320,8 +320,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=35, - ["num_for_nothing"]="VQ0=" + ["num"]=20, + ["num_for_nothing"]="VAg=" } }, ["finish_reward"]={ @@ -330,16 +330,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" } }, ["box_num"]={ @@ -351,62 +351,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" } }, ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=5, - ["id_for_nothing"]="Uw==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } } }, @@ -449,16 +441,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=30, + ["num_for_nothing"]="VQg=" } }, ["finish_reward"]={ @@ -467,16 +459,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=30, + ["num_for_nothing"]="VQg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" } }, ["box_num"]={ @@ -488,54 +480,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=20, + ["num_for_nothing"]="VAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=43001, - ["id_for_nothing"]="UgtcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" } } }, @@ -578,16 +570,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=2, + ["num_for_nothing"]="VA==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=25, - ["num_for_nothing"]="VA0=" + ["num"]=40, + ["num_for_nothing"]="Ugg=" } }, ["finish_reward"]={ @@ -596,16 +588,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -617,62 +609,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - } - }, - ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=5, ["num_for_nothing"]="Uw==" }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=25000, + ["num_for_nothing"]="VA1cA2U=" } } }, @@ -715,16 +699,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=1, - ["num_for_nothing"]="Vw==" + ["num"]=3, + ["num_for_nothing"]="VQ==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=50, + ["num_for_nothing"]="Uwg=" } }, ["finish_reward"]={ @@ -733,16 +717,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=50, + ["num_for_nothing"]="Uwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -754,54 +738,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=23001, - ["id_for_nothing"]="VAtcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" } } }, @@ -844,6 +828,14 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -852,8 +844,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=35, - ["num_for_nothing"]="VQ0=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, ["finish_reward"]={ @@ -862,16 +854,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=60, + ["num_for_nothing"]="UAg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -883,62 +875,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=15000, + ["num_for_nothing"]="Vw1cA2U=" } }, ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=40000, + ["num_for_nothing"]="UghcA2U=" } } }, @@ -981,6 +965,14 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -989,8 +981,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=20, - ["num_for_nothing"]="VAg=" + ["num"]=80, + ["num_for_nothing"]="Xgg=" } }, ["finish_reward"]={ @@ -999,16 +991,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=80, + ["num_for_nothing"]="Xgg=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -1020,54 +1012,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=15000, + ["num_for_nothing"]="Vw1cA2U=" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" } }, ["box_reward_3"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=33001, - ["id_for_nothing"]="VQtcA2Q=", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=50000, + ["num_for_nothing"]="UwhcA2U=" } } }, @@ -1109,6 +1101,14 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", ["num"]=1, ["num_for_nothing"]="Vw==" }, @@ -1117,8 +1117,8 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=25, - ["num_for_nothing"]="VA0=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["finish_reward"]={ @@ -1127,16 +1127,16 @@ local chapter = { ["type_for_nothing"]="Vw==", ["id"]=4, ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["num"]=100, + ["num_for_nothing"]="Vwhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=1000, - ["num_for_nothing"]="VwhcAw==" + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" } }, ["box_num"]={ @@ -1148,62 +1148,54 @@ local chapter = { { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=200, + ["num_for_nothing"]="VAhc" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" } }, ["box_reward_2"]={ { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" }, { ["type"]=1, ["type_for_nothing"]="Vw==", - ["id"]=3, - ["id_for_nothing"]="VQ==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=30000, + ["num_for_nothing"]="VQhcA2U=" } }, ["box_reward_3"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=4, - ["id_for_nothing"]="Ug==", - ["num"]=5, - ["num_for_nothing"]="Uw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", ["id"]=5, ["id_for_nothing"]="Uw==", - ["num"]=3, - ["num_for_nothing"]="VQ==" + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=60000, + ["num_for_nothing"]="UAhcA2U=" } } } diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 2982578a..e48a6c93 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -7,9 +7,18 @@ local const = { }, ["chapter_cost"]={ ["value"]=10 + }, + ["shake_level_1"]={ + ["value"]=10 + }, + ["shake_level_2"]={ + ["value"]=20 + }, + ["shake_level_3"]={ + ["value"]=60 } } local config = { -data=const,count=3 +data=const,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index eb872f0e..4e6aebb1 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -6,43 +6,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=120011, ["support_skill"]=120010, + ["rouge_skill"]=200500, ["rouge_skill_1"]=200501, ["rouge_skill_2"]=200502, ["rouge_skill_3"]=200503, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0005", ["icon"]="5", @@ -56,43 +57,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=220011, ["support_skill"]=220010, + ["rouge_skill"]=200200, ["rouge_skill_1"]=200201, ["rouge_skill_2"]=200202, ["rouge_skill_3"]=200203, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0002", ["icon"]="2", @@ -106,43 +108,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=230011, ["support_skill"]=230010, + ["rouge_skill"]=200700, ["rouge_skill_1"]=200701, ["rouge_skill_2"]=200702, ["rouge_skill_3"]=200703, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3320000, + 3640000, + 3980000, + 4320000, + 4680000, + 5080000, + 5500000, + 5960000, + 6480000, + 7060000, + 7680000, + 8380000, + 9160000, + 10040000 }, ["atk"]={ - 1000000, - 1100000, - 1200000, - 1300000, - 1400000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1660000, + 1820000, + 1990000, + 2160000, + 2340000, + 2540000, + 2750000, + 2980000, + 3240000, + 3530000, + 3840000, + 4190000, + 4580000, + 5020000 }, ["model_id"]="p0007", ["icon"]="7", @@ -156,43 +159,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=320011, ["support_skill"]=320010, + ["rouge_skill"]=200100, ["rouge_skill_1"]=200101, ["rouge_skill_2"]=200102, ["rouge_skill_3"]=200103, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0001", ["icon"]="1", @@ -206,43 +210,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=330011, ["support_skill"]=330010, + ["rouge_skill"]=200600, ["rouge_skill_1"]=200601, ["rouge_skill_2"]=200602, ["rouge_skill_3"]=200603, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3320000, + 3640000, + 3980000, + 4320000, + 4680000, + 5080000, + 5500000, + 5960000, + 6480000, + 7060000, + 7680000, + 8380000, + 9160000, + 10040000 }, ["atk"]={ - 1000000, - 1100000, - 1200000, - 1300000, - 1400000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1660000, + 1820000, + 1990000, + 2160000, + 2340000, + 2540000, + 2750000, + 2980000, + 3240000, + 3530000, + 3840000, + 4190000, + 4580000, + 5020000 }, ["model_id"]="p0006", ["icon"]="6", @@ -256,43 +261,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=420011, ["support_skill"]=420010, + ["rouge_skill"]=200300, ["rouge_skill_1"]=200301, ["rouge_skill_2"]=200302, ["rouge_skill_3"]=200303, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0003", ["icon"]="3", @@ -306,43 +312,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=430011, ["support_skill"]=430010, + ["rouge_skill"]=200800, ["rouge_skill_1"]=200801, ["rouge_skill_2"]=200802, ["rouge_skill_3"]=200803, ["begin_lv"]=3, ["hp"]={ - 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3320000, + 3640000, + 3980000, + 4320000, + 4680000, + 5080000, + 5500000, + 5960000, + 6480000, + 7060000, + 7680000, + 8380000, + 9160000, + 10040000 }, ["atk"]={ - 1000000, - 1100000, - 1200000, - 1300000, - 1400000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1660000, + 1820000, + 1990000, + 2160000, + 2340000, + 2540000, + 2750000, + 2980000, + 3240000, + 3530000, + 3840000, + 4190000, + 4580000, + 5020000 }, ["model_id"]="p0008", ["icon"]="8", @@ -356,43 +363,44 @@ local hero = { ["hurt_num"]=3, ["base_skill"]=520011, ["support_skill"]=520010, + ["rouge_skill"]=200400, ["rouge_skill_1"]=200401, ["rouge_skill_2"]=200402, ["rouge_skill_3"]=200403, ["begin_lv"]=1, ["hp"]={ 2000000, - 2100000, - 2200000, - 2300000, - 2400000, - 2500000, - 2600000, - 2700000, - 2800000, - 2900000, + 2240000, + 2480000, + 2740000, 3000000, - 3100000, - 3200000, - 3300000, - 3400000 + 3280000, + 3580000, + 3900000, + 4260000, + 4660000, + 5100000, + 5580000, + 6120000, + 6720000, + 7400000 }, ["atk"]={ 1000000, - 1100000, - 1200000, - 1300000, - 1400000, + 1120000, + 1240000, + 1370000, 1500000, - 1600000, - 1700000, - 1800000, - 1900000, - 2000000, - 2100000, - 2200000, - 2300000, - 2400000 + 1640000, + 1790000, + 1950000, + 2130000, + 2330000, + 2550000, + 2790000, + 3060000, + 3360000, + 3700000 }, ["model_id"]="p0004", ["icon"]="4", diff --git a/lua/app/config/hero_level.lua b/lua/app/config/hero_level.lua index 1007be71..0a064b19 100644 --- a/lua/app/config/hero_level.lua +++ b/lua/app/config/hero_level.lua @@ -9,14 +9,14 @@ local hero_level = { [2]={ ["cost_2"]={ 5, - 100 + 50 }, ["unlock_skill"]=1 }, [3]={ ["cost_2"]={ 10, - 250 + 100 }, ["cost_3"]={ 3, @@ -27,11 +27,11 @@ local hero_level = { [4]={ ["cost_2"]={ 25, - 500 + 200 }, ["cost_3"]={ 5, - 500 + 300 }, ["unlock_skill"]=2 }, @@ -42,161 +42,161 @@ local hero_level = { }, ["cost_3"]={ 10, - 500 + 1500 }, ["cost_4"]={ 3, - 500 + 0 }, ["unlock_skill"]=2 }, [6]={ ["cost_2"]={ 100, - 1000 + 5000 }, ["cost_3"]={ 25, - 500 + 7000 }, ["cost_4"]={ 5, - 500 + 10000 }, ["unlock_skill"]=2 }, [7]={ ["cost_2"]={ - 200, + 250, 10000 }, ["cost_3"]={ 50, - 10000 + 15000 }, ["cost_4"]={ 10, - 500 + 20000 }, ["unlock_skill"]=2 }, [8]={ ["cost_2"]={ 500, - 10000 + 15000 }, ["cost_3"]={ 100, - 10000 + 24000 }, ["cost_4"]={ 20, - 10000 + 30000 }, ["unlock_skill"]=3 }, [9]={ ["cost_2"]={ 1000, - 10000 + 20000 }, ["cost_3"]={ - 200, - 10000 + 250, + 30000 }, ["cost_4"]={ - 40, - 10000 + 25, + 40000 }, ["unlock_skill"]=3 }, [10]={ ["cost_2"]={ 1500, - 10000 + 30000 }, ["cost_3"]={ - 400, - 10000 + 500, + 45000 }, ["cost_4"]={ - 80, - 10000 + 50, + 60000 }, ["unlock_skill"]=3 }, [11]={ ["cost_2"]={ 2000, - 10000 + 40000 }, ["cost_3"]={ 1000, - 10000 + 60000 }, ["cost_4"]={ - 160, - 10000 + 100, + 80000 }, ["unlock_skill"]=3 }, [12]={ ["cost_2"]={ 2500, - 10000 + 50000 }, ["cost_3"]={ 1500, - 10000 + 75000 }, ["cost_4"]={ - 320, - 10000 + 150, + 100000 }, ["unlock_skill"]=3 }, [13]={ ["cost_2"]={ 3000, - 10000 + 75000 }, ["cost_3"]={ 2000, - 10000 + 110000 }, ["cost_4"]={ - 640, - 10000 + 200, + 150000 }, ["unlock_skill"]=3 }, [14]={ ["cost_2"]={ - 4000, - 10000 + 3500, + 100000 }, ["cost_3"]={ - 3000, - 10000 + 2500, + 150000 }, ["cost_4"]={ - 1000, - 10000 + 300, + 200000 }, ["unlock_skill"]=3 }, [15]={ ["cost_2"]={ - 5000, - 10000 + 4000, + 150000 }, ["cost_3"]={ - 4000, - 10000 + 3000, + 240000 }, ["cost_4"]={ - 1500, - 10000 + 400, + 300000 }, ["unlock_skill"]=3 } diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index e988e07c..35200181 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -1,17 +1,17 @@ local item = { [1]={ ["type"]=1, - ["qlt"]=0, + ["qlt"]=5, ["icon"]="1" }, [2]={ ["type"]=1, - ["qlt"]=0, + ["qlt"]=5, ["icon"]="2" }, [3]={ ["type"]=1, - ["qlt"]=0, + ["qlt"]=5, ["icon"]="3" }, [4]={ diff --git a/lua/app/config/player_initial.lua b/lua/app/config/player_initial.lua index 37ed855a..0052c937 100644 --- a/lua/app/config/player_initial.lua +++ b/lua/app/config/player_initial.lua @@ -5,8 +5,8 @@ local player_initial = { ["type_for_nothing"]="Vw==", ["id"]=3, ["id_for_nothing"]="VQ==", - ["num"]=30, - ["num_for_nothing"]="VQg=" + ["num"]=60, + ["num_for_nothing"]="UAg=" } }, [2]={ diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index d69b95be..ce44ec0a 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -12,7 +12,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [2]={ ["position"]=2, @@ -27,7 +29,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [3]={ ["position"]=3, @@ -42,7 +46,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [4]={ ["position"]=4, @@ -57,7 +63,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [5]={ ["position"]=5, @@ -72,7 +80,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=1 + ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=1 }, [6]={ ["position"]=1, @@ -87,7 +97,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [7]={ ["position"]=2, @@ -102,7 +114,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [8]={ ["position"]=3, @@ -117,7 +131,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [9]={ ["position"]=4, @@ -132,7 +148,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [10]={ ["position"]=5, @@ -147,7 +165,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [11]={ ["effect_type"]=2, @@ -220,6 +240,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [320011]={ @@ -254,6 +276,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [220011]={ @@ -275,6 +299,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=4, ["name_act"]="skill01" }, [220012]={ @@ -316,6 +342,8 @@ local skill = { } }, ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=4, ["name_act"]="skill01" }, [420010]={ @@ -331,6 +359,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [420011]={ @@ -361,6 +391,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [520011]={ @@ -397,6 +429,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [120011]={ @@ -431,6 +465,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [330011]={ @@ -467,6 +503,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [230011]={ @@ -600,6 +638,8 @@ local skill = { } }, ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1, ["name_act"]="support01" }, [430011]={ @@ -626,6 +666,8 @@ local skill = { } }, ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=3, ["name_act"]="skill01" }, [430012]={ @@ -670,6 +712,8 @@ local skill = { } }, ["skill_position"]=1, + ["shake_time"]=100, + ["shake_type"]=3, ["name_act"]="skill01" }, [1000000]={ @@ -684,7 +728,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [1000001]={ ["effect_type"]=1, @@ -698,7 +744,9 @@ local skill = { } }, ["obj"]=2, - ["skill_position"]=2 + ["skill_position"]=2, + ["shake_time"]=100, + ["shake_type"]=1 }, [1000002]={ ["effect_type"]=1, @@ -732,6 +780,8 @@ local skill = { ["skill_position"]=2, ["cd"]=4, ["cd_start"]=4, + ["shake_time"]=100, + ["shake_type"]=4, ["name_act"]="skill01" }, [1000004]={ @@ -785,6 +835,8 @@ local skill = { ["skill_position"]=2, ["cd"]=3, ["cd_start"]=3, + ["shake_time"]=100, + ["shake_type"]=4, ["name_act"]="skill01" }, [1000007]={ @@ -860,6 +912,8 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=2, + ["shake_time"]=100, + ["shake_type"]=3, ["name_act"]="skill01" }, [1000012]={ @@ -1073,6 +1127,8 @@ local skill = { ["skill_position"]=2, ["cd"]=2, ["cd_start"]=2, + ["shake_time"]=100, + ["shake_type"]=3, ["name_act"]="skill01" }, [1000027]={ diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index e3473a5f..16543726 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -650,6 +650,14 @@ local skill_rogue = { }, ["icon"]="29" }, + [200100]={ + ["limit_times"]=1, + ["weight"]=4000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=3, + ["icon"]="55" + }, [200101]={ ["limit_times"]=1, ["weight"]=2000, @@ -702,6 +710,14 @@ local skill_rogue = { ["obj"]=2, ["icon"]="33" }, + [200200]={ + ["limit_times"]=1, + ["weight"]=4000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=2, + ["icon"]="56" + }, [200201]={ ["limit_times"]=1, ["weight"]=2000, @@ -753,6 +769,14 @@ local skill_rogue = { ["obj"]=1, ["icon"]="36" }, + [200300]={ + ["limit_times"]=1, + ["weight"]=4000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=4, + ["icon"]="57" + }, [200301]={ ["limit_times"]=1, ["weight"]=2000, @@ -792,6 +816,14 @@ local skill_rogue = { }, ["icon"]="39" }, + [200400]={ + ["limit_times"]=1, + ["weight"]=4000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=5, + ["icon"]="58" + }, [200401]={ ["limit_times"]=1, ["weight"]=2000, @@ -824,6 +856,14 @@ local skill_rogue = { ["skill_position"]=5, ["icon"]="42" }, + [200500]={ + ["limit_times"]=1, + ["weight"]=4000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=1, + ["icon"]="59" + }, [200501]={ ["limit_times"]=1, ["weight"]=2000, @@ -876,6 +916,14 @@ local skill_rogue = { ["obj"]=1, ["icon"]="45" }, + [200600]={ + ["limit_times"]=1, + ["weight"]=4000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=3, + ["icon"]="60" + }, [200601]={ ["limit_times"]=1, ["weight"]=2000, @@ -918,6 +966,14 @@ local skill_rogue = { ["obj"]=1, ["icon"]="48" }, + [200700]={ + ["limit_times"]=1, + ["weight"]=4000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=2, + ["icon"]="61" + }, [200701]={ ["limit_times"]=1, ["weight"]=2000, @@ -957,6 +1013,14 @@ local skill_rogue = { ["skill_position"]=2, ["icon"]="51" }, + [200800]={ + ["limit_times"]=1, + ["weight"]=4000, + ["qlt"]=4, + ["type"]=6, + ["skill_position"]=4, + ["icon"]="62" + }, [200801]={ ["limit_times"]=1, ["weight"]=2000, @@ -999,6 +1063,6 @@ local skill_rogue = { } } local config = { -data=skill_rogue,count=68 +data=skill_rogue,count=76 } return config \ No newline at end of file diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua new file mode 100644 index 00000000..af73b73f --- /dev/null +++ b/lua/app/config/tutorial.lua @@ -0,0 +1,189 @@ +local tutorial = { + [10000]={ + ["next_id"]=10010, + ["type"]=6, + ["target_element"]={ + 53, + 44, + 45 + }, + ["arrow_offset"]={ + 0, + 0 + } + }, + [10010]={ + ["next_id"]=10020, + ["type"]=4, + ["finish"]=3 + }, + [10020]={ + ["next_id"]=10030, + ["type"]=4, + ["finish"]=1, + ["finish_parameter"]=1 + }, + [10030]={ + ["next_id"]=10040, + ["type"]=5, + ["finish"]=2, + ["finish_parameter"]=1 + }, + [10040]={ + ["next_id"]=10050, + ["type"]=6, + ["target_element"]={ + 33, + 23, + 13, + 14, + 15, + 25, + 35 + }, + ["arrow_offset"]={ + 0, + 0 + } + }, + [10050]={ + ["next_id"]=10060, + ["type"]=4, + ["finish"]=3 + }, + [10060]={ + ["type"]=6, + ["target_element"]={ + 23, + 13, + 14, + 15, + 25 + }, + ["arrow_offset"]={ + 0, + 0 + } + }, + [20000]={ + ["next_id"]=20010, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_1", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=2, + ["circle_r"]=100, + ["circle_offset"]={ + 0, + 0 + } + }, + [20010]={ + ["next_id"]=20020, + ["type"]=4, + ["finish"]=1, + ["finish_parameter"]=2 + }, + [20020]={ + ["next_id"]=20030, + ["type"]=5, + ["finish"]=2, + ["finish_parameter"]=2 + }, + [20030]={ + ["next_id"]=20040, + ["type"]=2, + ["target_name"]="main_ui(Clone)/bottom_node/bottom_btn_cell_2", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 100, + 100 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [20040]={ + ["next_id"]=20050, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_4", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 100, + 300 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [20050]={ + ["next_id"]=20060, + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/bg/up_btn", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 200, + 100 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [20060]={ + ["next_id"]=20070, + ["type"]=2, + ["target_name"]="hero_detail_ui(Clone)/bg/back_btn", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1 + }, + [20070]={ + ["next_id"]=20080, + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/scroll_cell_1/prop_node/hero_cell_4", + ["arrow_offset"]={ + 0, + 0 + }, + ["show_mask"]=1, + ["square_size"]={ + 100, + 300 + }, + ["square_offset"]={ + 0, + 0 + } + }, + [20080]={ + ["type"]=2, + ["target_name"]="main_ui(Clone)/sub_ui_node/hero_ui/scrollrect/viewport/content/large_hero_cell/hero_bg/use_btn", + ["arrow_offset"]={ + 0, + 0 + } + } +} +local config = { +data=tutorial,count=16 +} +return config \ No newline at end of file diff --git a/lua/app/config/tutorial.lua.meta b/lua/app/config/tutorial.lua.meta new file mode 100644 index 00000000..70e6e41c --- /dev/null +++ b/lua/app/config/tutorial.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c2def61829e024e499f536c5f7210ed1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/tutorial_start.lua b/lua/app/config/tutorial_start.lua new file mode 100644 index 00000000..2dc26d2c --- /dev/null +++ b/lua/app/config/tutorial_start.lua @@ -0,0 +1,20 @@ +local tutorial_start = { + [1]={ + ["start_id"]=10000, + ["uires_path"]="assets/prefabs/ui/battle/battle_ui.prefab" + }, + [2]={ + ["start_id"]=20000, + ["uires_path"]="Assets/prefabs/ui/main_city/main_ui.prefab" + }, + [3]={ + ["start_id"]=30000 + }, + [4]={ + ["start_id"]=40000 + } +} +local config = { +data=tutorial_start,count=4 +} +return config \ No newline at end of file diff --git a/lua/app/config/tutorial_start.lua.meta b/lua/app/config/tutorial_start.lua.meta new file mode 100644 index 00000000..5c9ad0d2 --- /dev/null +++ b/lua/app/config/tutorial_start.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 770896b6b97988447b9808e171b31e86 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 683388d6..a84d186d 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -37,6 +37,7 @@ BattleConst.ANIMATOR_HASH_NAME_NUMBER_MOVE_L = -526518883 BattleConst.ANIMATOR_HASH_NAME_NUMBER_MOVE_R = 445827326 BattleConst.ANIMATOR_HASH_NAME_NUMBER_CRIT = -1734531349 BattleConst.ANIMATOR_HASH_NAME_NUMBER_BUFF = 1364146828 +BattleConst.UNLOCK_SKILL_ROGUE_TYPE = 6 BattleConst.BATTLE_ROUND_STEP = { WAIT_BEGIN = 0, -- 等待开始 diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 95a040e1..0172aa6e 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -1269,6 +1269,37 @@ function BattleController:getRandomSkillList(getCount) end end + for elementType, list in pairs(skillPool) do + Logger.logHighlight(self.battleData:isUnlockedSkillElementType(elementType)) + if self.battleData:isUnlockedSkillElementType(elementType) then + for _, skillId in ipairs(list) do + local skillCfg = cfg[skillId] + if skillCfg and (not skillCfg.limit_times or self.battleData:getSkillCount(skillId) < skillCfg.limit_times) then + if not map[skillId] then + table.insert(newSkillPool, skillId) + table.insert(skillWeight, skillCfg.weight) + count = count + 1 + map[skillId] = true + end + end + end + else + local skillEntity = self.battleData:getSkillEntityByElement(elementType) + if skillEntity then + local skillId = skillEntity:getUnlockId() + if skillId and not map[skillId] then + local skillCfg = cfg[skillId] + table.insert(newSkillPool, skillId) + table.insert(skillWeight, skillCfg.weight) + count = count + 1 + map[skillId] = true + end + end + end + end + + Logger.printTable(newSkillPool) + if count > 0 then local index = GFunc.getRandomIndex(skillWeight) local skillId = table.remove(newSkillPool, index) @@ -1298,6 +1329,9 @@ function BattleController:getRandomSkillList(getCount) table.remove(skillWeight, index) count = count - 1 table.insert(result, skillId) + if count <= 0 then + break + end end result = table.shuffle(result) 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 6bf90faf..749dc0be 100644 --- a/lua/app/module/battle/skill/battle_rogue_skill_handle.lua +++ b/lua/app/module/battle/skill/battle_rogue_skill_handle.lua @@ -99,6 +99,14 @@ local _addAttr = function(skillInfo, battleData, battleController, value) battleController:addHeroAttr(skillInfo.attr.type, value) end +local _unlockSkill = function(skillInfo, battleData, battleController, value) + if not skillInfo.skill_position then + return + end + + battleData:unlockSkillEntity(skillInfo.skill_position) +end + local _addSkillEffectParams = function(skillInfo, battleData, battleController) local elementType = skillInfo.skill_position if not elementType or not skillInfo.parameter then @@ -273,7 +281,7 @@ BattleRogueSkillHandle._effectOn = { [3] = _addLinkAtkp, -- 增加链接伤害 [4] = _canLinkAnyElement, -- 可与任何技能连接 [5] = _addAttr, -- 纯粹增加属性 - -- [6] = _addSkillReleaseCount, -- 技能增加释放次数 + [6] = _unlockSkill, -- 技能增加释放次数 [7] = _addSkillEffectParams, -- 增加技能效果参数(比如护盾的承伤增加) [8] = _addSkillRound, -- 增加技能效果持续回合(比如护盾从1回合改为2回合) [9] = _addSkillEffect, -- 获得技能效果 diff --git a/lua/app/module/hero/hero_manager.lua b/lua/app/module/hero/hero_manager.lua index a5d1d984..af803c9a 100644 --- a/lua/app/module/hero/hero_manager.lua +++ b/lua/app/module/hero/hero_manager.lua @@ -90,6 +90,9 @@ end function HeroManager:getSkillRogueBg(skillId) local cfg = ConfigManager:getConfig("skill_rogue")[skillId] + if cfg.type == GConst.BattleConst.UNLOCK_SKILL_ROGUE_TYPE then -- 解锁技能类型 + return "frame_skill" + end return cfg and "frame_" .. cfg.qlt end diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index ab9f6090..1db95413 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -91,7 +91,7 @@ function BattleUI:initSkill() local uiMap = self.root:genAllChildren() for name, elementType in pairs(GConst.BattleConst.ELEMENT_TYPE) do - local obj = uiMap["battle_ui.bg_2.skill_node_cell_" .. elementType] + local obj = uiMap["battle_ui.bg_2.skill_node.skill_node_cell_" .. elementType] if obj then self.skillNodeCells[elementType] = CellManager:addCellComp(obj, SKILL_NODE_CELL) local skillEntity = DataManager.BattleData:getSkillEntities()[elementType] diff --git a/lua/app/ui/battle/cell/skill_node_cell.lua b/lua/app/ui/battle/cell/skill_node_cell.lua index 052aced3..6c23ff47 100644 --- a/lua/app/ui/battle/cell/skill_node_cell.lua +++ b/lua/app/ui/battle/cell/skill_node_cell.lua @@ -8,6 +8,13 @@ function SkillNodeCell:refresh(skillEntity, elementMap) end local uiMap = self:getUIMap() + local iconNode = uiMap["skill_node_cell.icon_node"] + if not skillEntity:getUnlocked() then + iconNode:setVisible(false) + return + else + iconNode:setVisible(true) + end if not self.imgComp then self.imgComp = uiMap["skill_node_cell.energy_bg"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE) end diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua index 5b9028c1..c419b967 100644 --- a/lua/app/userdata/battle/battle_data.lua +++ b/lua/app/userdata/battle/battle_data.lua @@ -101,9 +101,13 @@ function BattleData:initRogueSkills() local cfg = SKILL_CFG[skillId] self.skillMap[cfg.position] = BATTLE_BOARD_SKILL_ENTITY:create(skillId) self.skillMap[cfg.position]:addUpSkills(heroEntity:getRogueSkillList()) + self.skillMap[cfg.position]:setUnlockId(heroEntity:getUnlockRogueId()) for _, id in ipairs(heroEntity:getActiveTogueSkills()) do if not skillmap[id] then - table.insert(self.skillPool, id) + if not self.skillPool[cfg.position] then + self.skillPool[cfg.position] = {} + end + table.insert(self.skillPool[cfg.position], id) skillmap[id] = true end end @@ -315,13 +319,28 @@ function BattleData:getSkillEntityBySkillId(skillId) return self.skillMap[cfg.position] end +function BattleData:unlockSkillEntity(elementType) + if self.skillMap[elementType] then + self.skillMap[elementType]:setUnlock() + end +end + +function BattleData:isUnlockedSkillElementType(elementType) + if not self.skillMap[elementType] then + return false + end + return self.skillMap[elementType]:getUnlocked() +end + function BattleData:addSkillEnergy(elementMap) if not self.skillMap then return end for elementType, entity in pairs(self.skillMap) do - entity:addEnergy(elementMap[elementType] or 0) + if entity:getUnlocked() then + entity:addEnergy(elementMap[elementType] or 0) + end end end diff --git a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua index 1299a0a8..10dd6574 100644 --- a/lua/app/userdata/battle/skill/battle_board_skill_entity.lua +++ b/lua/app/userdata/battle/skill/battle_board_skill_entity.lua @@ -27,6 +27,25 @@ function BattleBoardSkillEntity:getSkillId() return self.skillId end +function BattleBoardSkillEntity:getUnlocked() + return self.unlocked +end + +function BattleBoardSkillEntity:setUnlock() + if self.unlocked then + return + end + self.unlocked = true +end + +function BattleBoardSkillEntity:setUnlockId(unlockId) + self.unlockId = unlockId +end + +function BattleBoardSkillEntity:getUnlockId() + return self.unlockId +end + function BattleBoardSkillEntity:getNeedEnergy() if not self.config then return 1 diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 4bfb7e0d..796807a6 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -225,6 +225,10 @@ function HeroEntity:getActiveRogueCount() return lvInfo.unlock_skill end +function HeroEntity:getUnlockRogueId() + return self.config.rouge_skill +end + function HeroEntity:getRogueSkillList() if not self.rogueSkillList then self.rogueSkillList = {}