diff --git a/assets/.maay/control.json b/assets/.maay/control.json index 528498a..e4c104d 100644 --- a/assets/.maay/control.json +++ b/assets/.maay/control.json @@ -390,7 +390,7 @@ } }, { - "name": "活动:复兴乌卢鲁运动会 13 艰难", + "name": "活动:复兴乌卢鲁运动会 13 艰难(活动已结束)", "task": "RevivalTheUluruGames", "option": [ "combat_times", @@ -408,6 +408,26 @@ "next": "ActivityStageDifficulty" } } + }, + { + "name": "活动:朔日手记 19 艰难", + "task": "NotesOnShuoRi", + "option": [ + "combat_times", + "all_in", + "eat_candy_within_24h" + ], + "provide": { + "EnterTheShow": { + "next": "NotesOnShuoRi" + }, + "TargetStageName": { + "text": "19" + }, + "StageDifficulty": { + "next": "ActivityStageDifficulty" + } + } } ] } \ No newline at end of file diff --git a/assets/resource/image/Combat/Activity/NotesOnShuoRiEnterTheShow.png b/assets/resource/image/Combat/Activity/NotesOnShuoRiEnterTheShow.png new file mode 100644 index 0000000..d63ea8f Binary files /dev/null and b/assets/resource/image/Combat/Activity/NotesOnShuoRiEnterTheShow.png differ diff --git a/assets/resource/image/Combat/Activity/NotesOnShuoRiMainChapter.png b/assets/resource/image/Combat/Activity/NotesOnShuoRiMainChapter.png new file mode 100644 index 0000000..8d514fa Binary files /dev/null and b/assets/resource/image/Combat/Activity/NotesOnShuoRiMainChapter.png differ diff --git a/assets/resource/pipeline/activity/NotesOnShuoRi.json b/assets/resource/pipeline/activity/NotesOnShuoRi.json new file mode 100644 index 0000000..c927794 --- /dev/null +++ b/assets/resource/pipeline/activity/NotesOnShuoRi.json @@ -0,0 +1,35 @@ +{ + "NotesOnShuoRi": { + "next": [ + "NotesOnShuoRiEnterTheShow", + "Sub_StartUp" + ] + }, + "NotesOnShuoRiEnterTheShow": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/NotesOnShuoRiEnterTheShow.png", + "roi": [ + 872, + 119, + 333, + 178 + ], + "action": "Click", + "post_wait_freezes": 1, + "next": [ + "NotesOnShuoRiMainChapter" + ] + }, + "NotesOnShuoRiMainChapter": { + "recognition": "TemplateMatch", + "template": "Combat/Activity/NotesOnShuoRiMainChapter.png", + "roi": [ + 1029, + 569, + 243, + 140 + ], + "action": "Click", + "next": "SwipeLeftAndFindStage" + } +} \ No newline at end of file diff --git a/source/cli/main.cpp b/source/cli/main.cpp index 305e00d..11706a3 100644 --- a/source/cli/main.cpp +++ b/source/cli/main.cpp @@ -280,6 +280,14 @@ json::value combat_param(int index) difficulty = "ActivityStageDifficulty"; times = "1"; break; + + case 22: + //"22. 活动:朔日手记 19 艰难\n" + chapter = "NotesOnShuoRi"; + stage = "19"; + difficulty = "ActivityStageDifficulty"; + times = "1"; + break; } return param; @@ -391,7 +399,8 @@ bool proc_argv(const std::filesystem::path& config_path, int argc, char** argv, "18. 活动:绿湖噩梦 17 艰难(活动已结束)\n" "19. 活动:行至摩卢旁卡 16 艰难(活动已结束)\n" "20. 活动:洞穴的囚徒 证明启示 05(活动已结束)\n" - "21. 活动:复兴乌卢鲁运动会 13 艰难\n") + "21. 活动:复兴乌卢鲁运动会 13 艰难(活动已结束)\n" + "22. 活动:朔日手记 19 艰难\n") << std::endl << std::endl << utf8_to_crt("请输入要执行的任务序号,可自定义顺序,以空格分隔,例如 1 2 4 12 3: ") << std::endl; @@ -466,6 +475,11 @@ bool proc_argv(const std::filesystem::path& config_path, int argc, char** argv, task_obj.param = combat_param(id); break; + case 22: + task_obj.type = "NotesOnShuoRi"; + task_obj.param = combat_param(id); + break; + default: std::cout << "Unknown task: " << id << std::endl; return false;