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

Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into feat/depot

Browse Source
This commit is contained in:
MistEO
2022-06-22 00:32:13 +08:00
parent ffc8620489 bd115f995e
commit 8bfd5410e5
97 changed files with 2411 additions and 2022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MeoAssistant/GeneralConfiger.cpp
View File

@@ -18,14 +18,6 @@ bool asst::GeneralConfiger::parse(const json::value& json)
m_options.adb_extra_swipe_dist = options_json.get("adbExtraSwipeDist", 100);
m_options.adb_extra_swipe_duration = options_json.get("adbExtraSwipeDuration", -1);
m_options.penguin_report.cmd_format = options_json.get("penguinReport", "cmdFormat", std::string());
if (options_json.contains("aipOcr")) {
auto& aip_ocr = options_json.at("aipOcr");
m_options.aip_ocr.enable = aip_ocr.get("enable", false);
m_options.aip_ocr.accurate = aip_ocr.get("accurate", false);
m_options.aip_ocr.client_id = aip_ocr.get("clientId", std::string());
m_options.aip_ocr.client_secret = aip_ocr.get("clientSerect", std::string());
}
m_options.depot_export_template.ark_planner = options_json.get("depotExportTemplate", "arkPlanner", std::string());
}