From a9c8f094619c24a0d03c5ab79d78583e21a17f0f Mon Sep 17 00:00:00 2001
From: zzyyyl <aysyxx53@hotmail.com>
Date: Mon, 3 Oct 2022 01:13:20 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=88=B7=E7=90=86?=
 =?UTF-8?q?=E6=99=BA=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. LastBattle 之前没有用上，干脆拿来当作 当前/上次作战 的启动任务
2. 把 StageBegin 的 next 抽出来（因为它是 JustReturn 的不会重试）
---
 resource/tasks.json                 |  9 ++++++++-
 src/MeoAssistant/Task/FightTask.cpp | 20 +++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index afd7a0f803..5f701034c5 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -2872,11 +2872,18 @@
         ]
     },
     "LastBattle": {
+        "Doc": "当前或上次作战",
         "algorithm": "JustReturn",
         "action": "DoNothing",
         "next": [
             "GoLastBattle",
-            "StartButton1"
+            "StartButton1",
+            "UsePrts",
+            "UsePrts-StageSN",
+            "PRTS3",
+            "PRTS",
+            "PRTS2",
+            "EndOfAction"
         ]
     },
     "GoLastBattle": {
diff --git a/src/MeoAssistant/Task/FightTask.cpp b/src/MeoAssistant/Task/FightTask.cpp
index 07a0a423cf..558cadc304 100644
--- a/src/MeoAssistant/Task/FightTask.cpp
+++ b/src/MeoAssistant/Task/FightTask.cpp
@@ -2,11 +2,14 @@
 
 #include <utility>
 
+#include "TaskData.h"
+
 #include "Plugin/DrGrandetTaskPlugin.h"
 #include "Plugin/GameCrashRestartTaskPlugin.h"
 #include "Plugin/StageDropsTaskPlugin.h"
 #include "Sub/ProcessTask.h"
 #include "Sub/StageNavigationTask.h"
+#include "Utils/AsstRanges.hpp"
 
 asst::FightTask::FightTask(AsstCallback callback, void* callback_arg)
     : PackageTask(std::move(callback), callback_arg, TaskType),
@@ -26,12 +29,12 @@ asst::FightTask::FightTask(AsstCallback callback, void* callback_arg)
         .set_times_limit("PRTS", 0)
         .set_times_limit("PRTS2", 0)
         .set_times_limit("EndOfAction", 0)
-        .set_ignore_error(false);
-    m_start_up_task_ptr->set_retry_times(5);
+        .set_ignore_error(false)
+        .set_retry_times(5);
 
     // 进入上次战斗
-    m_last_battle_task_ptr->set_tasks({ "UsePrts", "UsePrts-StageSN", "StartButton1", "PRTS3", "PRTS", "PRTS2", "EndOfAction", "GoLastBattle" });
-    m_last_battle_task_ptr->set_times_limit("StartButton1", 0)
+    m_last_battle_task_ptr->set_tasks({ "LastBattle" })
+        .set_times_limit("StartButton1", 0)
         .set_times_limit("StartButton2", 0)
         .set_times_limit("MedicineConfirm", 0)
         .set_times_limit("StoneConfirm", 0)
@@ -40,8 +43,8 @@ asst::FightTask::FightTask(AsstCallback callback, void* callback_arg)
         .set_times_limit("PRTS", 0)
         .set_times_limit("PRTS2", 0)
         .set_times_limit("EndOfAction", 0)
-        .set_ignore_error(false);
-    m_last_battle_task_ptr->set_retry_times(5);
+        .set_ignore_error(false)
+        .set_retry_times(5);
 
     m_stage_navigation_task_ptr->set_enable(false).set_ignore_error(false);
 
@@ -88,7 +91,10 @@ bool asst::FightTask::set_params(const json::value& params)
 
     if (!m_running) {
         if (stage.empty()) {
-            m_start_up_task_ptr->set_tasks({ "UsePrts", "UsePrts-StageSN", "StartButton1", "StageBegin" });
+            // m_start_up_task_ptr->set_tasks({ "UsePrts", "UsePrts-StageSN", "StartButton1", "StageBegin" });
+            std::vector<std::string> tasks = { "UsePrts", "UsePrts-StageSN", "StartButton1" };
+            ranges::copy(Task.get("StageBegin")->next, std::back_inserter(tasks));
+            m_start_up_task_ptr->set_tasks(std::move(tasks));
             m_last_battle_task_ptr->set_enable(true);
             m_stage_navigation_task_ptr->set_enable(false);
         }