From 100bfce67679af82999bf736d0e6333ca50e7f47 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Fri, 20 May 2022 23:31:35 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8A=84=E4=BD=9C=E4=B8=9A=E7=9A=84=E4=B8=80=E4=BA=9B=E5=B0=8F?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                      | 8 +++++++-
 src/MeoAssistant/BattleFormationTask.cpp | 4 +++-
 src/MeoAssistant/BattleProcessTask.cpp   | 8 ++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index 93ca6bd26e..18dbf3592e 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -4345,7 +4345,8 @@
             240,
             980,
             470
-        ]
+        ],
+        "rearDelay": 100
     },
     "BattleQuickFormationSkill1": {
         "algorithm": "JustReturn",
@@ -4529,6 +4530,7 @@
             210,
             118
         ],
+        "cache": false,
         "action": "ClickSelf",
         "rearDelay": 500,
         "rectMove": [
@@ -5385,6 +5387,10 @@
             [
                 "^灵鲨",
                 "幽灵鲨"
+            ],
+            [
+                "桑甚",
+                "桑葚"
             ]
         ],
         "roi": [
diff --git a/src/MeoAssistant/BattleFormationTask.cpp b/src/MeoAssistant/BattleFormationTask.cpp
index 686e210904..de756be7d2 100644
--- a/src/MeoAssistant/BattleFormationTask.cpp
+++ b/src/MeoAssistant/BattleFormationTask.cpp
@@ -53,8 +53,9 @@ bool asst::BattleFormationTask::enter_selection_page()
 
 bool asst::BattleFormationTask::select_opers_in_cur_page()
 {
+    auto formation_task_ptr = Task.get("BattleQuickFormationOCR");
     OcrImageAnalyzer name_analyzer(m_ctrler->get_image());
-    name_analyzer.set_task_info("BattleQuickFormationOCR");
+    name_analyzer.set_task_info(formation_task_ptr);
     name_analyzer.set_replace(
         std::dynamic_pointer_cast<OcrTaskInfo>(
             Task.get("Roguelike1RecruitData"))
@@ -93,6 +94,7 @@ bool asst::BattleFormationTask::select_opers_in_cur_page()
             continue;
         }
         m_ctrler->click(res.rect);
+        sleep(formation_task_ptr->rear_delay);
         if (1 <= skill && skill <= 3) {
             m_ctrler->click(SkillRectArray.at(skill - 1));
         }
diff --git a/src/MeoAssistant/BattleProcessTask.cpp b/src/MeoAssistant/BattleProcessTask.cpp
index 9278ffb46f..69aab442e4 100644
--- a/src/MeoAssistant/BattleProcessTask.cpp
+++ b/src/MeoAssistant/BattleProcessTask.cpp
@@ -255,13 +255,13 @@ bool asst::BattleProcessTask::do_action(const BattleAction& action)
     std::string desc;
     switch (action.type) {
     case BattleActionType::Deploy:
-        desc = action.group_name + " 部署";
+        desc = "部署 " + action.group_name;
         break;
     case BattleActionType::Retreat:
-        desc = action.group_name + " 撤退";
+        desc = "撤退 " + action.group_name;
         break;
     case BattleActionType::UseSkill:
-        desc = action.group_name + " 技能";
+        desc = "技能 " + action.group_name;
         break;
     case BattleActionType::SwitchSpeed:
         desc = "切换二倍速";
@@ -462,7 +462,7 @@ bool asst::BattleProcessTask::try_possible_skill(const cv::Mat& image)
             continue;
         }
         m_ctrler->click(info.pos);
-        used |= ProcessTask(*this, { "BattleSkillReadyOnClick" }).run();
+        used |= ProcessTask(*this, { "BattleSkillReadyOnClick" }).set_task_delay(0).run();
         if (info.info.skill_usage == BattleSkillUsage::Once) {
             info.info.skill_usage = BattleSkillUsage::OnceUsed;
         }