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

fix: 修复自动战斗开局暂停的问题；修复自动战斗距离太短干员放不下去的问题

Browse Source
This commit is contained in:
MistEO
2023-01-14 20:09:38 +08:00
parent 660c2ad6ef
commit a0671d3305
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resource/tasks.json
View File

@@ -6154,12 +6154,14 @@
"specialParams": [
400,
2,
0
0,
100
],
"specialParamsDoc": [
"设置朝向时的滑动距离",
"滑动初速度（平均速度是固定的，初速度快末速度慢相当于一直减速）",
"滑动末速度"
"滑动末速度",
"最小滑动时长"
]
},
"BattleOpersFlag": {

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

@@ -283,6 +283,10 @@ bool asst::BattleHelper::deploy_oper(const std::string& name, const Point& loc,
// 1000 是随便取的一个系数，把整数的 pre_delay 转成小数用的
int duration = static_cast<int>(dist / 1000.0 * swipe_oper_task_ptr->pre_delay);
// 时间太短了的压根放不上去，故意加长一点
if (int min_duration = swipe_oper_task_ptr->special_params.at(3); duration < min_duration) {
duration = min_duration;
}
bool deploy_with_pause = m_inst_helper.ctrler()->support_swipe_with_pause();
m_inst_helper.ctrler()->swipe(oper_rect, Rect(target_point.x, target_point.y, 1, 1), duration, false,
swipe_oper_task_ptr->special_params.at(1), swipe_oper_task_ptr->special_params.at(2),
@@ -392,8 +396,12 @@ bool asst::BattleHelper::wait_until_start()
{
LogTraceFunction;
while (!m_inst_helper.need_exit() && !check_in_battle()) {
cv::Mat image = m_inst_helper.ctrler()->get_image();
while (!m_inst_helper.need_exit() && !check_pause_button(image)) {
do_strategic_action(image);
std::this_thread::yield();
image = m_inst_helper.ctrler()->get_image();
}
return true;
}
@@ -402,16 +410,20 @@ bool asst::BattleHelper::wait_until_end()
{
LogTraceFunction;
while (!m_inst_helper.need_exit() && check_in_battle()) {
do_strategic_action();
cv::Mat image = m_inst_helper.ctrler()->get_image();
while (!m_inst_helper.need_exit() && check_in_battle(image)) {
do_strategic_action(image);
std::this_thread::yield();
image = m_inst_helper.ctrler()->get_image();
}
return true;
}
bool asst::BattleHelper::do_strategic_action(const cv::Mat& reusable)
{
return check_in_battle(reusable) && use_all_ready_skill(reusable);
cv::Mat image = reusable.empty() ? m_inst_helper.ctrler()->get_image() : reusable;
return check_in_battle(image) && use_all_ready_skill(image);
}
bool asst::BattleHelper::use_all_ready_skill(const cv::Mat& reusable)
@@ -474,8 +486,8 @@ void asst::BattleHelper::save_map(const cv::Mat& image)
auto draw = image.clone();
for (const auto& [loc, info] : m_normal_tile_info) {
std::string text = "( " + std::to_string(loc.x) + ", " + std::to_string(loc.y) + " )";
cv::putText(draw, text, cv::Point(info.pos.x - 30, info.pos.y), 1, 1.2, cv::Scalar(0, 0, 255), 2);
cv::circle(draw, cv::Point(info.pos.x, info.pos.y), 5, cv::Scalar(0, 255, 0), -1);
cv::putText(draw, loc.to_string(), cv::Point(info.pos.x - 30, info.pos.y), 1, 1.2, cv::Scalar(0, 0, 255), 2);
}
std::string suffix;