fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 主线导航改为从左往右寻找

Browse Source
This commit is contained in:
uye
2022-11-03 20:27:06 +08:00
parent e44913f67c
commit 0efbfe6293
13 changed files with 91 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
resource/tasks.json
View File

@@ -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",

BIN
resource/template/EnterEpisode0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 KiB

BIN
resource/template/EnterEpisode11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 166 KiB

BIN
resource/template/EnterEpisode3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 93 KiB

BIN
resource/template/EnterEpisode4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 140 KiB

BIN
resource/template/EnterEpisode8.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 79 KiB

BIN
resource/template/EnterEpisode9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 127 KiB

2
src/MeoAssistant/Task/Sub/StageNavigationTask.cpp
View File

@@ -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();
}

2
src/MeoAsstGui/Resources/Localizations/en-us.xaml
View File

@@ -195,7 +195,7 @@
<system:String x:Key="HideUnavailableStage">Hide today not open level</system:String>
<system:String x:Key="MainViewButtonFeature">Variable function button</system:String>
<system:String x:Key="CustomStageCode">Manual entry of level names</system:String>
<system:String x:Key="CustomStageCodeTip">(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</system:String>
<system:String x:Key="CustomStageCodeTip">(Test feature) Support most main stage names + stage names from the original list (e.g. 4-10, AP-5, etc.)</system:String>
<system:String x:Key="AutoDetectConnection">Auto detect connection</system:String>
<system:String x:Key="AutoDetectConnectionTip">The checkbox will be automatically unchecked after each detect is completed, and can be checked again if you need to re-detect</system:String>

2
src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
View File

@@ -174,7 +174,7 @@
<system:String x:Key="HideUnavailableStage">当日開放されないステージを隠す</system:String>
<system:String x:Key="MainViewButtonFeature">スタート画面に表示する便利ボタン</system:String>
<system:String x:Key="CustomStageCode">ステージ名を入力する</system:String>
<system:String x:Key="CustomStageCodeTip">(テスト機能)ステージ名と番号（例：4-10、AP-5など）の両方がサポートされています。メインステージの指定には該当章の最終エピソードのアンロックが必要です</system:String>
<system:String x:Key="CustomStageCodeTip">(テスト機能)ステージ名と番号（例：4-10、AP-5など）の両方がサポートされています。</system:String>
<system:String x:Key="AutoDetectConnection">接続自動認識</system:String>
<system:String x:Key="AutoDetectConnectionTip">このチェックボックスは、検出が完了するたびに自動的にチェックが外れますが、再検出が必要な場合は再度チェックを入れることができます</system:String>

2
src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
View File

@@ -171,7 +171,7 @@
<system:String x:Key="HideUnavailableStage">당일 스테이지만 표시</system:String>
<system:String x:Key="MainViewButtonFeature">메인 화면 왼쪽의 버튼</system:String>
<system:String x:Key="CustomStageCode">레벨 코드를 수동으로 입력</system:String>
<system:String x:Key="CustomStageCodeTip">대부분의 메인 라인 검문소 이름과 원래 목록 (예:4-10, AP-5)에 있는 검문소 이름을 지원한다. 메인 라인 검문소들은 현재 큰 챕터의 마지막 장을 풀어야 한다</system:String>
<system:String x:Key="CustomStageCodeTip">대부분의 메인 라인 검문소 이름과 원래 목록 (예:4-10, AP-5)에 있는 검문소 이름을 지원한다.</system:String>
<system:String x:Key="AutoDetectConnection">Auto detect connection</system:String>
<system:String x:Key="AutoDetectConnectionTip">The checkbox will be automatically unchecked after each detect is completed, and can be checked again if you need to re-detect</system:String>

2
src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
View File

@@ -195,7 +195,7 @@
<system:String x:Key="HideUnavailableStage">关卡选择隐藏当日不开放关卡</system:String>
<system:String x:Key="MainViewButtonFeature">主界面可选择按钮功能</system:String>
<system:String x:Key="CustomStageCode">手动输入关卡名</system:String>
<system:String x:Key="CustomStageCodeTip">（测试功能）支持大部分主线关卡名与原列表的关卡名（如4-10、AP-5），主线关卡需解锁当前大章节最后一章</system:String>
<system:String x:Key="CustomStageCodeTip">（测试功能）支持大部分主线关卡名与原列表的关卡名（如4-10、AP-5）</system:String>
<system:String x:Key="AutoDetectConnection">自动检测连接</system:String>
<system:String x:Key="AutoDetectConnectionTip">每次检测完成后会自动取消勾选，若需要重新检测可再次勾选</system:String>

2
src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
View File

@@ -171,7 +171,7 @@
<system:String x:Key="HideUnavailableStage">關卡選擇隱藏當日不開放關卡</system:String>
<system:String x:Key="MainViewButtonFeature">主介面可選擇按鈕功能</system:String>
<system:String x:Key="CustomStageCode">手動輸入關卡代名</system:String>
<system:String x:Key="CustomStageCodeTip">（測試功能）支持大部分主線關卡名與原列表的關卡名（如4-10、AP-5），主線關卡需解鎖當前大章節最後一章</system:String>
<system:String x:Key="CustomStageCodeTip">（測試功能）支持大部分主線關卡名與原列表的關卡名（如4-10、AP-5）</system:String>
<system:String x:Key="AutoDetectConnection">自動檢測連接</system:String>
<system:String x:Key="AutoDetectConnectionTip">每次檢測完成後會自動取消勾選，若需要重新檢測可再次勾選</system:String>