From b70caf29daf74ff0f4023d7722a66e910985ade1 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Tue, 7 Jun 2022 02:17:44 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=88=98=E6=96=97=E4=B8=8D=E8=83=BD=E6=94=BE=E6=8A=80=E8=83=BD?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=8B=96=E5=8A=A8=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                            | 2 +-
 src/MeoAssistant/BattleProcessTask.cpp         | 6 +++---
 src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index ea38a49b0c..6d5e367096 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -4691,7 +4691,7 @@
     },
     "BattleSwipeOper": {
         "algorithm": "JustReturn",
-        "preDelay": 12000,
+        "preDelay": 10000,
         "rearDelay": 100,
         "Doc": "pre 是将干员滑动到场上的 duration 系数；rear 是设置干员朝向滑动的 duration"
     },
diff --git a/src/MeoAssistant/BattleProcessTask.cpp b/src/MeoAssistant/BattleProcessTask.cpp
index 11e2b3ea91..c9705c0e7a 100644
--- a/src/MeoAssistant/BattleProcessTask.cpp
+++ b/src/MeoAssistant/BattleProcessTask.cpp
@@ -454,7 +454,7 @@ bool asst::BattleProcessTask::oper_deploy(const BattleAction& action)
         std::sqrt(
             (std::abs(placed_point.x - oper_rect.x) << 1)
             + (std::abs(placed_point.y - oper_rect.y) << 1)));
-    int duration = static_cast<int>(swipe_oper_task_ptr->pre_delay / 500.0 * dist); // 随便取的一个系数
+    int duration = static_cast<int>(swipe_oper_task_ptr->pre_delay / 1000 * dist); // 随便取的一个系数
     m_ctrler->swipe(oper_rect, placed_rect, duration, true, 0);
 
     sleep(use_oper_task_ptr->rear_delay);
@@ -503,7 +503,7 @@ bool asst::BattleProcessTask::oper_retreat(const BattleAction& action)
     const std::string& name = m_group_to_oper_mapping[action.group_name].name;
     Point pos;
     if (auto iter = m_used_opers.find(name);
-        action.location.x != 0 && action.location.y != 0 &&
+        action.location.x == 0 && action.location.y == 0 &&
         iter != m_used_opers.cend()) {
         pos = iter->second.pos;
         m_used_opers.erase(name);
@@ -522,7 +522,7 @@ bool asst::BattleProcessTask::use_skill(const BattleAction& action)
     const std::string& name = m_group_to_oper_mapping[action.group_name].name;
     Point pos;
     if (auto iter = m_used_opers.find(name);
-        action.location.x != 0 && action.location.y != 0 &&
+        action.location.x == 0 && action.location.y == 0 &&
         iter != m_used_opers.cend()) {
         pos = iter->second.pos;
         m_used_opers.erase(name);
diff --git a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
index 1fe16e5a85..01df43b40f 100644
--- a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
+++ b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp
@@ -296,7 +296,7 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
     std::sqrt(
         (std::abs(placed_point.x - opt_oper.rect.x) << 1)
         + (std::abs(placed_point.y - opt_oper.rect.y) << 1)));
-    int duration = static_cast<int>(swipe_oper_task_ptr->pre_delay / 1000.0 * dist); // 随便取的一个系数
+    int duration = static_cast<int>(swipe_oper_task_ptr->pre_delay / 800.0 * dist); // 随便取的一个系数
     m_ctrler->swipe(opt_oper.rect, placed_rect, duration, true, 0);
     sleep(use_oper_task_ptr->rear_delay);