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

chore: Auto update by pre-commit hooks [skip changelog]

Browse Source
This commit is contained in:
pre-commit-ci[bot]
2024-10-22 08:40:20 +00:00
parent 26d7349722
commit ce02c80498
261 changed files with 7746 additions and 7012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/MaaCore/Config/GeneralConfig.cpp
View File

@@ -27,19 +27,13 @@ bool asst::GeneralConfig::parse(const json::value& json)
// m_options.print_window = options_json.at("printWindow").as_boolean();
m_options.adb_extra_swipe_dist = options_json.get("adbExtraSwipeDist", 100);
m_options.adb_extra_swipe_duration = options_json.get("adbExtraSwipeDuration", -1);
m_options.adb_swipe_duration_multiplier =
options_json.get("adbSwipeDurationMultiplier", 10.0);
m_options.adb_swipe_x_distance_multiplier =
options_json.get("adbSwipeXDistanceMultiplier", 0.8);
m_options.adb_swipe_duration_multiplier = options_json.get("adbSwipeDurationMultiplier", 10.0);
m_options.adb_swipe_x_distance_multiplier = options_json.get("adbSwipeXDistanceMultiplier", 0.8);
m_options.minitouch_extra_swipe_dist = options_json.get("minitouchExtraSwipeDist", 100);
m_options.minitouch_extra_swipe_duration =
options_json.get("minitouchExtraSwipeDuration", -1);
m_options.minitouch_swipe_default_duration =
options_json.get("minitouchSwipeDefaultDuration", 200);
m_options.minitouch_swipe_extra_end_delay =
options_json.get("minitouchSwipeExtraEndDelay", 150);
m_options.swipe_with_pause_required_distance =
options_json.get("swipeWithPauseRequiredDistance", 50);
m_options.minitouch_extra_swipe_duration = options_json.get("minitouchExtraSwipeDuration", -1);
m_options.minitouch_swipe_default_duration = options_json.get("minitouchSwipeDefaultDuration", 200);
m_options.minitouch_swipe_extra_end_delay = options_json.get("minitouchSwipeExtraEndDelay", 150);
m_options.swipe_with_pause_required_distance = options_json.get("swipeWithPauseRequiredDistance", 50);
if (auto order = options_json.find<json::array>("minitouchProgramsOrder")) {
m_options.minitouch_programs_order.clear();
for (const auto& type : *order) {
@@ -92,8 +86,7 @@ bool asst::GeneralConfig::parse(const json::value& json)
adb.swipe = cfg_json.get("swipe", base_cfg.swipe);
adb.press_esc = cfg_json.get("pressEsc", base_cfg.press_esc);
adb.display = cfg_json.get("display", base_cfg.display);
adb.screencap_raw_with_gzip =
cfg_json.get("screencapRawWithGzip", base_cfg.screencap_raw_with_gzip);
adb.screencap_raw_with_gzip = cfg_json.get("screencapRawWithGzip", base_cfg.screencap_raw_with_gzip);
adb.screencap_raw_by_nc = cfg_json.get("screencapRawByNC", base_cfg.screencap_raw_by_nc);
adb.nc_address = cfg_json.get("ncAddress", base_cfg.nc_address);
adb.screencap_encode = cfg_json.get("screencapEncode", base_cfg.screencap_encode);