diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json index 5acfbdca83..3e952c33a7 100644 --- a/resource/tasks/tasks.json +++ b/resource/tasks/tasks.json @@ -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", diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp index 3f629b7b7b..449e76a565 100644 --- a/src/MaaCore/Task/Interface/CopilotTask.cpp +++ b/src/MaaCore/Task/Interface/CopilotTask.cpp @@ -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("Copilot@BattleStartPreFlag")->text.emplace_back(navigate_name); m_stop_task_ptr->set_tasks({ "Copilot@ClickCornerUntilEndOfAction" }); m_stop_task_ptr->set_enable(true); }