From eca64fda0850e805952c7c634eb2b1655df03544 Mon Sep 17 00:00:00 2001
From: zzyyyl <aysyxx53@hotmail.com>
Date: Mon, 14 Nov 2022 19:07:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20swipe=20=E7=9A=84=20up=20=E4=B9=9F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=2050ms=20=E5=BB=B6=E8=BF=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

否则可能 maa 等的时间 minitouch 没等，白等了.jpg
---
 src/MeoAssistant/Controller.cpp                  | 16 +++++++++-------
 .../Task/Plugin/RoguelikeBattleTaskPlugin.cpp    |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp
index 7ba5b5ef61..2450dfb4db 100644
--- a/src/MeoAssistant/Controller.cpp
+++ b/src/MeoAssistant/Controller.cpp
@@ -53,8 +53,8 @@ struct MinitouchCmd
         sprintf(buff, "d %d %d %d %d\n", contact, x, y, pressure);
         std::string str = buff;
 
-        if (with_commit) str += commit();
         if (wait_ms) str += wait(wait_ms);
+        if (with_commit) str += commit();
         return str;
     }
     inline static std::string move(int x, int y, bool with_commit = true, int wait_ms = 0, int contact = 0,
@@ -64,16 +64,17 @@ struct MinitouchCmd
         sprintf(buff, "m %d %d %d %d\n", contact, x, y, pressure);
         std::string str = buff;
 
-        if (with_commit) str += commit();
         if (wait_ms) str += wait(wait_ms);
+        if (with_commit) str += commit();
         return str;
     }
-    inline static std::string up(bool with_commit = true, int contact = 0)
+    inline static std::string up(bool with_commit = true, int wait_ms = 0, int contact = 0)
     {
         char buff[16] = { 0 };
         sprintf(buff, "u %d\n", contact);
         std::string str = buff;
 
+        if (wait_ms) str += wait(wait_ms);
         if (with_commit) str += commit();
         return str;
     }
@@ -1066,8 +1067,8 @@ bool asst::Controller::click_without_scale(const Point& p)
         constexpr int duration = 50; // 点击从按下到抬起之间的持续时间，以毫秒计
         constexpr int wait_ms = 50;  // 触点抬起后等待的时间，以毫秒计
         std::string minitouch_cmd =
-            MinitouchCmd::down(x, y, true, duration) + MinitouchCmd::up() + MinitouchCmd::wait(wait_ms);
-        return input_to_minitouch(minitouch_cmd, duration);
+            MinitouchCmd::down(x, y, true, duration) + MinitouchCmd::up(wait_ms);
+        return input_to_minitouch(minitouch_cmd, duration + wait_ms);
     }
     else {
         std::string cur_cmd =
@@ -1149,8 +1150,9 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int
             duration += opt.minitouch_extra_swipe_duration;
         }
         constexpr int ExtraWait = 50;
-        duration += ExtraWait;
-        return input_to_minitouch(MinitouchCmd::wait(ExtraWait) + MinitouchCmd::up(), duration);
+        duration += 2 * ExtraWait;
+        return input_to_minitouch(
+            MinitouchCmd::wait(ExtraWait /* 停留终点 */) + MinitouchCmd::up(ExtraWait /* 抬起后等待 */), duration);
     }
     else {
         std::string cur_cmd =
diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp
index ae2c5005e6..d184b03298 100644
--- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp
+++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp
@@ -726,11 +726,11 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle()
 
     // 将方向转换为实际的 swipe end 坐标点
     if (direction != Point::zero()) {
-        static const int coeff = Task.get("BattleSwipeOper")->special_params.at(0);
+        static const int coeff = swipe_oper_task_ptr->special_params.at(0);
         Point end_point = placed_point + (direction * coeff);
         m_ctrler->swipe(placed_point, end_point, swipe_oper_task_ptr->post_delay);
+        sleep(use_oper_task_ptr->post_delay);
     }
-    sleep(Task.get("BattleUseOper")->post_delay);
 
     if (opt_oper.role == BattleRole::Drone) {
         cancel_oper_selection();