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& 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); }