fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): 自动战斗关卡结束后增加识别使用黑色返回按钮的检测

Browse Source
This commit is contained in:
status102
2025-08-23 12:25:15 +08:00
parent 114900e815
commit ad4e32a92b
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resource/tasks/tasks.json
View File

@@ -4716,11 +4716,23 @@
"next": ["Copilot@ClickCornerUntilEndOfAction"]
},
"Copilot@ClickCornerUntilStartButton": {
"Doc": "三星之后"
"Doc": "三星之后",
"next": [
"Copilot@BattleStartPreFlag",
"Copilot@BattleStartPreFlag-Return",
"Copilot@ClickCornerUntilStartButton"
]
},
"Copilot@BattleStartPreFlag": {
"baseTask": "BattleStartPreFlag",
"roi": [0, 0, 1280, 720]
"baseTask": "BattleStartPreFlag"
},
"Copilot@BattleStartPreFlag-Return": {
"doc": "使用左上角的黑色返回按钮作为flag",
"baseTask": "Return",
"template": "Return.png",
"action": "DoNothing",
"preDelay": 500,
"postDelay": 1000
},
"ClickCornerUntilStartButton": {
"algorithm": "JustReturn",

1
src/MaaCore/Task/Interface/CopilotTask.cpp
View File

@@ -177,7 +177,6 @@ bool asst::CopilotTask::set_params(const json::value& params)
size_t loop_times = params.get("loop_times", 1);
if (need_navigate) {
// 如果没三星就中止
Task.get<OcrTaskInfo>("Copilot@BattleStartPreFlag")->text.emplace_back(navigate_name);
m_stop_task_ptr->set_tasks({ "Copilot@ClickCornerUntilEndOfAction" });
m_stop_task_ptr->set_enable(true);
}