From eb852d0029c57cbbb441c3418ff10bb84fccfbba Mon Sep 17 00:00:00 2001
From: status102 <status102@outlook.com>
Date: Mon, 18 Sep 2023 14:28:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=88=98=E6=96=97-=E6=88=98=E6=96=97=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20=E8=B7=B3=E8=BF=87=E6=88=98=E6=96=97=E5=90=8E?=
 =?UTF-8?q?=E5=89=A7=E6=83=85=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                        | 15 +++++++++++++--
 src/MaaCore/Task/Interface/CopilotTask.cpp | 14 +++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index 4a56a4b972..024c0b5e8a 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -13131,14 +13131,25 @@
             163
         ]
     },
-    "Copilot@ClickCornerUntilFailedOrThreeStars": {
+    "Copilot@ClickCornerUntilEndOfAction": {
         "algorithm": "JustReturn",
         "action": "DoNothing",
+        "maxTimes": 30,
+        "exceededNext": [
+            "Copilot@EndOfAction"
+        ],
         "next": [
+            "Copilot@SkipThePreBattlePlot",
             "Copilot@EndOfAction",
             "Copilot@ClickCornerBeforeThreeStars"
         ]
     },
+    "Copilot@SkipThePreBattlePlotConfirm": {
+        "template": "SkipThePreBattlePlotConfirm.png",
+        "next": [
+            "Copilot@ClickCornerUntilEndOfAction"
+        ]
+    },
     "Copilot@EndOfAction": {
         "template": "EndOfAction.png",
         "action": "DoNothing",
@@ -13159,7 +13170,7 @@
         "Doc": "三星之前",
         "baseTask": "Copilot@ClickCornerUntilStartButton",
         "next": [
-            "Copilot@ClickCornerUntilFailedOrThreeStars"
+            "Copilot@ClickCornerUntilEndOfAction"
         ]
     },
     "Copilot@ClickCornerUntilStartButton": {
diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp
index 9c114ffd97..3c549f2690 100644
--- a/src/MaaCore/Task/Interface/CopilotTask.cpp
+++ b/src/MaaCore/Task/Interface/CopilotTask.cpp
@@ -133,7 +133,13 @@ bool asst::CopilotTask::set_params(const json::value& params)
     m_formation_task_ptr->set_support_unit_name(std::move(support_unit_name));
 
     size_t loop_times = params.get("loop_times", 1);
-    if (loop_times > 1) {
+    if (need_navigate) {
+        // 如果没三星就中止
+        Task.get<OcrTaskInfo>("Copilot@BattleStartPreFlag")->text.emplace_back(m_navigate_name);
+        m_stop_task_ptr->set_tasks({ "Copilot@ClickCornerUntilEndOfAction" });
+        m_stop_task_ptr->set_enable(true);
+    }
+    else if (loop_times > 1) {
         m_stop_task_ptr->set_tasks({ "ClickCornerUntilStartButton" });
         m_stop_task_ptr->set_enable(true);
 
@@ -145,12 +151,6 @@ bool asst::CopilotTask::set_params(const json::value& params)
             m_subtasks.insert(m_subtasks.end(), m_subtasks.begin(), raw_end);
         }
     }
-    else if (need_navigate) {
-        // 如果没三星就中止
-        Task.get<OcrTaskInfo>("Copilot@BattleStartPreFlag")->text.emplace_back(m_navigate_name);
-        m_stop_task_ptr->set_tasks({ "Copilot@ClickCornerUntilFailedOrThreeStars" });
-        m_stop_task_ptr->set_enable(true);
-    }
 
     return true;
 }

From f20583d2683b445e1e7e6e87acd6062d5bfd15f6 Mon Sep 17 00:00:00 2001
From: status102 <status102@outlook.com>
Date: Mon, 18 Sep 2023 15:03:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86UI=E4=B8=8EIdle=E7=9A=84=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Views/UI/TaskQueueView.xaml                       | 1 -
 src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml   | 1 -
 .../Views/UserControl/RoguelikeSettingsUserControl.xaml         | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
index ecba308739..277ca1c1c6 100644
--- a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
+++ b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
@@ -242,7 +242,6 @@
                     <userControl:RoguelikeSettingsUserControl
                         s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}"
                         DataContext="{Binding TaskSettingDataContext}"
-                        IsEnabled="{Binding Idle}"
                         Visibility="{c:Binding TaskSettingVisibilities.AutoRoguelike}" />
                 </hc:SimpleStackPanel>
             </hc:ScrollViewer>
diff --git a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
index 665f362827..4d084e0125 100644
--- a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
@@ -310,7 +310,6 @@
         <StackPanel
             s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}"
             DataContext="{Binding TaskSettingDataContext}"
-            IsEnabled="{Binding Idle}"
             Visibility="{c:Binding TaskSettingVisibilities.EnableAdvancedSettings}">
             <CheckBox
                 Margin="0,10"
diff --git a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
index a0fab6b8bb..d916e68ae8 100644
--- a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
@@ -17,7 +17,7 @@
     d:DesignWidth="220"
     mc:Ignorable="d">
     <StackPanel>
-        <StackPanel Visibility="{c:Binding !TaskSettingVisibilities.EnableAdvancedSettings}">
+        <StackPanel IsEnabled="{Binding Idle}" Visibility="{c:Binding !TaskSettingVisibilities.EnableAdvancedSettings}">
             <ComboBox
                 Margin="0,5"
                 hc:InfoElement.Title="{DynamicResource RoguelikeTheme}"