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

merge dev

Browse Source
This commit is contained in:
MistEO
2022-06-05 23:52:38 +08:00
parent 58b46487e9 847c04d3ae
commit c402def46e
24 changed files with 332 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MeoAssistant/Controller.cpp
View File

@@ -689,6 +689,21 @@ cv::Mat asst::Controller::get_resized_image() const
return resized_mat;
}
std::optional<int> asst::Controller::start_game(const std::string& server_type, bool block)
{
if (auto intent_name = Resrc.cfg().get_intent_name(server_type))
{
std::string cur_cmd = utils::string_replace_all(m_adb.start, "[Intent]", intent_name.value());
int id = push_cmd(cur_cmd);
if (block)
{
wait(id);
}
return id;
}
return std::nullopt;
}
int asst::Controller::click(const Point& p, bool block)
{
int x = static_cast<int>(p.x * m_control_scale);
@@ -999,6 +1014,7 @@ bool asst::Controller::connect(const std::string& adb_path, const std::string& a
m_adb.screencap_raw_with_gzip = cmd_replace(adb_cfg.screencap_raw_with_gzip);
m_adb.screencap_encode = cmd_replace(adb_cfg.screencap_encode);
m_adb.release = cmd_replace(adb_cfg.release);
m_adb.start = cmd_replace(adb_cfg.start);
if (m_support_socket && !m_server_started) {
std::string bind_address;