diff --git a/resource/tasks.json b/resource/tasks.json index be7313e84c..6ad3d26c14 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -13,6 +13,184 @@ "StageSNFlag" ] }, + "1-7": { + "algorithm": "justreturn", + "action": "doNothing", + "next": [ + "StageThemeTo1-7", + "StageThemeEpisode3ToEpisode1To1-7", + "StageThemeEpisode2ToEpisode1To1-7", + "StageThemeEpisode1To1-7", + "Stage1-7" + ] + }, + "StageThemeTo1-7": { + "template": "StageTheme.png", + "roi": [ + 200, + 640, + 300, + 60 + ], + "action": "clickSelf", + "next": [ + "StageThemeChapter3ToChapter2To1-7" + ] + }, + "StageThemeChapter3ToChapter2To1-7": { + "algorithm": "OcrDetect", + "action": "clickSelf", + "text": [ + "幻灭" + ], + "roi": [ + 200, + 120, + 80, + 32 + ], + "cache": false, + "next": [ + "StageThemeChapter2ToChapter1To1-7" + ] + }, + "StageThemeChapter2ToChapter1To1-7": { + "algorithm": "OcrDetect", + "action": "clickSelf", + "text": [ + "觉醒" + ], + "roi": [ + 200, + 120, + 80, + 32 + ], + "cache": false, + "next": [ + "StageThemeEpisode3ToEpisode1To1-7", + "StageThemeEpisode2ToEpisode1To1-7", + "StageThemeEpisode1To1-7" + ] + }, + "StageThemeEpisode3ToEpisode1To1-7": { + "action": "clickSelf", + "roi": [ + 250, + 320, + 155, + 200 + ], + "cache": false, + "next": [ + "Stage1-7", + "SwipeLeftToStage1-7", + "SwipeRightToStage1-7", + "SwipeRightToStage1-7From1-6" + ] + }, + "StageThemeEpisode2ToEpisode1To1-7": { + "action": "clickSelf", + "roi": [ + 480, + 230, + 280, + 300 + ], + "cache": false, + "next": [ + "Stage1-7", + "SwipeLeftToStage1-7", + "SwipeRightToStage1-7", + "SwipeRightToStage1-7From1-6" + ] + }, + "StageThemeEpisode1To1-7": { + "action": "clickSelf", + "roi": [ + 750, + 160, + 400, + 400 + ], + "cache": false, + "next": [ + "Stage1-7", + "SwipeLeftToStage1-7", + "SwipeRightToStage1-7", + "SwipeRightToStage1-7From1-6" + ] + }, + "SwipeLeftToStage1-7": { + "algorithm": "OcrDetect", + "action": "swipeToTheLeft", + "text": [ + "1-10" + ], + "cache": false, + "roi": [ + 0, + 120, + 1080, + 480 + ], + "next": [ + "Stage1-7", + "SwipeLeftToStage1-7" + ] + }, + "SwipeRightToStage1-7": { + "algorithm": "OcrDetect", + "action": "swipeToTheRight", + "text": [ + "1-3" + ], + "cache": false, + "roi": [ + 0, + 120, + 1080, + 480 + ], + "next": [ + "Stage1-7", + "SwipeRightToStage1-7", + "SwipeRightToStage1-7From1-6" + ] + }, + "SwipeRightToStage1-7From1-6": { + "algorithm": "OcrDetect", + "action": "swipeToTheRight", + "text": [ + "1-6" + ], + "cache": false, + "roi": [ + 0, + 120, + 1080, + 480 + ], + "next": [ + "Stage1-7", + "SwipeRightToStage1-7", + "SwipeRightToStage1-7From1-6" + ] + }, + "Stage1-7": { + "algorithm": "OcrDetect", + "action": "clickSelf", + "text": [ + "1-7" + ], + "cache": false, + "roi": [ + 0, + 190, + 1080, + 60 + ] + }, "LS-6": { "algorithm": "justreturn", "action": "doNothing", diff --git a/resource/template/StageTheme.png b/resource/template/StageTheme.png new file mode 100644 index 0000000000..64cfad2c7b Binary files /dev/null and b/resource/template/StageTheme.png differ diff --git a/resource/template/StageThemeEpisode1To1-7.png b/resource/template/StageThemeEpisode1To1-7.png new file mode 100644 index 0000000000..82be31b98b Binary files /dev/null and b/resource/template/StageThemeEpisode1To1-7.png differ diff --git a/resource/template/StageThemeEpisode2ToEpisode1To1-7.png b/resource/template/StageThemeEpisode2ToEpisode1To1-7.png new file mode 100644 index 0000000000..237c6ee44b Binary files /dev/null and b/resource/template/StageThemeEpisode2ToEpisode1To1-7.png differ diff --git a/resource/template/StageThemeEpisode3ToEpisode1To1-7.png b/resource/template/StageThemeEpisode3ToEpisode1To1-7.png new file mode 100644 index 0000000000..8d8d750232 Binary files /dev/null and b/resource/template/StageThemeEpisode3ToEpisode1To1-7.png differ diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 3273852e16..313e57bf4a 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -75,7 +75,8 @@ namespace MeoAsstGui new CombData { Display = "红票-5", Value = "AP-5" }, new CombData { Display = "经验-5", Value = "LS-5" }, new CombData { Display = "经验-6", Value = "LS-6" }, - new CombData { Display = "技能-5", Value = "CA-5" } + new CombData { Display = "技能-5", Value = "CA-5" }, + new CombData { Display = "1-7", Value = "1-7" } }; // “风雪过境” 活动关卡 //StageList.Add(new CombData { Display = "BI-7", Value = "BI-7" });