diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index eb47c774..5230acb0 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -113,7 +113,8 @@ function DataManager:initWithServerData(data) self.ActivityData:init() self.GodPigData:init() self.BountyData:init() - self.TaskData:init() + -- 要在BountyData之后初始化,依赖BountyData的数据 + self.TaskData:init(data.task_daily) -- self.IdleData:clear(data.IdleData) -- self.SevenDayData:init(data.SevenDayData) diff --git a/lua/app/config/act_chapter_store.lua b/lua/app/config/act_chapter_store.lua new file mode 100644 index 00000000..1f3a9fe4 --- /dev/null +++ b/lua/app/config/act_chapter_store.lua @@ -0,0 +1,1206 @@ +local act_chapter_store = { + [103]={ + ["chapter"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=4, + ["recharge_id"]=2, + ["value"]=10 + }, + [203]={ + ["chapter"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=4, + ["recharge_id"]=2, + ["value"]=10 + }, + [303]={ + ["chapter"]=3, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=4, + ["recharge_id"]=2, + ["value"]=10 + }, + [403]={ + ["chapter"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=5, + ["recharge_id"]=3, + ["value"]=9 + }, + [503]={ + ["chapter"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=5, + ["recharge_id"]=3, + ["value"]=9 + }, + [603]={ + ["chapter"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=5, + ["recharge_id"]=3, + ["value"]=9 + }, + [703]={ + ["chapter"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=6, + ["recharge_id"]=4, + ["value"]=8 + }, + [803]={ + ["chapter"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=6, + ["recharge_id"]=4, + ["value"]=8 + }, + [903]={ + ["chapter"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=6, + ["recharge_id"]=4, + ["value"]=8 + }, + [1003]={ + ["chapter"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=6, + ["recharge_id"]=4, + ["value"]=8 + }, + [1103]={ + ["chapter"]=11, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1203]={ + ["chapter"]=12, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1303]={ + ["chapter"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1403]={ + ["chapter"]=14, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1503]={ + ["chapter"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1603]={ + ["chapter"]=16, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1703]={ + ["chapter"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1803]={ + ["chapter"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [1903]={ + ["chapter"]=19, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [2003]={ + ["chapter"]=20, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=7, + ["recharge_id"]=5, + ["value"]=8 + }, + [2103]={ + ["chapter"]=21, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2203]={ + ["chapter"]=22, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2303]={ + ["chapter"]=23, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2403]={ + ["chapter"]=24, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2503]={ + ["chapter"]=25, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2603]={ + ["chapter"]=26, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2703]={ + ["chapter"]=27, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2803]={ + ["chapter"]=28, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [2903]={ + ["chapter"]=29, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + }, + [3003]={ + ["chapter"]=30, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=25, + ["num_for_nothing"]="VA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=8, + ["num_for_nothing"]="Xg==" + } + }, + ["original"]=8, + ["recharge_id"]=6, + ["value"]=8 + } +} +local config = { +data=act_chapter_store,count=30 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_chapter_store.lua.meta b/lua/app/config/act_chapter_store.lua.meta new file mode 100644 index 00000000..bc404500 --- /dev/null +++ b/lua/app/config/act_chapter_store.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d80f30e1b6ebad0419987a4a0b835f9b +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_gift.lua b/lua/app/config/act_gift.lua index 9ea84d79..fd9e2ad8 100644 --- a/lua/app/config/act_gift.lua +++ b/lua/app/config/act_gift.lua @@ -1,20 +1,850 @@ local act_gift = { - [10002]={ - ["type"]=1, + [70102]={ + ["type"]=7, ["recharge_id"]=11, ["time_type"]=3, ["limit"]=1, ["value"]=3000 }, - [10102]={ - ["type"]=1, + [70202]={ + ["type"]=7, ["recharge_id"]=12, ["time_type"]=3, ["limit"]=1, ["value"]=25 + }, + [20102]={ + ["type"]=2, + ["pay_condition"]={ + 0, + 5 + }, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=80000, + ["num_for_nothing"]="XghcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=1, + ["cd"]=6, + ["limit"]=1, + ["value"]=800 + }, + [20202]={ + ["type"]=2, + ["pay_condition"]={ + 5, + 20 + }, + ["recharge_id"]=5, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=120000, + ["num_for_nothing"]="VwpcA2VR" + } + }, + ["time_type"]=1, + ["limit_time"]=1, + ["cd"]=6, + ["limit"]=1, + ["value"]=800 + }, + [20302]={ + ["type"]=2, + ["pay_condition"]={ + 20, + 9999 + }, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=180000, + ["num_for_nothing"]="VwBcA2VR" + } + }, + ["time_type"]=1, + ["limit_time"]=1, + ["cd"]=6, + ["limit"]=1, + ["value"]=800 + }, + [50102]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=5, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50202]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=5, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50302]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 9999 + }, + ["parameter"]=5, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=4, + ["id_for_nothing"]="Ug==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50402]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=10, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50502]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=10, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50602]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=10, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50702]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=10, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50802]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=15, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [50902]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=15, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51002]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=15, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51102]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=15, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51202]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=20, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=55, + ["num_for_nothing"]="Uw0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51302]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=20, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=65, + ["num_for_nothing"]="UA0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51402]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=20, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=75, + ["num_for_nothing"]="UQ0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51502]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=20, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=85, + ["num_for_nothing"]="Xg0=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51602]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=25, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51702]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=25, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51802]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=25, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [51902]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=25, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52002]={ + ["type"]=5, + ["pay_condition"]={ + 0, + 10 + }, + ["parameter"]=30, + ["recharge_id"]=4, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=50, + ["num_for_nothing"]="Uwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52102]={ + ["type"]=5, + ["pay_condition"]={ + 10, + 20 + }, + ["parameter"]=30, + ["recharge_id"]=6, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52202]={ + ["type"]=5, + ["pay_condition"]={ + 20, + 30 + }, + ["parameter"]=30, + ["recharge_id"]=8, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [52302]={ + ["type"]=5, + ["pay_condition"]={ + 30, + 9999 + }, + ["parameter"]=30, + ["recharge_id"]=9, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + }, + ["time_type"]=3, + ["limit"]=1, + ["value"]=800 + }, + [40102]={ + ["type"]=4, + ["recharge_id"]=2, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } + }, + [10102]={ + ["type"]=1, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } + }, + [20000]={ + ["type"]=2, + ["recharge_id"]=13, + ["time_type"]=3, + ["limit"]=1, + ["value"]=25 + }, + [20001]={ + ["type"]=2, + ["recharge_id"]=5, + ["time_type"]=3, + ["limit"]=1, + ["value"]=21 + }, + [20002]={ + ["type"]=2, + ["recharge_id"]=15, + ["time_type"]=3, + ["limit"]=1, + ["value"]=25 + }, + [20003]={ + ["type"]=2, + ["recharge_id"]=10, + ["time_type"]=3, + ["limit"]=1, + ["value"]=21 } } local config = { -data=act_gift,count=2 +data=act_gift,count=34 } return config \ No newline at end of file diff --git a/lua/app/config/act_growup_gift.lua b/lua/app/config/act_growup_gift.lua new file mode 100644 index 00000000..0a45e470 --- /dev/null +++ b/lua/app/config/act_growup_gift.lua @@ -0,0 +1,336 @@ +local act_growup_gift = { + [1014]={ + ["hero_id"]=23001, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1024]={ + ["hero_id"]=23001, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1034]={ + ["hero_id"]=23001, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1044]={ + ["hero_id"]=23001, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1054]={ + ["hero_id"]=23001, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [1064]={ + ["hero_id"]=23001, + ["recharge_id"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=600, + ["num_for_nothing"]="UAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800 + }, + [2014]={ + ["hero_id"]=43001, + ["recharge_id"]=7, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2024]={ + ["hero_id"]=43001, + ["recharge_id"]=10, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2034]={ + ["hero_id"]=43001, + ["recharge_id"]=13, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2044]={ + ["hero_id"]=43001, + ["recharge_id"]=15, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=400, + ["num_for_nothing"]="Ughc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2054]={ + ["hero_id"]=43001, + ["recharge_id"]=17, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + }, + [2064]={ + ["hero_id"]=43001, + ["recharge_id"]=18, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=600, + ["num_for_nothing"]="UAhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["time_type"]=1, + ["limit_time"]=3, + ["cd"]=12, + ["limit"]=1, + ["value"]=800, + ["value_2"]=1 + } +} +local config = { +data=act_growup_gift,count=12 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_growup_gift.lua.meta b/lua/app/config/act_growup_gift.lua.meta new file mode 100644 index 00000000..b29a810a --- /dev/null +++ b/lua/app/config/act_growup_gift.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b2751a9c036ef454a9051e7031ad4172 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_level_fund.lua b/lua/app/config/act_level_fund.lua new file mode 100644 index 00000000..06d69e22 --- /dev/null +++ b/lua/app/config/act_level_fund.lua @@ -0,0 +1,754 @@ +local act_level_fund = { + [1]={ + ["stage"]=1, + ["level"]=5, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + } + }, + [2]={ + ["stage"]=1, + ["level"]=7, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + } + }, + [3]={ + ["stage"]=1, + ["level"]=10, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + } + }, + [4]={ + ["stage"]=1, + ["level"]=13, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + } + }, + [5]={ + ["stage"]=1, + ["level"]=15, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2500, + ["num_for_nothing"]="VA1cAw==" + } + } + }, + [6]={ + ["stage"]=1, + ["level"]=20, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2500, + ["num_for_nothing"]="VA1cAw==" + } + } + }, + [7]={ + ["stage"]=1, + ["level"]=25, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + } + }, + [8]={ + ["stage"]=1, + ["level"]=30, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3500, + ["num_for_nothing"]="VQ1cAw==" + } + } + }, + [9]={ + ["stage"]=1, + ["level"]=35, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + } + } + }, + [10]={ + ["stage"]=1, + ["level"]=40, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + } + } + }, + [11]={ + ["stage"]=1, + ["level"]=45, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + } + }, + [101]={ + ["stage"]=2, + ["level"]=45, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + } + }, + [102]={ + ["stage"]=2, + ["level"]=48, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + } + }, + [103]={ + ["stage"]=2, + ["level"]=50, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + } + }, + [104]={ + ["stage"]=2, + ["level"]=52, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=4000, + ["num_for_nothing"]="UghcAw==" + } + } + }, + [105]={ + ["stage"]=2, + ["level"]=54, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + } + }, + [106]={ + ["stage"]=2, + ["level"]=56, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1500, + ["num_for_nothing"]="Vw1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + } + }, + [107]={ + ["stage"]=2, + ["level"]=58, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + } + } + }, + [108]={ + ["stage"]=2, + ["level"]=60, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=6000, + ["num_for_nothing"]="UAhcAw==" + } + } + }, + [109]={ + ["stage"]=2, + ["level"]=62, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=150, + ["num_for_nothing"]="Vw1c" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2000, + ["num_for_nothing"]="VAhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" + } + } + }, + [110]={ + ["stage"]=2, + ["level"]=64, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=20000, + ["num_for_nothing"]="VAhcA2U=" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=2500, + ["num_for_nothing"]="VA1cAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10000, + ["num_for_nothing"]="VwhcA2U=" + } + } + }, + [111]={ + ["stage"]=2, + ["level"]=66, + ["reward_free"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + ["reward_small"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=12000, + ["num_for_nothing"]="VwpcA2U=" + } + } + } +} +local config = { +data=act_level_fund,count=22 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_level_fund.lua.meta b/lua/app/config/act_level_fund.lua.meta new file mode 100644 index 00000000..c61b8d6b --- /dev/null +++ b/lua/app/config/act_level_fund.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 141b166c533817e4b8927d2505c393c7 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_sevenday_quest.lua b/lua/app/config/act_sevenday_quest.lua new file mode 100644 index 00000000..04e537cd --- /dev/null +++ b/lua/app/config/act_sevenday_quest.lua @@ -0,0 +1,937 @@ +local act_sevenday_quest = { + [1]={ + ["day"]=1, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [2]={ + ["day"]=1, + ["number"]=1, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [3]={ + ["day"]=1, + ["number"]=1, + ["type"]=29, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [4]={ + ["day"]=1, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [5]={ + ["day"]=1, + ["number"]=5, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [6]={ + ["day"]=1, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [7]={ + ["day"]=1, + ["number"]=30, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [8]={ + ["day"]=1, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [9]={ + ["day"]=1, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [10]={ + ["day"]=1, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [11]={ + ["day"]=2, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [12]={ + ["day"]=2, + ["number"]=1, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [13]={ + ["day"]=2, + ["number"]=1, + ["type"]=29, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [14]={ + ["day"]=2, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [15]={ + ["day"]=2, + ["number"]=5, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [16]={ + ["day"]=2, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [17]={ + ["day"]=2, + ["number"]=30, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [18]={ + ["day"]=2, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [19]={ + ["day"]=2, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [20]={ + ["day"]=2, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [21]={ + ["day"]=3, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [22]={ + ["day"]=3, + ["number"]=1, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [23]={ + ["day"]=3, + ["number"]=1, + ["type"]=29, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [24]={ + ["day"]=3, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [25]={ + ["day"]=3, + ["number"]=5, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [26]={ + ["day"]=3, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [27]={ + ["day"]=3, + ["number"]=30, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [28]={ + ["day"]=3, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [29]={ + ["day"]=3, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [30]={ + ["day"]=3, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [31]={ + ["day"]=4, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [32]={ + ["day"]=4, + ["number"]=1, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [33]={ + ["day"]=4, + ["number"]=1, + ["type"]=29, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [34]={ + ["day"]=4, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [35]={ + ["day"]=4, + ["number"]=5, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [36]={ + ["day"]=4, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [37]={ + ["day"]=4, + ["number"]=30, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [38]={ + ["day"]=4, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [39]={ + ["day"]=4, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [40]={ + ["day"]=4, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [41]={ + ["day"]=5, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [42]={ + ["day"]=5, + ["number"]=1, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [43]={ + ["day"]=5, + ["number"]=1, + ["type"]=29, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [44]={ + ["day"]=5, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [45]={ + ["day"]=5, + ["number"]=5, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [46]={ + ["day"]=5, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [47]={ + ["day"]=5, + ["number"]=30, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [48]={ + ["day"]=5, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [49]={ + ["day"]=5, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [50]={ + ["day"]=5, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [51]={ + ["day"]=6, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [52]={ + ["day"]=6, + ["number"]=1, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [53]={ + ["day"]=6, + ["number"]=1, + ["type"]=29, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [54]={ + ["day"]=6, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [55]={ + ["day"]=6, + ["number"]=5, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [56]={ + ["day"]=6, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [57]={ + ["day"]=6, + ["number"]=30, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [58]={ + ["day"]=6, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [59]={ + ["day"]=6, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [60]={ + ["day"]=6, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [61]={ + ["day"]=7, + ["number"]=1, + ["type"]=22, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [62]={ + ["day"]=7, + ["number"]=1, + ["type"]=25, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [63]={ + ["day"]=7, + ["number"]=1, + ["type"]=29, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [64]={ + ["day"]=7, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [65]={ + ["day"]=7, + ["number"]=5, + ["type"]=28, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [66]={ + ["day"]=7, + ["number"]=3, + ["type"]=26, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [67]={ + ["day"]=7, + ["number"]=30, + ["type"]=27, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + }, + [68]={ + ["day"]=7, + ["number"]=50, + ["type"]=3, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [69]={ + ["day"]=7, + ["number"]=1000, + ["type"]=2, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + } + }, + [70]={ + ["day"]=7, + ["number"]=5, + ["type"]=1, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["count_type"]=1 + } +} +local config = { +data=act_sevenday_quest,count=70 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_sevenday_quest.lua.meta b/lua/app/config/act_sevenday_quest.lua.meta new file mode 100644 index 00000000..1316d2fe --- /dev/null +++ b/lua/app/config/act_sevenday_quest.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c8a9e4cff2241c547a34c834f99d1ffa +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/act_sevenday_quest_reward.lua b/lua/app/config/act_sevenday_quest_reward.lua new file mode 100644 index 00000000..35b0515a --- /dev/null +++ b/lua/app/config/act_sevenday_quest_reward.lua @@ -0,0 +1,83 @@ +local act_sevenday_quest_reward = { + [1]={ + ["num"]=10, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=1000, + ["num_for_nothing"]="VwhcAw==" + } + }, + [2]={ + ["num"]=20, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [3]={ + ["num"]=30, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=3000, + ["num_for_nothing"]="VQhcAw==" + } + }, + [4]={ + ["num"]=40, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=5, + ["id_for_nothing"]="Uw==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + }, + [5]={ + ["num"]=50, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=5000, + ["num_for_nothing"]="UwhcAw==" + } + }, + [6]={ + ["num"]=60, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + }, + [7]={ + ["num"]=70, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } +} +local config = { +data=act_sevenday_quest_reward,count=7 +} +return config \ No newline at end of file diff --git a/lua/app/config/act_sevenday_quest_reward.lua.meta b/lua/app/config/act_sevenday_quest_reward.lua.meta new file mode 100644 index 00000000..3dd4bfb0 --- /dev/null +++ b/lua/app/config/act_sevenday_quest_reward.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f7467b1a396aa0a4587d0e3fa7aee74f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/buff.lua b/lua/app/config/buff.lua index ec69687d..d5b5c88f 100644 --- a/lua/app/config/buff.lua +++ b/lua/app/config/buff.lua @@ -2,36 +2,42 @@ local buff = { [1]={ ["name"]="hurt", ["buff_type"]=3, + ["decr"]=3, ["formula"]=1 }, [2]={ ["name"]="hurt_red", ["buff_type"]=3, ["position"]=1, + ["decr"]=3, ["formula"]=1 }, [3]={ ["name"]="hurt_yellow", ["buff_type"]=3, ["position"]=2, + ["decr"]=3, ["formula"]=1 }, [4]={ ["name"]="hurt_green", ["buff_type"]=3, ["position"]=3, + ["decr"]=3, ["formula"]=1 }, [5]={ ["name"]="hurt_blue", ["buff_type"]=3, ["position"]=4, + ["decr"]=3, ["formula"]=1 }, [6]={ ["name"]="hurt_purple", ["buff_type"]=3, ["position"]=5, + ["decr"]=3, ["formula"]=1 }, [7]={ @@ -39,6 +45,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=1, + ["decr"]=1, ["icon"]="dec_dmg_red_add" }, [8]={ @@ -46,6 +53,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=2, + ["decr"]=1, ["icon"]="dec_dmg_yellow_add" }, [9]={ @@ -53,6 +61,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=3, + ["decr"]=1, ["icon"]="dec_dmg_green_add" }, [10]={ @@ -60,6 +69,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=4, + ["decr"]=1, ["icon"]="dec_dmg_blue_add" }, [11]={ @@ -67,12 +77,14 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=5, + ["decr"]=1, ["icon"]="dec_dmg_purple_add" }, [12]={ ["name"]="dec_dmg_all_add", ["buff_type"]=1, ["stack"]=2, + ["decr"]=1, ["icon"]="dec_dmg_all_add" }, [13]={ @@ -80,6 +92,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=1, + ["decr"]=2, ["icon"]="weakness_red_add" }, [14]={ @@ -87,6 +100,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=2, + ["decr"]=2, ["icon"]="weakness_yellow_add" }, [15]={ @@ -94,6 +108,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=3, + ["decr"]=2, ["icon"]="weakness_green_add" }, [16]={ @@ -101,6 +116,7 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=4, + ["decr"]=2, ["icon"]="weakness_blue_add" }, [17]={ @@ -108,94 +124,110 @@ local buff = { ["buff_type"]=1, ["stack"]=2, ["position"]=5, + ["decr"]=2, ["icon"]="weakness_purple_add" }, [18]={ ["name"]="weakness_all_add", ["buff_type"]=1, ["stack"]=2, + ["decr"]=2, ["icon"]="weakness_all_add" }, [19]={ ["name"]="dmg_addition_red_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=1 + ["position"]=1, + ["decr"]=1 }, [20]={ ["name"]="dmg_addition_yellow_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=2 + ["position"]=2, + ["decr"]=1 }, [21]={ ["name"]="dmg_addition_green_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=3 + ["position"]=3, + ["decr"]=1 }, [22]={ ["name"]="dmg_addition_blue_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=4 + ["position"]=4, + ["decr"]=1 }, [23]={ ["name"]="dmg_addition_purple_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=5 + ["position"]=5, + ["decr"]=1 }, [24]={ ["name"]="dmg_addition_all_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [25]={ ["name"]="atkp_color_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [26]={ ["name"]="atkp_red_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=1 + ["position"]=1, + ["decr"]=1 }, [27]={ ["name"]="atkp_yellow_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=2 + ["position"]=2, + ["decr"]=1 }, [28]={ ["name"]="atkp_green_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=3 + ["position"]=3, + ["decr"]=1 }, [29]={ ["name"]="atkp_blue_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=4 + ["position"]=4, + ["decr"]=1 }, [30]={ ["name"]="atkp_purple_add", ["buff_type"]=1, ["stack"]=2, - ["position"]=5 + ["position"]=5, + ["decr"]=1 }, [31]={ ["name"]="wavehealp", ["buff_type"]=5, ["stack"]=2, + ["decr"]=1, ["formula"]=2 }, [32]={ ["name"]="heal", ["buff_type"]=5, ["stack"]=2, + ["decr"]=1, ["formula"]=3, ["fx_get"]={ 300025 @@ -205,6 +237,7 @@ local buff = { ["name"]="stun", ["buff_type"]=8, ["stack"]=2, + ["decr"]=2, ["icon"]="stun", ["fx_continued"]={ 13 @@ -213,6 +246,7 @@ local buff = { [34]={ ["name"]="shield", ["buff_type"]=2, + ["decr"]=3, ["icon"]="shield", ["fx_continued"]={ 11 @@ -224,12 +258,14 @@ local buff = { [35]={ ["name"]="atkp_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [36]={ ["name"]="normal_attack_dec", ["buff_type"]=1, ["stack"]=2, + ["decr"]=2, ["icon"]="normal_attack_dec", ["fx_continued"]={ 12 @@ -238,51 +274,67 @@ local buff = { [37]={ ["name"]="normal_attack_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [38]={ ["name"]="block", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [39]={ ["name"]="hpp_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [40]={ ["name"]="crit_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [41]={ ["name"]="crit_time_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [42]={ ["name"]="exp_time_add", ["buff_type"]=7, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [43]={ ["name"]="cured_add", ["buff_type"]=1, - ["stack"]=2 + ["stack"]=2, + ["decr"]=1 }, [44]={ - ["name"]="add_skill", - ["buff_type"]=7, - ["stack"]=2 + ["name"]="cured_dec", + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=2 }, [45]={ - ["name"]="skill_fire_times", + ["name"]="add_skill", ["buff_type"]=7, - ["stack"]=2 + ["stack"]=2, + ["decr"]=3 }, [46]={ + ["name"]="skill_fire_times", + ["buff_type"]=7, + ["stack"]=2, + ["decr"]=3 + }, + [47]={ ["name"]="shield_rebound_200", ["buff_type"]=2, + ["decr"]=3, ["icon"]="shield", ["fx_continued"]={ 11 @@ -291,74 +343,143 @@ local buff = { 14 } }, - [47]={ + [48]={ ["name"]="burn", ["buff_type"]=4, ["stack"]=1, + ["decr"]=2, ["formula"]=4 }, - [48]={ - ["name"]="vulnerable", - ["buff_type"]=1 - }, [49]={ - ["name"]="frozen", - ["buff_type"]=8 + ["name"]="vulnerable", + ["buff_type"]=1, + ["decr"]=2 }, [50]={ - ["name"]="poison", - ["buff_type"]=4, - ["stack"]=2 + ["name"]="frozen", + ["buff_type"]=8, + ["decr"]=2 }, [51]={ - ["name"]="Imprison", - ["buff_type"]=7 + ["name"]="poison", + ["buff_type"]=4, + ["stack"]=2, + ["decr"]=2, + ["formula"]=4 }, [52]={ - ["name"]="corrupt", - ["buff_type"]=1 + ["name"]="imprison", + ["buff_type"]=7, + ["decr"]=2 }, [53]={ - ["name"]="bleed", - ["buff_type"]=7 + ["name"]="corrupt", + ["buff_type"]=1, + ["decr"]=2 }, [54]={ - ["name"]="weaken", - ["buff_type"]=1 + ["name"]="bleed", + ["buff_type"]=7, + ["decr"]=2, + ["formula"]=4 }, [55]={ - ["name"]="lethargy", - ["buff_type"]=8, - ["stack"]=1 + ["name"]="weaken", + ["buff_type"]=1, + ["decr"]=2 }, [56]={ - ["name"]="curse", - ["buff_type"]=7 + ["name"]="lethargy", + ["buff_type"]=8, + ["stack"]=1, + ["decr"]=2 }, [57]={ - ["name"]="lock", - ["buff_type"]=7 + ["name"]="curse", + ["buff_type"]=1, + ["decr"]=2 }, [58]={ - ["name"]="first_hand", - ["buff_type"]=7 + ["name"]="lock", + ["buff_type"]=7, + ["decr"]=2 }, [59]={ - ["name"]="skill_hurt_add", - ["buff_type"]=1 + ["name"]="first_hand", + ["buff_type"]=1, + ["decr"]=1 }, [60]={ - ["name"]="undead", - ["buff_type"]=7 + ["name"]="skill_hurt_add", + ["buff_type"]=1, + ["decr"]=1 }, [61]={ - ["name"]="counterattack", + ["name"]="undead", ["buff_type"]=7, - ["stack"]=1 + ["decr"]=1 }, [62]={ + ["name"]="counterattack", + ["buff_type"]=1, + ["stack"]=1, + ["decr"]=1 + }, + [63]={ ["name"]="thorns", - ["buff_type"]=7 + ["buff_type"]=1, + ["decr"]=1 + }, + [64]={ + ["name"]="dmg_dec_red_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=1, + ["decr"]=2 + }, + [65]={ + ["name"]="dmg_dec_yellow_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=2, + ["decr"]=2 + }, + [66]={ + ["name"]="dmg_dec_green_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=3, + ["decr"]=2 + }, + [67]={ + ["name"]="dmg_dec_blue_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=4, + ["decr"]=2 + }, + [68]={ + ["name"]="dmg_dec_purple_add", + ["buff_type"]=1, + ["stack"]=2, + ["position"]=5, + ["decr"]=2 + }, + [69]={ + ["name"]="dmg_dec_all_add", + ["buff_type"]=1, + ["stack"]=2, + ["decr"]=2 + }, + [70]={ + ["name"]="be_sucked", + ["buff_type"]=1, + ["decr"]=2 + }, + [71]={ + ["name"]="be_dmg_to_heal", + ["buff_type"]=1, + ["decr"]=2 } } local keys = { @@ -406,30 +527,39 @@ local keys = { ["crit_time_add"]=buff[41], ["exp_time_add"]=buff[42], ["cured_add"]=buff[43], - ["add_skill"]=buff[44], - ["skill_fire_times"]=buff[45], - ["shield_rebound_200"]=buff[46], - ["burn"]=buff[47], - ["vulnerable"]=buff[48], - ["frozen"]=buff[49], - ["poison"]=buff[50], - ["Imprison"]=buff[51], - ["corrupt"]=buff[52], - ["bleed"]=buff[53], - ["weaken"]=buff[54], - ["lethargy"]=buff[55], - ["curse"]=buff[56], - ["lock"]=buff[57], - ["first_hand"]=buff[58], - ["skill_hurt_add"]=buff[59], - ["undead"]=buff[60], - ["counterattack"]=buff[61], - ["thorns"]=buff[62] + ["cured_dec"]=buff[44], + ["add_skill"]=buff[45], + ["skill_fire_times"]=buff[46], + ["shield_rebound_200"]=buff[47], + ["burn"]=buff[48], + ["vulnerable"]=buff[49], + ["frozen"]=buff[50], + ["poison"]=buff[51], + ["imprison"]=buff[52], + ["corrupt"]=buff[53], + ["bleed"]=buff[54], + ["weaken"]=buff[55], + ["lethargy"]=buff[56], + ["curse"]=buff[57], + ["lock"]=buff[58], + ["first_hand"]=buff[59], + ["skill_hurt_add"]=buff[60], + ["undead"]=buff[61], + ["counterattack"]=buff[62], + ["thorns"]=buff[63], + ["dmg_dec_red_add"]=buff[64], + ["dmg_dec_yellow_add"]=buff[65], + ["dmg_dec_green_add"]=buff[66], + ["dmg_dec_blue_add"]=buff[67], + ["dmg_dec_purple_add"]=buff[68], + ["dmg_dec_all_add"]=buff[69], + ["be_sucked"]=buff[70], + ["be_dmg_to_heal"]=buff[71] } } local config = { data=buff, keys=keys, -count=62 +count=71 } return config \ No newline at end of file diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 5978fb60..8e8d2262 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -82,6 +82,48 @@ local chapter = { ["num"]=3, ["num_for_nothing"]="VQ==" } + }, + ["finish_exp"]=1000, + ["challenge_exp"]=500, + ["idle_exp"]=11, + ["idle_gold"]=16, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [2]={ @@ -203,6 +245,48 @@ local chapter = { ["num"]=500, ["num_for_nothing"]="Uwhc" } + }, + ["finish_exp"]=1100, + ["challenge_exp"]=550, + ["idle_exp"]=12, + ["idle_gold"]=17, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [3]={ @@ -335,6 +419,48 @@ local chapter = { ["num"]=1000, ["num_for_nothing"]="VwhcAw==" } + }, + ["finish_exp"]=1200, + ["challenge_exp"]=600, + ["idle_exp"]=13, + ["idle_gold"]=18, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [4]={ @@ -500,6 +626,48 @@ local chapter = { ["num"]=5000, ["num_for_nothing"]="UwhcAw==" } + }, + ["finish_exp"]=1300, + ["challenge_exp"]=650, + ["idle_exp"]=14, + ["idle_gold"]=19, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [5]={ @@ -665,6 +833,48 @@ local chapter = { ["num"]=20000, ["num_for_nothing"]="VAhcA2U=" } + }, + ["finish_exp"]=1400, + ["challenge_exp"]=700, + ["idle_exp"]=15, + ["idle_gold"]=20, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [6]={ @@ -830,6 +1040,48 @@ local chapter = { ["num"]=25000, ["num_for_nothing"]="VA1cA2U=" } + }, + ["finish_exp"]=1500, + ["challenge_exp"]=750, + ["idle_exp"]=16, + ["idle_gold"]=21, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [7]={ @@ -1011,6 +1263,48 @@ local chapter = { ["num"]=30000, ["num_for_nothing"]="VQhcA2U=" } + }, + ["finish_exp"]=1600, + ["challenge_exp"]=800, + ["idle_exp"]=17, + ["idle_gold"]=22, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [8]={ @@ -1192,6 +1486,48 @@ local chapter = { ["num"]=40000, ["num_for_nothing"]="UghcA2U=" } + }, + ["finish_exp"]=1700, + ["challenge_exp"]=850, + ["idle_exp"]=18, + ["idle_gold"]=23, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [9]={ @@ -1373,6 +1709,48 @@ local chapter = { ["num"]=50000, ["num_for_nothing"]="UwhcA2U=" } + }, + ["finish_exp"]=1800, + ["challenge_exp"]=900, + ["idle_exp"]=19, + ["idle_gold"]=24, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } }, [10]={ @@ -1553,6 +1931,48 @@ local chapter = { ["num"]=60000, ["num_for_nothing"]="UAhcA2U=" } + }, + ["finish_exp"]=1900, + ["challenge_exp"]=950, + ["idle_exp"]=20, + ["idle_gold"]=25, + ["idle_drop"]={ + { + ["type"]=1, + ["id"]=5, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=6, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=7, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=8, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=9, + ["num"]=1, + ["weight"]=100 + }, + { + ["type"]=1, + ["id"]=10, + ["num"]=1, + ["weight"]=100 + } } } } diff --git a/lua/app/config/const.lua b/lua/app/config/const.lua index 631a68bf..a36f8732 100644 --- a/lua/app/config/const.lua +++ b/lua/app/config/const.lua @@ -77,9 +77,54 @@ local const = { }, ["stamina_ad_times"]={ ["value"]=5 + }, + ["bounty_buy_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=30, + ["num_for_nothing"]="VQg=" + } + }, + ["idle_drop_fast_times_1"]={ + ["value"]=2 + }, + ["idle_drop_fast_times_2"]={ + ["value"]=1 + }, + ["idle_drop_fast_time"]={ + ["value"]=21600 + }, + ["idle_drop_fast_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["refresh_skill_cost"]={ + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + }, + ["ad_refresh_skill"]={ + ["value"]=2 + }, + ["diamond_refresh_skill"]={ + ["value"]=1 } } local config = { -data=const,count=17 +data=const,count=25 } return config \ No newline at end of file diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index dcb0fa2c..8e591850 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -5,9 +5,19 @@ local func_open = { }, ["task"]={ ["stage"]=2 + }, + ["act_level_gift"]={ + ["level"]=5 + }, + ["idle_drop"]={ + ["stage"]=2 + }, + ["act_sevenday"]={ + ["stage"]=2, + ["pop_ups"]=1 } } local config = { -data=func_open,count=2 +data=func_open,count=5 } return config \ No newline at end of file diff --git a/lua/app/config/item.lua b/lua/app/config/item.lua index d64382f7..e803d150 100644 --- a/lua/app/config/item.lua +++ b/lua/app/config/item.lua @@ -107,16 +107,29 @@ local item = { ["icon"]="7" }, [8]={ - ["type"]=4 + ["type"]=4, + ["qlt"]=1, + ["icon"]="8" }, [9]={ - ["type"]=4 + ["type"]=4, + ["qlt"]=1, + ["icon"]="9" }, [10]={ - ["type"]=4 + ["type"]=4, + ["qlt"]=1, + ["icon"]="10" }, [11]={ - ["type"]=4 + ["type"]=4, + ["qlt"]=1, + ["icon"]="11" + }, + [12]={ + ["type"]=1, + ["qlt"]=5, + ["icon"]="12" }, [12001]={ ["type"]=5, @@ -168,6 +181,6 @@ local item = { } } local config = { -data=item,count=19 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index b7c4e7b3..f680e433 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -69,6 +69,12 @@ local LocalizationGlobalConst = SETTING_DESC_1 = "SETTING_DESC_1", ACCOUNT_ALREADY_BINDED_DESC = "ACCOUNT_ALREADY_BINDED_DESC", LANGUAGE_DESC = "LANGUAGE_DESC", + ACT_SEVENDAY_TITLE = "ACT_SEVENDAY_TITLE", + ACT_SEVENDAY_LEFTTIME = "ACT_SEVENDAY_LEFTTIME", + ACT_SEVENDAY_TASK = "ACT_SEVENDAY_TASK", + ACT_SEVENDAY_DESC = "ACT_SEVENDAY_DESC", + BTN_CLAIM = "BTN_CLAIM", + BTN_DONE = "BTN_DONE", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/player_exp.lua b/lua/app/config/player_exp.lua new file mode 100644 index 00000000..10425f9e --- /dev/null +++ b/lua/app/config/player_exp.lua @@ -0,0 +1,2106 @@ +local player_exp = { + [1]={ + ["need_exp"]=500, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [2]={ + ["need_exp"]=1000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [3]={ + ["need_exp"]=1900, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [4]={ + ["need_exp"]=3100, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [5]={ + ["need_exp"]=4300, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [6]={ + ["need_exp"]=5500, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [7]={ + ["need_exp"]=6700, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [8]={ + ["need_exp"]=7900, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [9]={ + ["need_exp"]=9100, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [10]={ + ["need_exp"]=10300, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [11]={ + ["need_exp"]=13000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [12]={ + ["need_exp"]=16000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [13]={ + ["need_exp"]=20000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [14]={ + ["need_exp"]=25000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [15]={ + ["need_exp"]=30000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [16]={ + ["need_exp"]=35000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [17]={ + ["need_exp"]=40000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [18]={ + ["need_exp"]=45000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [19]={ + ["need_exp"]=50000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [20]={ + ["need_exp"]=60000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [21]={ + ["need_exp"]=70000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [22]={ + ["need_exp"]=80000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [23]={ + ["need_exp"]=90000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [24]={ + ["need_exp"]=100000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [25]={ + ["need_exp"]=110000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [26]={ + ["need_exp"]=120000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [27]={ + ["need_exp"]=140000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [28]={ + ["need_exp"]=160000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [29]={ + ["need_exp"]=180000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [30]={ + ["need_exp"]=200000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [31]={ + ["need_exp"]=220000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [32]={ + ["need_exp"]=240000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [33]={ + ["need_exp"]=260000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [34]={ + ["need_exp"]=280000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [35]={ + ["need_exp"]=300000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [36]={ + ["need_exp"]=320000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [37]={ + ["need_exp"]=340000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [38]={ + ["need_exp"]=360000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [39]={ + ["need_exp"]=380000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [40]={ + ["need_exp"]=400000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [41]={ + ["need_exp"]=420000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [42]={ + ["need_exp"]=440000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [43]={ + ["need_exp"]=460000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [44]={ + ["need_exp"]=480000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [45]={ + ["need_exp"]=500000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [46]={ + ["need_exp"]=520000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [47]={ + ["need_exp"]=540000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [48]={ + ["need_exp"]=560000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [49]={ + ["need_exp"]=580000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [50]={ + ["need_exp"]=600000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [51]={ + ["need_exp"]=620000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [52]={ + ["need_exp"]=640000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [53]={ + ["need_exp"]=660000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [54]={ + ["need_exp"]=680000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [55]={ + ["need_exp"]=700000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [56]={ + ["need_exp"]=720000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [57]={ + ["need_exp"]=740000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [58]={ + ["need_exp"]=760000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [59]={ + ["need_exp"]=780000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [60]={ + ["need_exp"]=800000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [61]={ + ["need_exp"]=820000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [62]={ + ["need_exp"]=840000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [63]={ + ["need_exp"]=860000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [64]={ + ["need_exp"]=880000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [65]={ + ["need_exp"]=900000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [66]={ + ["need_exp"]=920000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [67]={ + ["need_exp"]=940000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [68]={ + ["need_exp"]=960000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [69]={ + ["need_exp"]=980000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [70]={ + ["need_exp"]=1000000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [71]={ + ["need_exp"]=1040000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [72]={ + ["need_exp"]=1080000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [73]={ + ["need_exp"]=1120000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [74]={ + ["need_exp"]=1160000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [75]={ + ["need_exp"]=1200000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [76]={ + ["need_exp"]=1240000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [77]={ + ["need_exp"]=1280000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [78]={ + ["need_exp"]=1320000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [79]={ + ["need_exp"]=1360000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [80]={ + ["need_exp"]=1400000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [81]={ + ["need_exp"]=1440000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [82]={ + ["need_exp"]=1480000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [83]={ + ["need_exp"]=1520000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [84]={ + ["need_exp"]=1560000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [85]={ + ["need_exp"]=1600000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [86]={ + ["need_exp"]=1640000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [87]={ + ["need_exp"]=1680000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [88]={ + ["need_exp"]=1720000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [89]={ + ["need_exp"]=1760000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [90]={ + ["need_exp"]=1800000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [91]={ + ["need_exp"]=1840000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [92]={ + ["need_exp"]=1880000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [93]={ + ["need_exp"]=1920000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [94]={ + ["need_exp"]=1960000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [95]={ + ["need_exp"]=2000000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [96]={ + ["need_exp"]=2040000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [97]={ + ["need_exp"]=2080000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [98]={ + ["need_exp"]=2120000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [99]={ + ["need_exp"]=2160000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + }, + [100]={ + ["need_exp"]=2200000, + ["level_reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=500, + ["num_for_nothing"]="Uwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=10, + ["num_for_nothing"]="Vwg=" + } + } + } +} +local config = { +data=player_exp,count=100 +} +return config \ No newline at end of file diff --git a/lua/app/config/player_exp.lua.meta b/lua/app/config/player_exp.lua.meta new file mode 100644 index 00000000..15a0e9df --- /dev/null +++ b/lua/app/config/player_exp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 81efcd0562ba9bd4b826603119845aa2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/cn/buff.lua b/lua/app/config/strings/cn/buff.lua index 01b34143..6e22c869 100644 --- a/lua/app/config/strings/cn/buff.lua +++ b/lua/app/config/strings/cn/buff.lua @@ -59,9 +59,9 @@ local buff = { ["desc"]="普攻攻击次数减少", ["name"]="normal_attack_dec" }, - [46]={ + [47]={ ["desc"]="护盾可抵挡一定的伤害,并有200%反伤", - ["name"]="shield" + ["name"]="shield_rebound_200" } } local keys = { @@ -81,7 +81,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 6a090e33..5c3b2b28 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -69,6 +69,12 @@ local localization_global = ["SETTING_DESC_1"] = "ID:{0}", ["ACCOUNT_ALREADY_BINDED_DESC"] = "已绑定", ["LANGUAGE_DESC"] = "语言", + ["ACT_SEVENDAY_TITLE"] = "开服嘉年华", + ["ACT_SEVENDAY_LEFTTIME"] = "剩余时间:{0}天{1}小时", + ["ACT_SEVENDAY_TASK"] = "任务完成:{0}/{1}", + ["ACT_SEVENDAY_DESC"] = "每日将开启新的任务。", + ["BTN_CLAIM"] = "领取", + ["BTN_DONE"] = "已领取", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/cn/item.lua b/lua/app/config/strings/cn/item.lua index 418865cf..2598b70d 100644 --- a/lua/app/config/strings/cn/item.lua +++ b/lua/app/config/strings/cn/item.lua @@ -27,6 +27,22 @@ local item = { ["name"]="通行证积分", ["desc"]="累计积分可提升通行证等级。" }, + [8]={ + ["name"]="木箱(优秀,稀有)" + }, + [9]={ + ["name"]="木箱2(优秀,稀有)" + }, + [10]={ + ["name"]="金箱(优秀,稀有)" + }, + [11]={ + ["name"]="铂金箱(稀有,史诗)" + }, + [12]={ + ["name"]="经验", + ["desc"]="累计达到一定数量可升级。" + }, [12001]={ ["name"]="洛克西英雄碎片", ["desc"]="洛克西英雄碎片,凑齐可解锁或升级。" @@ -61,6 +77,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/task.lua b/lua/app/config/strings/cn/task.lua new file mode 100644 index 00000000..c3f36b23 --- /dev/null +++ b/lua/app/config/strings/cn/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + ["desc"]="累计观看广告" + }, + [2]={ + ["desc"]="完成所有日常任务" + }, + [3]={ + ["desc"]="广告时间" + }, + [4]={ + ["desc"]="获得金币" + }, + [5]={ + ["desc"]="获得金币" + }, + [6]={ + ["desc"]="获得金币" + }, + [7]={ + ["desc"]="获得金币" + }, + [8]={ + ["desc"]="获得钻石" + }, + [9]={ + ["desc"]="获得钻石" + }, + [10]={ + ["desc"]="获得钻石" + }, + [11]={ + ["desc"]="获得钻石" + }, + [12]={ + ["desc"]="消耗金币" + }, + [13]={ + ["desc"]="消耗金币" + }, + [14]={ + ["desc"]="消耗金币" + }, + [15]={ + ["desc"]="消耗金币" + }, + [16]={ + ["desc"]="消耗钻石" + }, + [17]={ + ["desc"]="消耗钻石" + }, + [18]={ + ["desc"]="消耗钻石" + }, + [19]={ + ["desc"]="消耗钻石" + }, + [20]={ + ["desc"]="开启商城任意宝箱" + }, + [21]={ + ["desc"]="开启商城任意宝箱" + }, + [22]={ + ["desc"]="开启商城任意宝箱" + }, + [23]={ + ["desc"]="开启商城任意宝箱" + }, + [24]={ + ["desc"]="开启商城史诗宝箱" + }, + [25]={ + ["desc"]="开启商城史诗宝箱" + }, + [26]={ + ["desc"]="开启商城史诗宝箱" + }, + [27]={ + ["desc"]="开启商城史诗宝箱" + }, + [28]={ + ["desc"]="关卡内打开技能神灯" + }, + [29]={ + ["desc"]="关卡内打开技能神灯" + }, + [30]={ + ["desc"]="关卡内打开技能神灯" + }, + [31]={ + ["desc"]="关卡内打开技能神灯" + }, + [32]={ + ["desc"]="在战斗中获胜" + }, + [33]={ + ["desc"]="在战斗中获胜" + }, + [34]={ + ["desc"]="在战斗中获胜" + }, + [35]={ + ["desc"]="在战斗中获胜" + }, + [36]={ + ["desc"]="升级你的英雄" + }, + [37]={ + ["desc"]="升级你的英雄" + }, + [38]={ + ["desc"]="升级你的英雄" + }, + [39]={ + ["desc"]="升级你的英雄" + }, + [40]={ + ["desc"]="获得英雄碎片" + }, + [41]={ + ["desc"]="获得英雄碎片" + }, + [42]={ + ["desc"]="获得英雄碎片" + }, + [43]={ + ["desc"]="获得英雄碎片" + }, + [44]={ + ["desc"]="击杀首领" + }, + [45]={ + ["desc"]="击杀首领" + }, + [46]={ + ["desc"]="击杀首领" + }, + [47]={ + ["desc"]="击杀首领" + }, + [48]={ + ["desc"]="击杀小怪" + }, + [49]={ + ["desc"]="击杀小怪" + }, + [50]={ + ["desc"]="击杀小怪" + }, + [51]={ + ["desc"]="击杀小怪" + }, + [52]={ + ["desc"]="累计消除元素" + }, + [53]={ + ["desc"]="累计消除元素" + }, + [54]={ + ["desc"]="累计消除元素" + }, + [55]={ + ["desc"]="累计消除元素" + }, + [56]={ + ["desc"]="6连消次数" + }, + [57]={ + ["desc"]="6连消次数" + }, + [58]={ + ["desc"]="6连消次数" + }, + [59]={ + ["desc"]="6连消次数" + }, + [60]={ + ["desc"]="8连消次数" + }, + [61]={ + ["desc"]="8连消次数" + }, + [62]={ + ["desc"]="8连消次数" + }, + [63]={ + ["desc"]="8连消次数" + }, + [64]={ + ["desc"]="战斗中超过10连击次数" + }, + [65]={ + ["desc"]="战斗中超过10连击次数" + }, + [66]={ + ["desc"]="战斗中超过10连击次数" + }, + [67]={ + ["desc"]="战斗中超过10连击次数" + }, + [68]={ + ["desc"]="战斗中释放技能次数" + }, + [69]={ + ["desc"]="战斗中释放技能次数" + }, + [70]={ + ["desc"]="战斗中释放技能次数" + }, + [71]={ + ["desc"]="战斗中释放技能次数" + }, + [72]={ + ["desc"]="通过战斗波次" + }, + [73]={ + ["desc"]="通过战斗波次" + }, + [74]={ + ["desc"]="通过战斗波次" + }, + [75]={ + ["desc"]="通过战斗波次" + }, + [76]={ + ["desc"]="获得金币" + }, + [77]={ + ["desc"]="获得钻石" + }, + [78]={ + ["desc"]="消耗钻石" + }, + [79]={ + ["desc"]="开启商城任意宝箱" + }, + [80]={ + ["desc"]="开启商城史诗宝箱" + }, + [81]={ + ["desc"]="关卡内打开技能神灯" + }, + [82]={ + ["desc"]="在战斗中获胜" + }, + [83]={ + ["desc"]="升级你的英雄" + }, + [84]={ + ["desc"]="获得英雄碎片" + }, + [85]={ + ["desc"]="击杀首领" + }, + [86]={ + ["desc"]="击杀小怪" + }, + [87]={ + ["desc"]="累计消除元素" + }, + [88]={ + ["desc"]="6连消次数" + }, + [89]={ + ["desc"]="8连消次数" + }, + [90]={ + ["desc"]="战斗中超过10连击次数" + }, + [91]={ + ["desc"]="战斗中释放技能次数" + }, + [92]={ + ["desc"]="通过战斗波次" + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/task.lua.meta b/lua/app/config/strings/cn/task.lua.meta new file mode 100644 index 00000000..acb75638 --- /dev/null +++ b/lua/app/config/strings/cn/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 377c59e44ca929244956e29bf5102a53 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/de/buff.lua b/lua/app/config/strings/de/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/de/buff.lua +++ b/lua/app/config/strings/de/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/de/item.lua b/lua/app/config/strings/de/item.lua index b0fc1100..286f2314 100644 --- a/lua/app/config/strings/de/item.lua +++ b/lua/app/config/strings/de/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/task.lua b/lua/app/config/strings/de/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/de/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/de/task.lua.meta b/lua/app/config/strings/de/task.lua.meta new file mode 100644 index 00000000..28324d9e --- /dev/null +++ b/lua/app/config/strings/de/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 31c4ab50968111747ae7bd5f271711b6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/en/buff.lua b/lua/app/config/strings/en/buff.lua index a9fdbb53..e69c25c3 100644 --- a/lua/app/config/strings/en/buff.lua +++ b/lua/app/config/strings/en/buff.lua @@ -59,9 +59,9 @@ local buff = { ["desc"]="Reduce normal attack hits", ["name"]="normal_attack_dec" }, - [46]={ + [47]={ ["desc"]="The shield can absorb a certain amount of damage, reflect and deal 200% damage back to the enemy", - ["name"]="shield" + ["name"]="shield_rebound_200" } } local keys = { @@ -81,7 +81,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index e84a8a32..6358f098 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -56,6 +56,9 @@ local localization_global = ["CLICK_COPY_ACOUNT_DESC"] = "Click to copy your PlayerID", ["APP"] = "Version:", ["CHAPTER_DESC_1"] = "The Best Record: {0}", + ["ACT_SEVENDAY_TITLE"] = "HAPPY SEVENDAY", + ["BTN_CLAIM"] = "CLAIM", + ["BTN_DONE"] = "GOT", } return localization_global \ No newline at end of file diff --git a/lua/app/config/strings/en/item.lua b/lua/app/config/strings/en/item.lua index 2fa10f58..d3fe5455 100644 --- a/lua/app/config/strings/en/item.lua +++ b/lua/app/config/strings/en/item.lua @@ -25,6 +25,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ ["name"]="Roxy Shard", @@ -60,6 +75,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/task.lua b/lua/app/config/strings/en/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/en/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/en/task.lua.meta b/lua/app/config/strings/en/task.lua.meta new file mode 100644 index 00000000..a912049d --- /dev/null +++ b/lua/app/config/strings/en/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b0fd59c46acd3eb49a4c73ada835ffcb +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/fr/buff.lua b/lua/app/config/strings/fr/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/fr/buff.lua +++ b/lua/app/config/strings/fr/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/fr/item.lua b/lua/app/config/strings/fr/item.lua index e7fddf46..d3ca5f14 100644 --- a/lua/app/config/strings/fr/item.lua +++ b/lua/app/config/strings/fr/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/task.lua b/lua/app/config/strings/fr/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/fr/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/task.lua.meta b/lua/app/config/strings/fr/task.lua.meta new file mode 100644 index 00000000..b6dace19 --- /dev/null +++ b/lua/app/config/strings/fr/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 088e4ec3106f7bf47bede1316999e8ea +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/id/buff.lua b/lua/app/config/strings/id/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/id/buff.lua +++ b/lua/app/config/strings/id/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/id/item.lua b/lua/app/config/strings/id/item.lua index 04f2ceab..7d622997 100644 --- a/lua/app/config/strings/id/item.lua +++ b/lua/app/config/strings/id/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/buff.lua b/lua/app/config/strings/ja/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/ja/buff.lua +++ b/lua/app/config/strings/ja/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/ja/item.lua b/lua/app/config/strings/ja/item.lua index bf3d32f7..de7f9d10 100644 --- a/lua/app/config/strings/ja/item.lua +++ b/lua/app/config/strings/ja/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/task.lua b/lua/app/config/strings/ja/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/ja/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/task.lua.meta b/lua/app/config/strings/ja/task.lua.meta new file mode 100644 index 00000000..f9495651 --- /dev/null +++ b/lua/app/config/strings/ja/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 017495af721781f4d8dcb79c051be1a0 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/ko/buff.lua b/lua/app/config/strings/ko/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/ko/buff.lua +++ b/lua/app/config/strings/ko/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/ko/item.lua b/lua/app/config/strings/ko/item.lua index d51699a7..66f66a6a 100644 --- a/lua/app/config/strings/ko/item.lua +++ b/lua/app/config/strings/ko/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/task.lua b/lua/app/config/strings/ko/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/ko/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/task.lua.meta b/lua/app/config/strings/ko/task.lua.meta new file mode 100644 index 00000000..76b323f0 --- /dev/null +++ b/lua/app/config/strings/ko/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: aa304b73189e7ad4b9dccfc53b1587ac +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/pt/buff.lua b/lua/app/config/strings/pt/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/pt/buff.lua +++ b/lua/app/config/strings/pt/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/pt/item.lua b/lua/app/config/strings/pt/item.lua index 68eddb8e..44e488cc 100644 --- a/lua/app/config/strings/pt/item.lua +++ b/lua/app/config/strings/pt/item.lua @@ -21,6 +21,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -48,6 +63,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/buff.lua b/lua/app/config/strings/ru/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/ru/buff.lua +++ b/lua/app/config/strings/ru/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/ru/item.lua b/lua/app/config/strings/ru/item.lua index 9505cbf1..6458d15a 100644 --- a/lua/app/config/strings/ru/item.lua +++ b/lua/app/config/strings/ru/item.lua @@ -19,6 +19,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -46,6 +61,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/buff.lua b/lua/app/config/strings/th/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/th/buff.lua +++ b/lua/app/config/strings/th/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/th/item.lua b/lua/app/config/strings/th/item.lua index 9505cbf1..6458d15a 100644 --- a/lua/app/config/strings/th/item.lua +++ b/lua/app/config/strings/th/item.lua @@ -19,6 +19,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -46,6 +61,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/buff.lua b/lua/app/config/strings/vi/buff.lua index 8347d4fa..988ea298 100644 --- a/lua/app/config/strings/vi/buff.lua +++ b/lua/app/config/strings/vi/buff.lua @@ -44,8 +44,8 @@ local buff = { [36]={ ["name"]="normal_attack_dec" }, - [46]={ - ["name"]="shield" + [47]={ + ["name"]="shield_rebound_200" } } local keys = { @@ -65,7 +65,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/vi/item.lua b/lua/app/config/strings/vi/item.lua index 4aeba37a..7e50beaa 100644 --- a/lua/app/config/strings/vi/item.lua +++ b/lua/app/config/strings/vi/item.lua @@ -22,6 +22,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ @@ -49,6 +64,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/buff.lua b/lua/app/config/strings/zh/buff.lua index d6acdfb5..a265a0a2 100644 --- a/lua/app/config/strings/zh/buff.lua +++ b/lua/app/config/strings/zh/buff.lua @@ -59,9 +59,9 @@ local buff = { ["desc"]="普攻攻擊次數減少", ["name"]="normal_attack_dec" }, - [46]={ + [47]={ ["desc"]="護盾可抵擋一定的傷害,並有200%反傷", - ["name"]="shield" + ["name"]="shield_rebound_200" } } local keys = { @@ -81,7 +81,7 @@ local keys = { ["stun"]=buff[33], ["shield"]=buff[34], ["normal_attack_dec"]=buff[36], - ["shield"]=buff[46] + ["shield_rebound_200"]=buff[47] } } local config = { diff --git a/lua/app/config/strings/zh/item.lua b/lua/app/config/strings/zh/item.lua index 7b9abb78..90b575af 100644 --- a/lua/app/config/strings/zh/item.lua +++ b/lua/app/config/strings/zh/item.lua @@ -25,6 +25,21 @@ local item = { }, [7]={ + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + }, [12001]={ ["name"]="洛克西英雄碎片", @@ -60,6 +75,6 @@ local item = { } } local config = { -data=item,count=15 +data=item,count=20 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/task.lua b/lua/app/config/strings/zh/task.lua new file mode 100644 index 00000000..334f1161 --- /dev/null +++ b/lua/app/config/strings/zh/task.lua @@ -0,0 +1,282 @@ +local task = { + [1]={ + + }, + [2]={ + + }, + [3]={ + + }, + [4]={ + + }, + [5]={ + + }, + [6]={ + + }, + [7]={ + + }, + [8]={ + + }, + [9]={ + + }, + [10]={ + + }, + [11]={ + + }, + [12]={ + + }, + [13]={ + + }, + [14]={ + + }, + [15]={ + + }, + [16]={ + + }, + [17]={ + + }, + [18]={ + + }, + [19]={ + + }, + [20]={ + + }, + [21]={ + + }, + [22]={ + + }, + [23]={ + + }, + [24]={ + + }, + [25]={ + + }, + [26]={ + + }, + [27]={ + + }, + [28]={ + + }, + [29]={ + + }, + [30]={ + + }, + [31]={ + + }, + [32]={ + + }, + [33]={ + + }, + [34]={ + + }, + [35]={ + + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + + }, + [41]={ + + }, + [42]={ + + }, + [43]={ + + }, + [44]={ + + }, + [45]={ + + }, + [46]={ + + }, + [47]={ + + }, + [48]={ + + }, + [49]={ + + }, + [50]={ + + }, + [51]={ + + }, + [52]={ + + }, + [53]={ + + }, + [54]={ + + }, + [55]={ + + }, + [56]={ + + }, + [57]={ + + }, + [58]={ + + }, + [59]={ + + }, + [60]={ + + }, + [61]={ + + }, + [62]={ + + }, + [63]={ + + }, + [64]={ + + }, + [65]={ + + }, + [66]={ + + }, + [67]={ + + }, + [68]={ + + }, + [69]={ + + }, + [70]={ + + }, + [71]={ + + }, + [72]={ + + }, + [73]={ + + }, + [74]={ + + }, + [75]={ + + }, + [76]={ + + }, + [77]={ + + }, + [78]={ + + }, + [79]={ + + }, + [80]={ + + }, + [81]={ + + }, + [82]={ + + }, + [83]={ + + }, + [84]={ + + }, + [85]={ + + }, + [86]={ + + }, + [87]={ + + }, + [88]={ + + }, + [89]={ + + }, + [90]={ + + }, + [91]={ + + }, + [92]={ + + } +} +local config = { +data=task,count=92 +} +return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/task.lua.meta b/lua/app/config/strings/zh/task.lua.meta new file mode 100644 index 00000000..e5b36d06 --- /dev/null +++ b/lua/app/config/strings/zh/task.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fc6e774792de35c4b8f5530d9fc51a2f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/task.lua b/lua/app/config/task.lua index 81639699..d08c8c9d 100644 --- a/lua/app/config/task.lua +++ b/lua/app/config/task.lua @@ -11,7 +11,8 @@ local task = { ["num"]=10, ["num_for_nothing"]="Vwg=" } - } + }, + ["icon"]="1" }, [2]={ ["type"]=20, @@ -25,7 +26,8 @@ local task = { ["num"]=10, ["num_for_nothing"]="Vwg=" } - } + }, + ["icon"]="20" }, [3]={ ["type"]=21, @@ -39,7 +41,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="21" }, [4]={ ["type"]=2, @@ -53,7 +56,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="2" }, [5]={ ["type"]=2, @@ -67,7 +71,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="2" }, [6]={ ["type"]=2, @@ -81,7 +86,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="2" }, [7]={ ["type"]=2, @@ -95,7 +101,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="2" }, [8]={ ["type"]=3, @@ -110,7 +117,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="3" }, [9]={ ["type"]=3, @@ -125,7 +133,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="3" }, [10]={ ["type"]=3, @@ -140,7 +149,8 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="3" }, [11]={ ["type"]=3, @@ -155,7 +165,8 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="3" }, [12]={ ["type"]=4, @@ -169,7 +180,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="4" }, [13]={ ["type"]=4, @@ -183,7 +195,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="4" }, [14]={ ["type"]=4, @@ -197,7 +210,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="4" }, [15]={ ["type"]=4, @@ -211,7 +225,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="4" }, [16]={ ["type"]=5, @@ -226,7 +241,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="5" }, [17]={ ["type"]=5, @@ -241,7 +257,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="5" }, [18]={ ["type"]=5, @@ -256,7 +273,8 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="5" }, [19]={ ["type"]=5, @@ -271,7 +289,8 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=3 + ["lock"]=3, + ["icon"]="5" }, [20]={ ["type"]=6, @@ -285,7 +304,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="6" }, [21]={ ["type"]=6, @@ -299,7 +319,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="6" }, [22]={ ["type"]=6, @@ -313,7 +334,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="6" }, [23]={ ["type"]=6, @@ -327,7 +349,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="6" }, [24]={ ["type"]=7, @@ -342,7 +365,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [25]={ ["type"]=7, @@ -357,7 +381,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [26]={ ["type"]=7, @@ -372,7 +397,8 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [27]={ ["type"]=7, @@ -387,7 +413,8 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [28]={ ["type"]=8, @@ -402,7 +429,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="8" }, [29]={ ["type"]=8, @@ -417,7 +445,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="8" }, [30]={ ["type"]=8, @@ -432,7 +461,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=5 + ["icon"]="8" }, [31]={ ["type"]=8, @@ -447,7 +476,7 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=5 + ["icon"]="8" }, [32]={ ["type"]=9, @@ -461,7 +490,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="9" }, [33]={ ["type"]=9, @@ -475,7 +505,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="9" }, [34]={ ["type"]=9, @@ -489,7 +520,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="9" }, [35]={ ["type"]=9, @@ -503,7 +535,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="9" }, [36]={ ["type"]=10, @@ -518,7 +551,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=4 + ["lock"]=4, + ["icon"]="10" }, [37]={ ["type"]=10, @@ -533,7 +567,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=4 + ["lock"]=4, + ["icon"]="10" }, [38]={ ["type"]=10, @@ -548,7 +583,7 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=4 + ["icon"]="10" }, [39]={ ["type"]=10, @@ -563,7 +598,7 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=4 + ["icon"]="10" }, [40]={ ["type"]=11, @@ -578,7 +613,8 @@ local task = { ["num_for_nothing"]="Uwg=" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [41]={ ["type"]=11, @@ -593,7 +629,8 @@ local task = { ["num_for_nothing"]="UQ0=" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [42]={ ["type"]=11, @@ -608,7 +645,8 @@ local task = { ["num_for_nothing"]="Vwhc" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [43]={ ["type"]=11, @@ -623,7 +661,8 @@ local task = { ["num_for_nothing"]="VwpZ" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [44]={ ["type"]=12, @@ -637,7 +676,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="12" }, [45]={ ["type"]=12, @@ -651,7 +691,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="12" }, [46]={ ["type"]=12, @@ -665,7 +706,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="12" }, [47]={ ["type"]=12, @@ -679,7 +721,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="12" }, [48]={ ["type"]=13, @@ -693,7 +736,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="13" }, [49]={ ["type"]=13, @@ -707,7 +751,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="13" }, [50]={ ["type"]=13, @@ -721,7 +766,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="13" }, [51]={ ["type"]=13, @@ -735,7 +781,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="13" }, [52]={ ["type"]=14, @@ -749,7 +796,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="14" }, [53]={ ["type"]=14, @@ -763,7 +811,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="14" }, [54]={ ["type"]=14, @@ -777,7 +826,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="14" }, [55]={ ["type"]=14, @@ -791,7 +841,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="14" }, [56]={ ["type"]=15, @@ -805,7 +856,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="15" }, [57]={ ["type"]=15, @@ -819,7 +871,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="15" }, [58]={ ["type"]=15, @@ -833,7 +886,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="15" }, [59]={ ["type"]=15, @@ -847,7 +901,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="15" }, [60]={ ["type"]=16, @@ -861,7 +916,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="16" }, [61]={ ["type"]=16, @@ -875,7 +931,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="16" }, [62]={ ["type"]=16, @@ -889,7 +946,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="16" }, [63]={ ["type"]=16, @@ -903,7 +961,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="16" }, [64]={ ["type"]=17, @@ -917,7 +976,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="17" }, [65]={ ["type"]=17, @@ -931,7 +991,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="17" }, [66]={ ["type"]=17, @@ -945,7 +1006,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="17" }, [67]={ ["type"]=17, @@ -959,7 +1021,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="17" }, [68]={ ["type"]=18, @@ -973,7 +1036,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="18" }, [69]={ ["type"]=18, @@ -987,7 +1051,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="18" }, [70]={ ["type"]=18, @@ -1001,7 +1066,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="18" }, [71]={ ["type"]=18, @@ -1015,7 +1081,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="18" }, [72]={ ["type"]=19, @@ -1029,7 +1096,8 @@ local task = { ["num"]=50, ["num_for_nothing"]="Uwg=" } - } + }, + ["icon"]="19" }, [73]={ ["type"]=19, @@ -1043,7 +1111,8 @@ local task = { ["num"]=75, ["num_for_nothing"]="UQ0=" } - } + }, + ["icon"]="19" }, [74]={ ["type"]=19, @@ -1057,7 +1126,8 @@ local task = { ["num"]=100, ["num_for_nothing"]="Vwhc" } - } + }, + ["icon"]="19" }, [75]={ ["type"]=19, @@ -1071,7 +1141,8 @@ local task = { ["num"]=125, ["num_for_nothing"]="VwpZ" } - } + }, + ["icon"]="19" }, [76]={ ["type"]=2, @@ -1085,7 +1156,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="2" }, [77]={ ["type"]=3, @@ -1100,7 +1172,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=3 + ["icon"]="3" }, [78]={ ["type"]=5, @@ -1115,7 +1187,7 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=3 + ["icon"]="5" }, [79]={ ["type"]=6, @@ -1129,7 +1201,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="6" }, [80]={ ["type"]=7, @@ -1144,7 +1217,8 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=10 + ["lock"]=10, + ["icon"]="7" }, [81]={ ["type"]=8, @@ -1159,7 +1233,8 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="8" }, [82]={ ["type"]=9, @@ -1173,7 +1248,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="9" }, [83]={ ["type"]=10, @@ -1188,7 +1264,8 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=4 + ["lock"]=4, + ["icon"]="10" }, [84]={ ["type"]=11, @@ -1203,7 +1280,8 @@ local task = { ["num_for_nothing"]="Vw1c" } }, - ["lock"]=5 + ["lock"]=5, + ["icon"]="11" }, [85]={ ["type"]=12, @@ -1217,7 +1295,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="12" }, [86]={ ["type"]=13, @@ -1231,7 +1310,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="13" }, [87]={ ["type"]=14, @@ -1245,7 +1325,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="14" }, [88]={ ["type"]=15, @@ -1259,7 +1340,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="15" }, [89]={ ["type"]=16, @@ -1273,7 +1355,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="16" }, [90]={ ["type"]=17, @@ -1287,7 +1370,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="17" }, [91]={ ["type"]=18, @@ -1301,7 +1385,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="18" }, [92]={ ["type"]=19, @@ -1315,7 +1400,8 @@ local task = { ["num"]=150, ["num_for_nothing"]="Vw1c" } - } + }, + ["icon"]="19" } } local config = { diff --git a/lua/app/config/task_daily.lua b/lua/app/config/task_daily.lua index 67728cc0..991d8f84 100644 --- a/lua/app/config/task_daily.lua +++ b/lua/app/config/task_daily.lua @@ -122,7 +122,7 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1 + ["ad_refresh"]=true }, [4]={ ["type"]=1, @@ -227,7 +227,7 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1 + ["ad_refresh"]=true }, [5]={ ["type"]=1, @@ -332,7 +332,7 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1 + ["ad_refresh"]=true }, [6]={ ["type"]=1, @@ -437,7 +437,7 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1 + ["ad_refresh"]=true }, [7]={ ["type"]=1, @@ -552,8 +552,8 @@ local task_daily = { 100 } }, - ["ad_refresh"]=1, - ["bounty"]=1 + ["ad_refresh"]=true, + ["bounty"]=true }, [9]={ ["type"]=2, @@ -684,7 +684,7 @@ local task_daily = { 100 } }, - ["bounty"]=1 + ["bounty"]=true }, [16]={ ["type"]=2, @@ -703,7 +703,7 @@ local task_daily = { 100 } }, - ["bounty"]=1 + ["bounty"]=true } } local config = { diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 0f1efeb8..a02ffdb9 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -1,5 +1,7 @@ local GConst = {} +GConst.NOT_VISIBLE_POS = 10000000000 + local CONST_PATHS = { StageConst = "app/module/stage/stage_const", ItemConst = "app/module/item/item_const", @@ -178,6 +180,7 @@ GConst.ATLAS_PATH = { ICON_BUFF = "assets/arts/atlas/icon/buff.asset", BOUNTY = "assets/arts/atlas/ui/bounty.asset", UI_SETTING = "assets/arts/atlas/ui/setting.asset", + ICON_TASK = "assets/arts/atlas/icon/task.asset", } GConst.TOUCH_EVENT = { diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index a9868109..b724d94f 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -7,14 +7,12 @@ local ProtoMsgType = { [132244689] = "ChapterSettlementRsp", [147147672] = "EnergyByADReq", [147149505] = "EnergyByADRsp", + [349009610] = "TriggerGrowUpGiftNtf", [516281556] = "GuideFundMarkReq", [516283389] = "GuideFundMarkRsp", [531558517] = "PigPlayUpdateNtf", [554454681] = "EnergyByDiamondReq", [554456514] = "EnergyByDiamondRsp", - [565555292] = "MallPayNtf", - [565621982] = "MallPayReq", - [565623815] = "MallPayRsp", [613793796] = "WatchADReq", [613795629] = "WatchADRsp", [1008447203] = "DeleteReq", @@ -23,15 +21,12 @@ local ProtoMsgType = { [1068771132] = "ReconnectRsp", [1070841461] = "LoginReq", [1070843294] = "LoginRsp", - [1115038364] = "BattlePassBoughtNtf", - [1122994860] = "AdFreeDailyGiftReq", - [1122996693] = "AdFreeDailyGiftRsp", [1471116409] = "BindReq", [1471118242] = "BindRsp", [1473507638] = "TaskTutorRewardReq", [1473509471] = "TaskTutorRewardRsp", - [1531033914] = "BattlePassRewardReq", - [1531035747] = "BattlePassRewardRsp", + [1584689751] = "ActPaidResultReq", + [1584691584] = "ActPaidResultRsp", [1666427920] = "MailDeleteReq", [1666429753] = "MailDeleteRsp", [1901321540] = "PipedReq", @@ -47,36 +42,42 @@ local ProtoMsgType = { [2581182822] = "MailListRsp", [2620369240] = "SevenDayRewardReq", [2620371073] = "SevenDayRewardRsp", - [2717079533] = "MallPaidResultReq", - [2717081366] = "MallPaidResultRsp", [2731281392] = "MailExtractReq", [2731283225] = "MailExtractRsp", [2849800229] = "MailReadReq", [2849802062] = "MailReadRsp", + [3003864530] = "ActTriggerGiftNtf", + [3038151923] = "TaskDailyRefreshReq", + [3038153756] = "TaskDailyRefreshRsp", [3062745642] = "FundAwardReq", [3062747475] = "FundAwardRsp", + [3137310682] = "ActPayNtf", + [3137377372] = "ActPayReq", + [3137379205] = "ActPayRsp", [3190730044] = "KickOutNtf", [3224230499] = "SevenDayTaskRewardReq", [3224232332] = "SevenDayTaskRewardRsp", [3309820798] = "HeroPutOnReq", [3309822631] = "HeroPutOnRsp", - [3370485095] = "MonCardRewardReq", - [3370486928] = "MonCardRewardRsp", + [3341173994] = "BountyBoughtNtf", + [3363939655] = "TaskDailyAdReq", + [3363941488] = "TaskDailyAdRsp", [3421843875] = "TaskDailyRewardReq", [3421845708] = "TaskDailyRewardRsp", [3440328467] = "PigLevelUpNtf", - [3450440933] = "BattlePassTaskRewardReq", - [3450442766] = "BattlePassTaskRewardRsp", [3607879254] = "AuthReq", [3607881087] = "AuthRsp", [3624439233] = "NewMailNtf", + [3757169544] = "BountyRewardReq", + [3757171377] = "BountyRewardRsp", [3763117270] = "HeartbeatReq", [3763119103] = "HeartbeatRsp", - [3846223098] = "MallActTriggerGiftNtf", [3904148760] = "GMReq", [3904150593] = "GMRsp", [3933875617] = "ChapterStartReq", [3933877450] = "ChapterStartRsp", + [4106156009] = "BountyLevelUnlockReq", + [4106157842] = "BountyLevelUnlockRsp", [4256333947] = "ExistReq", [4256335780] = "ExistRsp", }, @@ -88,14 +89,12 @@ local ProtoMsgType = { ChapterSettlementRsp = 132244689, EnergyByADReq = 147147672, EnergyByADRsp = 147149505, + TriggerGrowUpGiftNtf = 349009610, GuideFundMarkReq = 516281556, GuideFundMarkRsp = 516283389, PigPlayUpdateNtf = 531558517, EnergyByDiamondReq = 554454681, EnergyByDiamondRsp = 554456514, - MallPayNtf = 565555292, - MallPayReq = 565621982, - MallPayRsp = 565623815, WatchADReq = 613793796, WatchADRsp = 613795629, DeleteReq = 1008447203, @@ -104,15 +103,12 @@ local ProtoMsgType = { ReconnectRsp = 1068771132, LoginReq = 1070841461, LoginRsp = 1070843294, - BattlePassBoughtNtf = 1115038364, - AdFreeDailyGiftReq = 1122994860, - AdFreeDailyGiftRsp = 1122996693, BindReq = 1471116409, BindRsp = 1471118242, TaskTutorRewardReq = 1473507638, TaskTutorRewardRsp = 1473509471, - BattlePassRewardReq = 1531033914, - BattlePassRewardRsp = 1531035747, + ActPaidResultReq = 1584689751, + ActPaidResultRsp = 1584691584, MailDeleteReq = 1666427920, MailDeleteRsp = 1666429753, PipedReq = 1901321540, @@ -128,36 +124,42 @@ local ProtoMsgType = { MailListRsp = 2581182822, SevenDayRewardReq = 2620369240, SevenDayRewardRsp = 2620371073, - MallPaidResultReq = 2717079533, - MallPaidResultRsp = 2717081366, MailExtractReq = 2731281392, MailExtractRsp = 2731283225, MailReadReq = 2849800229, MailReadRsp = 2849802062, + ActTriggerGiftNtf = 3003864530, + TaskDailyRefreshReq = 3038151923, + TaskDailyRefreshRsp = 3038153756, FundAwardReq = 3062745642, FundAwardRsp = 3062747475, + ActPayNtf = 3137310682, + ActPayReq = 3137377372, + ActPayRsp = 3137379205, KickOutNtf = 3190730044, SevenDayTaskRewardReq = 3224230499, SevenDayTaskRewardRsp = 3224232332, HeroPutOnReq = 3309820798, HeroPutOnRsp = 3309822631, - MonCardRewardReq = 3370485095, - MonCardRewardRsp = 3370486928, + BountyBoughtNtf = 3341173994, + TaskDailyAdReq = 3363939655, + TaskDailyAdRsp = 3363941488, TaskDailyRewardReq = 3421843875, TaskDailyRewardRsp = 3421845708, PigLevelUpNtf = 3440328467, - BattlePassTaskRewardReq = 3450440933, - BattlePassTaskRewardRsp = 3450442766, AuthReq = 3607879254, AuthRsp = 3607881087, NewMailNtf = 3624439233, + BountyRewardReq = 3757169544, + BountyRewardRsp = 3757171377, HeartbeatReq = 3763117270, HeartbeatRsp = 3763119103, - MallActTriggerGiftNtf = 3846223098, GMReq = 3904148760, GMRsp = 3904150593, ChapterStartReq = 3933875617, ChapterStartRsp = 3933877450, + BountyLevelUnlockReq = 4106156009, + BountyLevelUnlockRsp = 4106157842, ExistReq = 4256333947, ExistRsp = 4256335780, }, @@ -169,14 +171,12 @@ local ProtoMsgType = { ChapterSettlementRsp = "ChapterSettlementRsp", EnergyByADReq = "EnergyByADReq", EnergyByADRsp = "EnergyByADRsp", + TriggerGrowUpGiftNtf = "TriggerGrowUpGiftNtf", GuideFundMarkReq = "GuideFundMarkReq", GuideFundMarkRsp = "GuideFundMarkRsp", PigPlayUpdateNtf = "PigPlayUpdateNtf", EnergyByDiamondReq = "EnergyByDiamondReq", EnergyByDiamondRsp = "EnergyByDiamondRsp", - MallPayNtf = "MallPayNtf", - MallPayReq = "MallPayReq", - MallPayRsp = "MallPayRsp", WatchADReq = "WatchADReq", WatchADRsp = "WatchADRsp", DeleteReq = "DeleteReq", @@ -185,15 +185,12 @@ local ProtoMsgType = { ReconnectRsp = "ReconnectRsp", LoginReq = "LoginReq", LoginRsp = "LoginRsp", - BattlePassBoughtNtf = "BattlePassBoughtNtf", - AdFreeDailyGiftReq = "AdFreeDailyGiftReq", - AdFreeDailyGiftRsp = "AdFreeDailyGiftRsp", BindReq = "BindReq", BindRsp = "BindRsp", TaskTutorRewardReq = "TaskTutorRewardReq", TaskTutorRewardRsp = "TaskTutorRewardRsp", - BattlePassRewardReq = "BattlePassRewardReq", - BattlePassRewardRsp = "BattlePassRewardRsp", + ActPaidResultReq = "ActPaidResultReq", + ActPaidResultRsp = "ActPaidResultRsp", MailDeleteReq = "MailDeleteReq", MailDeleteRsp = "MailDeleteRsp", PipedReq = "PipedReq", @@ -209,36 +206,42 @@ local ProtoMsgType = { MailListRsp = "MailListRsp", SevenDayRewardReq = "SevenDayRewardReq", SevenDayRewardRsp = "SevenDayRewardRsp", - MallPaidResultReq = "MallPaidResultReq", - MallPaidResultRsp = "MallPaidResultRsp", MailExtractReq = "MailExtractReq", MailExtractRsp = "MailExtractRsp", MailReadReq = "MailReadReq", MailReadRsp = "MailReadRsp", + ActTriggerGiftNtf = "ActTriggerGiftNtf", + TaskDailyRefreshReq = "TaskDailyRefreshReq", + TaskDailyRefreshRsp = "TaskDailyRefreshRsp", FundAwardReq = "FundAwardReq", FundAwardRsp = "FundAwardRsp", + ActPayNtf = "ActPayNtf", + ActPayReq = "ActPayReq", + ActPayRsp = "ActPayRsp", KickOutNtf = "KickOutNtf", SevenDayTaskRewardReq = "SevenDayTaskRewardReq", SevenDayTaskRewardRsp = "SevenDayTaskRewardRsp", HeroPutOnReq = "HeroPutOnReq", HeroPutOnRsp = "HeroPutOnRsp", - MonCardRewardReq = "MonCardRewardReq", - MonCardRewardRsp = "MonCardRewardRsp", + BountyBoughtNtf = "BountyBoughtNtf", + TaskDailyAdReq = "TaskDailyAdReq", + TaskDailyAdRsp = "TaskDailyAdRsp", TaskDailyRewardReq = "TaskDailyRewardReq", TaskDailyRewardRsp = "TaskDailyRewardRsp", PigLevelUpNtf = "PigLevelUpNtf", - BattlePassTaskRewardReq = "BattlePassTaskRewardReq", - BattlePassTaskRewardRsp = "BattlePassTaskRewardRsp", AuthReq = "AuthReq", AuthRsp = "AuthRsp", NewMailNtf = "NewMailNtf", + BountyRewardReq = "BountyRewardReq", + BountyRewardRsp = "BountyRewardRsp", HeartbeatReq = "HeartbeatReq", HeartbeatRsp = "HeartbeatRsp", - MallActTriggerGiftNtf = "MallActTriggerGiftNtf", GMReq = "GMReq", GMRsp = "GMRsp", ChapterStartReq = "ChapterStartReq", ChapterStartRsp = "ChapterStartRsp", + BountyLevelUnlockReq = "BountyLevelUnlockReq", + BountyLevelUnlockRsp = "BountyLevelUnlockRsp", ExistReq = "ExistReq", ExistRsp = "ExistRsp", }, diff --git a/lua/app/ui/task/cell.meta b/lua/app/ui/task/cell.meta new file mode 100644 index 00000000..7084c886 --- /dev/null +++ b/lua/app/ui/task/cell.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 951e72c77966f2d45ad9606e7773a7a0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/ui/task/cell/daily_task_cell.lua b/lua/app/ui/task/cell/daily_task_cell.lua new file mode 100644 index 00000000..8beb672f --- /dev/null +++ b/lua/app/ui/task/cell/daily_task_cell.lua @@ -0,0 +1,94 @@ +local DailyTaskCell = class("DailyTaskCell", BaseCell) + +function DailyTaskCell:init() + local uiMap = self.baseObject:genAllChildren() + self.icon = uiMap["task_cell.icon"] + self.nameTx = uiMap["task_cell.name_tx"] + self.progressBg = uiMap["task_cell.progress_bg"] + self.progress = uiMap["task_cell.progress_bg.progress"] + self.progressTx = uiMap["task_cell.progress_bg.progress_tx"] + self.getBtn = uiMap["task_cell.get_btn"] + self.getBtn:addClickListener(function() + end) + self.getBtnTx = uiMap["task_cell.get_btn.text"] + self.getBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) + self.refreshBtn = uiMap["task_cell.refresh_btn"] + self.refreshBtn:addClickListener(function() + end) + self.refreshBtnTx = uiMap["task_cell.refresh_btn.text"] + self.refreshBtnTx:setText("临时文本:刷新") + self.rewardCellComp = uiMap["task_cell.reward_cell"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL) + self.lockNode = uiMap["task_cell.lock_node"] + self.lockBg = uiMap["task_cell.lock_bg"] + self.lockBtn = uiMap["task_cell.lock_node.lock_btn"] + self.lockBtnTx = uiMap["task_cell.lock_node.lock_btn.text"] + self.lockTx = uiMap["task_cell.lock_node.lock_tx"] + self.lockBtn:addClickListener(function() + end) + self.lockBtnTx:setText("临时文本:解锁") + self.lockTx:setText("临时文本:通行证专属任务") + self.completeNode = uiMap["task_cell.complete"] + self.completeTx = uiMap["task_cell.complete.text"] + self.completeTx:setText("临时文本:已完成") +end + +function DailyTaskCell:refresh(task) + local icon = DataManager.TaskData:getDailyTaskIcon(task.id) + self.icon:setSprite(GConst.ATLAS_PATH.ICON_TASK, icon) + local taskDesc = DataManager.TaskData:getDailyTaskDesc(task.id) + self.nameTx:setText(taskDesc) + + if task.lock then + self.lockNode:setVisible(true) + self.lockBg:setVisible(true) + self.progressBg:setVisible(false) + self.refreshBtn:setVisible(false) + self.getBtn:setVisible(false) + self.completeNode:setVisible(false) + else + if task.lock == nil then + self.lockBg:setVisible(false) + else + self.lockBg:setVisible(true) + end + self.lockNode:setVisible(false) + self.progressBg:setVisible(true) + local count = task.progress + local needCount = task.needProgress + if task.claimed then -- 已经领过了 + self.completeNode:setVisible(true) + self.getBtn:setVisible(false) + self.refreshBtn:setVisible(false) + if count >= needCount then + count = needCount + end + else + self.completeNode:setVisible(false) + if count >= needCount then + count = needCount + self.getBtn:setVisible(true) + self.refreshBtn:setVisible(false) + else + self.getBtn:setVisible(false) + local canRefresh = DataManager.TaskData:getDailyTaskCanRefresh(task.id) + if canRefresh then + if task.refresh then -- 刷过了 + self.refreshBtn:setVisible(false) + else + self.refreshBtn:setVisible(true) + end + else + self.refreshBtn:setVisible(false) + end + end + end + self.progressTx:setText(count .. "/" .. needCount) + self.progress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = count/needCount + end + local reward = DataManager.TaskData:getDailyTaskReward(task.id) + if reward and reward[1] then + self.rewardCellComp:refreshByConfig(reward[1]) + end +end + +return DailyTaskCell \ No newline at end of file diff --git a/lua/app/ui/task/cell/daily_task_cell.lua.meta b/lua/app/ui/task/cell/daily_task_cell.lua.meta new file mode 100644 index 00000000..fcc0e837 --- /dev/null +++ b/lua/app/ui/task/cell/daily_task_cell.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 0572054d8a4e79f438080b6e63c2643c +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/task/task_main_ui.lua b/lua/app/ui/task/task_main_ui.lua index c6689873..6f0bb621 100644 --- a/lua/app/ui/task/task_main_ui.lua +++ b/lua/app/ui/task/task_main_ui.lua @@ -1,6 +1,56 @@ local TaskMainUI = class("TaskMainUI", BaseUI) -function TaskMainUI:ctor() +local PAGE_DAILY = 1 +local PAGE_CHALLENGE = 2 +local TASK_TYPE_DAILY = 1 +local DAILY_TASK_CELL = "app/ui/task/cell/daily_task_cell" + +local function sortTask(taskList) + table.sort(taskList, function(a, b) + if a.claimed == b.claimed then + if a.claimed then + return a.id < b.id + else + local completeA = a.progress >= a.needProgress + local completeB = b.progress >= b.needProgress + if completeA == completeB then + if completeA then + return a.id < b.id + else -- 没有完成的优先显示战令解锁 + if a.bountyLock == b.bountyLock then + return a.id < b.id + else + return a.bountyLock + end + end + else + return completeA + end + end + else + return b.claimed + end + end) +end + +function TaskMainUI:ctor(params) + self.page = params and params.page or PAGE_DAILY + self.dailyTaskList = {} + self.challengeTaskList = {} + local taskAdId = DataManager.TaskData:getDailyTaskAdId() + local taskFinalId = DataManager.TaskData:getDailyTaskFinalId() + local dailyTasks = DataManager.TaskData:getDailyTaskList() + for k, v in ipairs(dailyTasks) do + if k ~= taskAdId and k ~= taskFinalId then + if v.type == TASK_TYPE_DAILY then + table.insert(self.dailyTaskList, v) + else + table.insert(self.challengeTaskList, v) + end + end + end + sortTask(self.dailyTaskList) + sortTask(self.challengeTaskList) end function TaskMainUI:isFullScreen() @@ -16,6 +66,191 @@ function TaskMainUI:onLoadRootComplete() self.uiMap["task_main_ui.bg.close_btn"]:addClickListener(function() self:closeUI() end) + + self:initTitle() + self:initPage() + self:initCountDown() + self:bindData() + self:scheduleGlobal(function() + self:updateTime() + end) +end + +function TaskMainUI:initTitle() + self.titleTx = self.uiMap["task_main_ui.bg.title"] + self.titleTx:setText("临时文本:任务") +end + +function TaskMainUI:initPage() + self.menuOne = self.uiMap["task_main_ui.bg.menu_1"] + self.menuOne:addClickListener(function() + self:switchPage(PAGE_DAILY) + end) + self.menuOneOn = self.uiMap["task_main_ui.bg.menu_1.on"] + self.menuOneOff = self.uiMap["task_main_ui.bg.menu_1.off"] + local menuOneOnTx = self.uiMap["task_main_ui.bg.menu_1.on.text"] + menuOneOnTx:setText("临时文本:日常") + local menuOneOffTx = self.uiMap["task_main_ui.bg.menu_1.off.text"] + menuOneOffTx:setText("临时文本:日常") + + self.menuTwo = self.uiMap["task_main_ui.bg.menu_2"] + self.menuTwo:addClickListener(function() + self:switchPage(PAGE_CHALLENGE) + end) + self.menuTwoOn = self.uiMap["task_main_ui.bg.menu_2.on"] + self.menuTwoOff = self.uiMap["task_main_ui.bg.menu_2.off"] + local menuTwoOnTx = self.uiMap["task_main_ui.bg.menu_2.on.text"] + menuTwoOnTx:setText("临时文本:挑战") + local menuTwoOffTx = self.uiMap["task_main_ui.bg.menu_2.off.text"] + menuTwoOffTx:setText("临时文本:挑战") + self:initDaily() + self:initChallenge() +end + +function TaskMainUI:initDaily() + self.dailyNode = self.uiMap["task_main_ui.bg.daily"] + self:initDailyTaskAdCell() + self:initDailyTaskFinalCell() + self:initDailyTasks() +end + +function TaskMainUI:initDailyTaskAdCell() + self.dailyTaskAdCellNameTx = self.uiMap["task_main_ui.bg.daily.task_ad_cell.name_tx"] + self.dailyTaskAdCellProgress = self.uiMap["task_main_ui.bg.daily.task_ad_cell.progress"] + self.dailyTaskAdCellProgressTx = self.uiMap["task_main_ui.bg.daily.task_ad_cell.progress_tx"] + self.dailyTaskAdCellBox = self.uiMap["task_main_ui.bg.daily.task_ad_cell.box"] + self.dailyTaskAdCellBox:addClickListener(function() + + end) + self.dailyTaskAdCellBoxInfo = self.uiMap["task_main_ui.bg.daily.task_ad_cell.box.info"] +end + +function TaskMainUI:initDailyTaskFinalCell() + self.dailyTaskFinalCellNameTx = self.uiMap["task_main_ui.bg.daily.task_final_cell.name_tx"] + self.dailyTaskFinalCellProgress = self.uiMap["task_main_ui.bg.daily.task_final_cell.progress"] + self.dailyTaskFinalCellProgressTx = self.uiMap["task_main_ui.bg.daily.task_final_cell.progress_tx"] + self.dailyTaskFinalCellBox = self.uiMap["task_main_ui.bg.daily.task_final_cell.box"] + self.dailyTaskFinalCellBox:addClickListener(function() + + end) + self.dailyTaskFinalCellBoxInfo = self.uiMap["task_main_ui.bg.daily.task_final_cell.box.info"] +end + +function TaskMainUI:initDailyTasks() + self.dailyTaskScrollRect = self.uiMap["task_main_ui.bg.daily.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.dailyTaskScrollRect:addInitCallback(function() + return DAILY_TASK_CELL + end) + self.dailyTaskScrollRect:addRefreshCallback(function(index, cell) + cell:refresh(self.dailyTaskList[index]) + end) + self.dailyTaskScrollRect:clearCells() + self.dailyTaskScrollRect:refillCells(#self.dailyTaskList) +end + +function TaskMainUI:initChallenge() + self.challengeNode = self.uiMap["task_main_ui.bg.challenge"] + self:initChallengeTasks() +end + +function TaskMainUI:initChallengeTasks() + self.challengeTaskScrollRect = self.uiMap["task_main_ui.bg.challenge.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.challengeTaskScrollRect:addInitCallback(function() + return DAILY_TASK_CELL + end) + self.challengeTaskScrollRect:addRefreshCallback(function(index, cell) + cell:refresh(self.challengeTaskList[index]) + end) + self.challengeTaskScrollRect:clearCells() + self.challengeTaskScrollRect:refillCells(#self.challengeTaskList) +end + +function TaskMainUI:initCountDown() + local helpBtn = self.uiMap["task_main_ui.bg.time_btn"] + helpBtn:addClickListener(function() + self:showHelp() + end) + self.timeTx = self.uiMap["task_main_ui.bg.time_tx"] +end + +function TaskMainUI:bindData() + self:bind(DataManager.TaskData, "dailyTaskDirty", function() + self:refreshDaily() + end) +end + +function TaskMainUI:onRefresh() + self:switchPage(self.page) +end + +function TaskMainUI:switchPage(page) + if page == PAGE_DAILY then + self.menuOneOn:setVisible(true) + self.menuOneOff:setVisible(false) + self.menuTwoOn:setVisible(false) + self.menuTwoOff:setVisible(true) + self.dailyNode:setAnchoredPositionX(0) + self.challengeNode:setAnchoredPositionX(GConst.NOT_VISIBLE_POS) + self:refreshDaily() + else + self.menuOneOn:setVisible(false) + self.menuOneOff:setVisible(true) + self.menuTwoOn:setVisible(true) + self.menuTwoOff:setVisible(false) + self.dailyNode:setAnchoredPositionX(GConst.NOT_VISIBLE_POS) + self.challengeNode:setAnchoredPositionX(0) + self:refreshChallenge() + end +end + +function TaskMainUI:refreshDaily() + self:refreshDailyTaskAdCell() + self:refreshDailyTaskFinalCell() +end + +function TaskMainUI:refreshDailyTaskAdCell() + local taskId = DataManager.TaskData:getDailyTaskAdId() + local taskDesc = DataManager.TaskData:getDailyTaskDesc(taskId) + self.dailyTaskAdCellNameTx:setText(taskDesc) + local count, needCount = DataManager.TaskData:getDailyTaskProgress(taskId) + if count > needCount then + count = needCount + end + self.dailyTaskAdCellProgressTx:setText(count .. "/" .. needCount) + self.dailyTaskAdCellProgress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = count/needCount +end + +function TaskMainUI:refreshDailyTaskFinalCell() + local taskId = DataManager.TaskData:getDailyTaskFinalId() + local taskDesc = DataManager.TaskData:getDailyTaskDesc(taskId) + self.dailyTaskFinalCellNameTx:setText(taskDesc) + local count, needCount = DataManager.TaskData:getDailyTaskProgress(taskId) + if count > needCount then + count = needCount + end + self.dailyTaskFinalCellProgressTx:setText(count .. "/" .. needCount) + self.dailyTaskFinalCellProgress:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = count/needCount +end + +function TaskMainUI:refreshChallenge() + +end + +function TaskMainUI:showHelp() + if self.page == PAGE_DAILY then + + else + + end +end + +function TaskMainUI:updateTime() + local time = DataManager.TaskData:getDailyResetTime() + if self.resetTime == time then + return + end + self.resetTime = time + self.timeTx:setText(GFunc.getTimeStrWithHMS2(self.resetTime)) end return TaskMainUI \ No newline at end of file diff --git a/lua/app/userdata/task/task_data.lua b/lua/app/userdata/task/task_data.lua index 7227b1fa..9ccb4701 100644 --- a/lua/app/userdata/task/task_data.lua +++ b/lua/app/userdata/task/task_data.lua @@ -1,10 +1,132 @@ local TaskData = class("TaskData", BaseData) +local DAILY_TASK_AD_ID = 1 +local DAILY_TASK_FINAL_ID = 2 + +function TaskData:ctor() + self.data.dailyTaskDirty = false +end + function TaskData:init(data) + local tasks = data and data.tasks + local cfg = self:getDailyTaskCfg() + local taskCfg = self:getTaskCfg() + self.dailyTaskList = {} + for k, v in pairs(cfg) do + local task = tasks and tasks[k] or GConst.EMPTY_TABLE + local taskInfo = taskCfg[task.task_id] + if taskInfo then + local dailyTaskObj = { + id = k, + taskId = task.task_id, + progress = task.progress, + needProgress = taskInfo.number, + refresh = task.refresh, + claimed = task.claimed, + type = v.type + } + if v.bounty then + dailyTaskObj.lock = true + end + table.insert(self.dailyTaskList, dailyTaskObj) + end + end end function TaskData:getIsOpen() return ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TASK, true) end +function TaskData:getDailyResetTime() + return 86400 - Time:getServerTime() % 86400 +end + +function TaskData:getDailyTaskAdId() + return DAILY_TASK_AD_ID +end + +function TaskData:getDailyTaskFinalId() + return DAILY_TASK_FINAL_ID +end + +function TaskData:markDailyTaskDirty() + self.data.dailyTaskDirty = not self.data.dailyTaskDirty +end + +function TaskData:getDailyTaskProgress(id) + local task = self.dailyTaskList[id] + if task == nil then + return 0, 1 + end + return task.progress, task.needProgress +end + +function TaskData:getDailyTaskDesc(id) + local task = self.dailyTaskList[id] + if task == nil then + return GConst.EMPTY_STRING + end + local cfg = self:getTaskI18NCfg() + return cfg[task.taskId].desc +end + +function TaskData:getDailyTaskIsLock(id) + local task = self.dailyTaskList[id] + if task == nil then + return nil + end + return task.lock +end + +function TaskData:getDailyTaskCanRefresh(id) + local cfg = self:getDailyTaskCfg()[id] + if cfg == nil then + return false + end + return cfg.ad_refresh +end + +function TaskData:getDailyTaskIcon(id) + local task = self.dailyTaskList[id] + if task == nil then + return GConst.EMPTY_STRING + end + local cfg = self:getTaskCfg() + return cfg[task.taskId].icon +end + +function TaskData:getDailyTaskReward(id) + local task = self.dailyTaskList[id] + if task == nil then + return GConst.EMPTY_STRING + end + local cfg = self:getTaskCfg() + return cfg[task.taskId].reward +end + +function TaskData:getDailyTaskList() + return self.dailyTaskList +end + +function TaskData:getTaskI18NCfg() + if self.taskI18NCfg == nil then + self.taskI18NCfg = I18N:getConfig("task") + end + return self.taskI18NCfg +end + +function TaskData:getTaskCfg() + if self.taskCfg == nil then + self.taskCfg = ConfigManager:getConfig("task") + end + return self.taskCfg +end + +function TaskData:getDailyTaskCfg() + if self.dailyTaskCfg == nil then + self.dailyTaskCfg = ConfigManager:getConfig("task_daily") + end + return self.dailyTaskCfg +end + return TaskData \ No newline at end of file