From ad4e32a92b67600478b18cffd4c4e8e3248ac86e Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Sat, 23 Aug 2025 12:25:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(core):=20=E8=87=AA=E5=8A=A8=E6=88=98?=
 =?UTF-8?q?=E6=96=97=E5=85=B3=E5=8D=A1=E7=BB=93=E6=9D=9F=E5=90=8E=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=86=E5=88=AB=E4=BD=BF=E7=94=A8=E9=BB=91=E8=89=B2?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E7=9A=84=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks/tasks.json                  | 18 +++++++++++++++---
 src/MaaCore/Task/Interface/CopilotTask.cpp |  1 -
 2 files changed, 15 insertions(+), 4 deletions(-)

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<OcrTaskInfo>("Copilot@BattleStartPreFlag")->text.emplace_back(navigate_name);
         m_stop_task_ptr->set_tasks({ "Copilot@ClickCornerUntilEndOfAction" });
         m_stop_task_ptr->set_enable(true);
     }