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

feat.对配置文件增加一些检查

Browse Source
This commit is contained in:
MistEO
2021-11-28 00:24:05 +08:00
parent 5aca7d077d
commit e7b3b644c2
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MeoAssistance/Assistance.cpp
View File

@@ -40,6 +40,7 @@ Assistance::Assistance(AsstCallback callback, void* callback_arg)
callback_json["type"] = "resource broken";
callback_json["what"] = error;
m_callback(AsstMsg::InitFaild, callback_json, m_callback_arg);
throw error;
}
m_working_thread = std::thread(std::bind(&Assistance::working_proc, this));

30
src/MeoAssistance/TaskData.cpp
View File

@@ -147,12 +147,18 @@ bool asst::TaskData::parse(const json::value& json)
}
}
if (task_json.exist("roi")) {
const json::array& area_arr = task_json.at("roi").as_array();
task_info_ptr->roi = Rect(
area_arr[0].as_integer(),
area_arr[1].as_integer(),
area_arr[2].as_integer(),
area_arr[3].as_integer());
const json::array& area_arr = task_json.at("roi").as_array();
int x = area_arr[0].as_integer();
int y = area_arr[1].as_integer();
int width = area_arr[2].as_integer();
int height = area_arr[3].as_integer();
#ifdef LOG_TRACE
if (x + width > WindowWidthDefault || y + height > WindowHeightDefault) {
m_last_error = name + " roi is out of bounds";
return false;
}
#endif
task_info_ptr->roi = Rect(x, y, width, height);
}
else {
task_info_ptr->roi = Rect();
@@ -176,6 +182,16 @@ bool asst::TaskData::parse(const json::value& json)
}
m_all_tasks_info.emplace(name, task_info_ptr);
}
}
#ifdef LOG_TRACE
for (const auto& [name, task] : m_all_tasks_info) {
for (const auto& next : task->next) {
if (m_all_tasks_info.find(next) == m_all_tasks_info.cend()) {
m_last_error = name + "'s next " + next + " is null";
return false;
}
}
}
#endif
return true;
}