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

feat: 支持暂停部署干员

Browse Source
This commit is contained in:
MistEO
2022-12-02 22:42:47 +08:00
parent 1b334f5ed4
commit 68b3b15693
8 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
View File

@@ -527,11 +527,6 @@ bool asst::BattleProcessTask::oper_deploy(const BattleAction& action, bool only_
auto iter = m_cur_opers_info.find(oper_info.name);
Rect oper_rect = iter->second.rect;
if (!m_in_bullet_time) {
// 点击干员
ctrler()->click(oper_rect);
sleep(use_oper_task_ptr->pre_delay);
}
if (only_pre_process) {
return true;
}
@@ -543,9 +538,10 @@ bool asst::BattleProcessTask::oper_deploy(const BattleAction& action, bool only_
int dist = static_cast<int>(
Point::distance(placed_point, { oper_rect.x + oper_rect.width / 2, oper_rect.y + oper_rect.height / 2 }));
// 1000 是随便取的一个系数，把整数的 pre_delay 转成小数用的
int duration = static_cast<int>(dist / 800.0 * swipe_oper_task_ptr->pre_delay);
int duration = static_cast<int>(dist / 1000.0 * swipe_oper_task_ptr->pre_delay);
bool deploy_with_pause = ctrler()->support_swipe_with_pause();
ctrler()->swipe(oper_rect, placed_rect, duration, false, swipe_oper_task_ptr->special_params.at(1),
swipe_oper_task_ptr->special_params.at(2));
swipe_oper_task_ptr->special_params.at(2), deploy_with_pause);
sleep(use_oper_task_ptr->post_delay);
@@ -568,6 +564,10 @@ bool asst::BattleProcessTask::oper_deploy(const BattleAction& action, bool only_
sleep(use_oper_task_ptr->post_delay);
}
if (deploy_with_pause) {
ctrler()->press_esc();
}
m_used_opers[iter->first] =
BattleDeployInfo { action.location, m_normal_tile_info[action.location].pos, oper_info };