From a39e111ae3ecd2f2c27e51fca42344eca6aa48ce Mon Sep 17 00:00:00 2001
From: zzyyyl <74587068+zzyyyl@users.noreply.github.com>
Date: Fri, 1 Dec 2023 23:52:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=B2=B3?=
 =?UTF-8?q?=E7=AD=89=E5=B9=B2=E5=91=98=E5=B8=A6=E4=B8=89=E6=8A=80=E8=83=BD?=
 =?UTF-8?q?=E6=97=B6=E7=82=B9=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20(#7450?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

选择三技能前先进行一次滑动

close #4977
fix #7349
---
 resource/tasks.json                           | 23 +++++++++++++++++++
 .../Miscellaneous/BattleFormationTask.cpp     |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/resource/tasks.json b/resource/tasks.json
index a6b1e44794..2bd51daf71 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -7831,11 +7831,34 @@
     "BattleQuickFormationSkill3": {
         "algorithm": "JustReturn",
         "action": "ClickRect",
+        "specificRect": [
+            15,
+            650,
+            80,
+            30
+        ]
+    },
+    "BattleQuickFormationSkill-SwipeToTheDown": {
+        "algorithm": "JustReturn",
+        "action": "Swipe",
+        "postDelay": 100,
         "specificRect": [
             15,
             710,
             80,
             10
+        ],
+        "rectMove": [
+            15,
+            385,
+            80,
+            100
+        ],
+        "specialParams": [
+            150,
+            0,
+            1,
+            1
         ]
     },
     "BattleQuickFormationConfirm": {
diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp
index c1ff0c449a..b131c2caf4 100644
--- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp
@@ -340,6 +340,9 @@ bool asst::BattleFormationTask::select_opers_in_cur_page(std::vector<OperGroup>&
         ctrler()->click(res.rect);
         sleep(delay);
         if (1 <= skill && skill <= 3) {
+            if (skill == 3) {
+                ProcessTask(*this, { "BattleQuickFormationSkill-SwipeToTheDown" }).run();
+            }
             ctrler()->click(SkillRectArray.at(skill - 1ULL));
             sleep(delay);
         }