fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复不能部署干员的问题

Browse Source
This commit is contained in:
MistEO
2023-05-24 00:32:53 +08:00
parent 1efada03f7
commit 924fc64302
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaCore/Controller/MinitouchController.cpp
View File

@@ -149,7 +149,6 @@ bool asst::MinitouchController::swipe(const Point& p1, const Point& p2, int dura
y1 = std::clamp(y1, 0, m_height - 1);
}
const auto& opt = Config.get_options();
Log.trace(m_use_maa_touch ? "maatouch" : "minitouch", "swipe", p1, p2, duration, extra_swipe, slope_in, slope_out);
m_minitoucher->down(x1, y1);
@@ -163,6 +162,7 @@ bool asst::MinitouchController::swipe(const Point& p1, const Point& p2, int dura
}; // TODO: move this to math.hpp
bool need_pause = with_pause && use_swipe_with_pause();
const auto& opt = Config.get_options();
std::future<void> pause_future;
auto minitouch_move = [&](int _x1, int _y1, int _x2, int _y2, int _duration) {
for (int cur_time = TimeInterval; cur_time < _duration; cur_time += TimeInterval) {

4
src/MaaCore/Task/BattleHelper.cpp
View File

@@ -282,8 +282,8 @@ bool asst::BattleHelper::deploy_oper(const std::string& name, const Point& loc,
}
bool deploy_with_pause =
ControlFeat::support(m_inst_helper.ctrler()->support_features(), ControlFeat::SWIPE_WITH_PAUSE);
m_inst_helper.ctrler()->swipe(Point(oper_rect.x, oper_rect.y), Point(target_point.x, target_point.y), duration,
false, swipe_oper_task_ptr->special_params.at(1),
Point oper_point(oper_rect.x + oper_rect.width / 2, oper_rect.y + oper_rect.height / 2);
m_inst_helper.ctrler()->swipe(oper_point, target_point, duration, false, swipe_oper_task_ptr->special_params.at(1),
swipe_oper_task_ptr->special_params.at(2), deploy_with_pause);
// 拖动干员朝向