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 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/395
This commit is contained in:
MistEO
2022-05-02 00:28:06 +08:00
parent 636f0e89b6
commit b3ce662820
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MeoAssistant/Controller.cpp
View File

@@ -476,7 +476,7 @@ std::optional<std::vector<unsigned char>> asst::Controller::call_command(const s
read_num = read(m_pipe_out[PIPE_READ], m_pipe_buffer.get(), PipeBuffSize);
};
} while (::waitpid(m_child, &exit_ret, WNOHANG) == 0 && !check_timeout());
}
}
else {
// failed to create child process
return std::nullopt;
@@ -832,7 +832,7 @@ int asst::Controller::swipe_without_scale(const Rect & r1, const Rect & r2, int
return swipe_without_scale(rand_point_in_rect(r1), rand_point_in_rect(r2), duration, block, extra_delay, extra_swipe);
}
cv::Mat asst::Controller::get_image()
cv::Mat asst::Controller::get_image(bool raw)
{
// 有些模拟器adb偶尔会莫名其妙截图失败，多试几次
for (int i = 0; i != 20; ++i) {
@@ -841,6 +841,12 @@ cv::Mat asst::Controller::get_image()
}
}
if (raw) {
std::shared_lock<std::shared_mutex> image_lock(m_image_mutex);
cv::Mat copy = m_cache_image.clone();
return copy;
}
return get_resized_image();
}