diff --git a/resource/tasks.json b/resource/tasks.json index 532436207a..e883b3b974 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -109,6 +109,26 @@ "text": [], "maxTimes": 10 }, + "EpisodeStageSwipeToTheLeft": { + "algorithm": "JustReturn", + "action": "Swipe", + "specificRect": [ + 750, + 310, + 10, + 10 + ], + "rectMove": [ + 1200, + 310, + 10, + 10 + ], + "next": [ + "#next" + ], + "maxTimes": 20 + }, "Episode11": { "algorithm": "JustReturn", "action": "DoNothing", @@ -116,8 +136,8 @@ "StageTheme" ], "next": [ - "EnterEpisode11", - "Episode11@SwipeToTheRight" + "ToEpisode11@EnterEpisode9", + "Episode11@EpisodeStageSwipeToTheLeft" ] }, "Episode10": { @@ -127,8 +147,8 @@ "StageTheme" ], "next": [ - "ToEpisode10@EnterEpisode11", - "Episode10@SwipeToTheRight" + "ToEpisode10@EnterEpisode9", + "Episode10@EpisodeStageSwipeToTheLeft" ] }, "Episode9": { @@ -138,19 +158,19 @@ "StageTheme" ], "next": [ - "ToEpisode9@EnterEpisode11", - "Episode9@SwipeToTheRight" + "EnterEpisode9", + "Episode9@EpisodeStageSwipeToTheLeft" ] }, "Episode8": { "algorithm": "JustReturn", "action": "DoNothing", "sub": [ - "StageTheme" + "ToChapter2@StageTheme" ], "next": [ - "ToEpisode8@EnterEpisode11", - "Episode8@SwipeToTheRight" + "ToEpisode8@EnterEpisode4", + "Episode8@EpisodeStageSwipeToTheLeft" ] }, "Episode7": { @@ -160,8 +180,8 @@ "ToChapter2@StageTheme" ], "next": [ - "ToEpisode7@EnterEpisode8", - "Episode7@SwipeToTheRight" + "ToEpisode7@EnterEpisode4", + "Episode7@EpisodeStageSwipeToTheLeft" ] }, "Episode6": { @@ -171,8 +191,8 @@ "ToChapter2@StageTheme" ], "next": [ - "ToEpisode6@EnterEpisode8", - "Episode6@SwipeToTheRight" + "ToEpisode6@EnterEpisode4", + "Episode6@EpisodeStageSwipeToTheLeft" ] }, "Episode5": { @@ -182,8 +202,8 @@ "ToChapter2@StageTheme" ], "next": [ - "ToEpisode5@EnterEpisode8", - "Episode5@SwipeToTheRight" + "ToEpisode5@EnterEpisode4", + "Episode5@EpisodeStageSwipeToTheLeft" ] }, "Episode4": { @@ -193,8 +213,8 @@ "ToChapter2@StageTheme" ], "next": [ - "ToEpisode4@EnterEpisode8", - "Episode4@SwipeToTheRight" + "EnterEpisode4", + "Episode4@EpisodeStageSwipeToTheLeft" ] }, "Episode3": { @@ -204,8 +224,8 @@ "ToChapter1@ToChapter2@StageTheme" ], "next": [ - "EnterEpisode3", - "Episode3@SwipeToTheRight" + "ToEpisode3@EnterEpisode0", + "Episode3@EpisodeStageSwipeToTheLeft" ] }, "Episode2": { @@ -215,8 +235,8 @@ "ToChapter1@ToChapter2@StageTheme" ], "next": [ - "ToEpisode2@EnterEpisode3", - "Episode2@SwipeToTheRight" + "ToEpisode2@EnterEpisode0", + "Episode2@EpisodeStageSwipeToTheLeft" ] }, "Episode1": { @@ -226,8 +246,8 @@ "ToChapter1@ToChapter2@StageTheme" ], "next": [ - "ToEpisode1@EnterEpisode3", - "Episode1@SwipeToTheRight" + "ToEpisode1@EnterEpisode0", + "Episode1@EpisodeStageSwipeToTheLeft" ] }, "Episode0": { @@ -237,8 +257,8 @@ "ToChapter1@ToChapter2@StageTheme" ], "next": [ - "ToEpisode0@EnterEpisode3", - "Episode0@SwipeToTheRight" + "EnterEpisode0", + "Episode0@EpisodeStageSwipeToTheLeft" ] }, "StageTheme": { @@ -308,22 +328,22 @@ "template": "empty.png", "action": "ClickSelf", "roi": [ - 775, - 175, - 352, - 351 + 700, + 100, + 500, + 500 ], "next": [ "#back" ] }, - "EnterEpisode11": { + "EnterEpisode9": { "baseTask": "EnterEpisode" }, - "EnterEpisode8": { + "EnterEpisode4": { "baseTask": "EnterEpisode" }, - "EnterEpisode3": { + "EnterEpisode0": { "baseTask": "EnterEpisode" }, "ToEpisode": { @@ -331,13 +351,25 @@ "action": "ClickSelf", "text": [], "roi": [ - 902, - 618, + 1106, + 612, 161, - 102 + 108 ], "postDelay": 500 }, + "ToEpisode11": { + "baseTask": "ToEpisode", + "text": [ + "11", + "10" + ], + "next": [ + "ToEpisode11", + "#back", + "Stop" + ] + }, "ToEpisode10": { "baseTask": "ToEpisode", "text": [ @@ -349,14 +381,16 @@ "Stop" ] }, - "ToEpisode9": { + "ToEpisode8": { "baseTask": "ToEpisode", "text": [ - "10", - "9" + "8", + "7", + "6", + "5" ], "next": [ - "ToEpisode9", + "ToEpisode8", "#back", "Stop" ] @@ -364,7 +398,9 @@ "ToEpisode7": { "baseTask": "ToEpisode", "text": [ - "7" + "7", + "6", + "5" ], "next": [ "ToEpisode7", @@ -375,8 +411,8 @@ "ToEpisode6": { "baseTask": "ToEpisode", "text": [ - "7", - "6" + "6", + "5" ], "next": [ "ToEpisode6", @@ -387,8 +423,6 @@ "ToEpisode5": { "baseTask": "ToEpisode", "text": [ - "7", - "6", "5" ], "next": [ @@ -397,16 +431,15 @@ "Stop" ] }, - "ToEpisode4": { + "ToEpisode3": { "baseTask": "ToEpisode", "text": [ - "7", - "6", - "5", - "4" + "3", + "2", + "1" ], "next": [ - "ToEpisode4", + "ToEpisode3", "#back", "Stop" ] @@ -414,7 +447,8 @@ "ToEpisode2": { "baseTask": "ToEpisode", "text": [ - "2" + "2", + "1" ], "next": [ "ToEpisode2", @@ -425,7 +459,6 @@ "ToEpisode1": { "baseTask": "ToEpisode", "text": [ - "2", "1" ], "next": [ @@ -434,19 +467,6 @@ "Stop" ] }, - "ToEpisode0": { - "baseTask": "ToEpisode", - "text": [ - "0", - "o", - "O" - ], - "next": [ - "ToEpisode0", - "#back", - "Stop" - ] - }, "SwipeLeftToStage1-7": { "algorithm": "OcrDetect", "baseTask": "SlowlySwipeToTheLeft", diff --git a/resource/template/EnterEpisode0.png b/resource/template/EnterEpisode0.png new file mode 100644 index 0000000000..f6d8be0cd8 Binary files /dev/null and b/resource/template/EnterEpisode0.png differ diff --git a/resource/template/EnterEpisode11.png b/resource/template/EnterEpisode11.png deleted file mode 100644 index 841362d8a0..0000000000 Binary files a/resource/template/EnterEpisode11.png and /dev/null differ diff --git a/resource/template/EnterEpisode3.png b/resource/template/EnterEpisode3.png deleted file mode 100644 index 4b9375450a..0000000000 Binary files a/resource/template/EnterEpisode3.png and /dev/null differ diff --git a/resource/template/EnterEpisode4.png b/resource/template/EnterEpisode4.png new file mode 100644 index 0000000000..5215608348 Binary files /dev/null and b/resource/template/EnterEpisode4.png differ diff --git a/resource/template/EnterEpisode8.png b/resource/template/EnterEpisode8.png deleted file mode 100644 index 54881b690f..0000000000 Binary files a/resource/template/EnterEpisode8.png and /dev/null differ diff --git a/resource/template/EnterEpisode9.png b/resource/template/EnterEpisode9.png new file mode 100644 index 0000000000..6e3833558b Binary files /dev/null and b/resource/template/EnterEpisode9.png differ diff --git a/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp b/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp index 217b51092a..e6c94373ef 100644 --- a/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp +++ b/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp @@ -50,7 +50,7 @@ bool asst::StageNavigationTask::swipe_and_find_stage() LogTraceFunction; ProcessTask to_right(*this, { "SwipeToTheRight" }); - for (int i = 0; i < 3; ++i) { + for (int i = 0; i < 5; ++i) { to_right.run(); } diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml index a8b29825b4..11cfef1d07 100644 --- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml +++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml @@ -195,7 +195,7 @@ Hide today not open level Variable function button Manual entry of level names - (Test feature) Support most main stage names + stage names from the original list (e.g. 4-10, AP-5, etc.), the main stage should unlock the last episode of the current chapter + (Test feature) Support most main stage names + stage names from the original list (e.g. 4-10, AP-5, etc.) Auto detect connection The checkbox will be automatically unchecked after each detect is completed, and can be checked again if you need to re-detect diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml index 84c4966eac..76cd4bd1bb 100644 --- a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml +++ b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml @@ -174,7 +174,7 @@ 当日開放されないステージを隠す スタート画面に表示する便利ボタン ステージ名を入力する - (テスト機能)ステージ名と番号(例:4-10、AP-5など)の両方がサポートされています。メインステージの指定には該当章の最終エピソードのアンロックが必要です + (テスト機能)ステージ名と番号(例:4-10、AP-5など)の両方がサポートされています。 接続自動認識 このチェックボックスは、検出が完了するたびに自動的にチェックが外れますが、再検出が必要な場合は再度チェックを入れることができます diff --git a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml index 05fbb978ad..866a29a707 100644 --- a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml +++ b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml @@ -171,7 +171,7 @@ 당일 스테이지만 표시 메인 화면 왼쪽의 버튼 레벨 코드를 수동으로 입력 - 대부분의 메인 라인 검문소 이름과 원래 목록 (예:4-10, AP-5)에 있는 검문소 이름을 지원한다. 메인 라인 검문소들은 현재 큰 챕터의 마지막 장을 풀어야 한다 + 대부분의 메인 라인 검문소 이름과 원래 목록 (예:4-10, AP-5)에 있는 검문소 이름을 지원한다. Auto detect connection The checkbox will be automatically unchecked after each detect is completed, and can be checked again if you need to re-detect diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml index 22b5a7694b..e4cf2314db 100644 --- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml +++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml @@ -195,7 +195,7 @@ 关卡选择隐藏当日不开放关卡 主界面可选择按钮功能 手动输入关卡名 - (测试功能)支持大部分主线关卡名与原列表的关卡名(如4-10、AP-5),主线关卡需解锁当前大章节最后一章 + (测试功能)支持大部分主线关卡名与原列表的关卡名(如4-10、AP-5) 自动检测连接 每次检测完成后会自动取消勾选,若需要重新检测可再次勾选 diff --git a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml index 0eaf3a207c..355c5e0d31 100644 --- a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml +++ b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml @@ -171,7 +171,7 @@ 關卡選擇隱藏當日不開放關卡 主介面可選擇按鈕功能 手動輸入關卡代名 - (測試功能)支持大部分主線關卡名與原列表的關卡名(如4-10、AP-5),主線關卡需解鎖當前大章節最後一章 + (測試功能)支持大部分主線關卡名與原列表的關卡名(如4-10、AP-5) 自動檢測連接 每次檢測完成後會自動取消勾選,若需要重新檢測可再次勾選