From 3d7e6f0eeb32906ae345c85bdd3de45967d150af Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Fri, 13 Jan 2023 01:33:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=88=98=E6=96=97=E6=8F=90=E5=89=8D=E7=BB=93=E6=9D=9F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E4=B8=8B=E4=BF=9D?=
 =?UTF-8?q?=E5=85=A8=E6=B5=8B=E8=AF=95=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/copilot/SSS_Test.json                | 65 ++++++++-----------
 src/MaaCore/Task/BattleHelper.cpp             |  1 +
 .../Task/Miscellaneous/BattleProcessTask.cpp  |  2 +-
 3 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/resource/copilot/SSS_Test.json b/resource/copilot/SSS_Test.json
index 6e947c6157..61b0ff0806 100644
--- a/resource/copilot/SSS_Test.json
+++ b/resource/copilot/SSS_Test.json
@@ -26,17 +26,12 @@
             "name": "水月",
             "skill": 2,
             "skill_usage": 1
-        },
-        {
-            "name": "桃金娘",
-            "skill": 2,
-            "skill_usage": 1
         }
     ],
     "tool_men": {
-        "Pioneer": 3,
-        "Warrior": 6,
-        "Medic": 2
+        "先锋": 3,
+        "近卫": 6,
+        "医疗": 2
     },
     "drop_buffs": [
         "定向部署支援系统"
@@ -89,14 +84,6 @@
             "actions": [
                 {
                     "type": "二倍速"
-                },
-                {
-                    "name": "桃金娘",
-                    "location": [
-                        5,
-                        4
-                    ],
-                    "direction": "下"
                 }
             ],
             "retry_times": 3
@@ -104,6 +91,27 @@
         {
             "stage_name": "见者有份",
             "strategies": [
+                {
+                    "core": "泥岩",
+                    "tool_men": {
+                        "先锋": 3
+                    },
+                    "location": [
+                        4,
+                        2
+                    ],
+                    "direction": "Left"
+                },
+                {
+                    "tool_men": {
+                        "医疗": 100
+                    },
+                    "location": [
+                        3,
+                        3
+                    ],
+                    "direction": "Right"
+                },
                 {
                     "core": "水月",
                     "tool_men": {
@@ -115,17 +123,6 @@
                     ],
                     "direction": "Left"
                 },
-                {
-                    "core": "泥岩",
-                    "tool_men": {
-                        "先锋": 3
-                    },
-                    "location": [
-                        4,
-                        4
-                    ],
-                    "direction": "Left"
-                },
                 {
                     "tool_men": {
                         "辅助": 100
@@ -138,11 +135,11 @@
                 },
                 {
                     "tool_men": {
-                        "医疗": 100
+                        "近卫": 100
                     },
                     "location": [
-                        3,
-                        3
+                        4,
+                        4
                     ],
                     "direction": "Left"
                 }
@@ -151,14 +148,6 @@
             "actions": [
                 {
                     "type": "二倍速"
-                },
-                {
-                    "name": "桃金娘",
-                    "location": [
-                        5,
-                        4
-                    ],
-                    "direction": "下"
                 }
             ],
             "retry_times": 3
diff --git a/src/MaaCore/Task/BattleHelper.cpp b/src/MaaCore/Task/BattleHelper.cpp
index d724746eaf..5e16234d6c 100644
--- a/src/MaaCore/Task/BattleHelper.cpp
+++ b/src/MaaCore/Task/BattleHelper.cpp
@@ -311,6 +311,7 @@ bool asst::BattleHelper::deploy_oper(const std::string& name, const Point& loc,
 
         m_inst_helper.sleep(use_oper_task_ptr->post_delay);
         m_inst_helper.ctrler()->swipe(target_point, end_point, swipe_oper_task_ptr->post_delay);
+        m_inst_helper.sleep(use_oper_task_ptr->pre_delay);
     }
 
     if (deploy_with_pause) {
diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
index 4efcc92f32..a676e2700f 100644
--- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
@@ -351,7 +351,7 @@ bool asst::BattleProcessTask::enter_bullet_time_for_next_action(size_t next_inde
 
 void asst::BattleProcessTask::sleep_and_do_not_urgent(unsigned millisecond)
 {
-    LogTraceScope(__FUNCTION__ + std::to_string(millisecond));
+    LogTraceScope(__FUNCTION__ + std::string(" ms: ") + std::to_string(millisecond));
 
     using namespace std::chrono_literals;
     const auto start = std::chrono::steady_clock::now();