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

feat: 多文件任务中直接声明 baseTask 的任务不继承同名任务参数而是直接覆盖

Browse Source
This commit is contained in:
zzyyyl
2023-10-20 19:05:15 +08:00
parent 9fcb99df16
commit 25b70e3777
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/MaaCore/Config/TaskData.cpp
View File

@@ -93,10 +93,18 @@ bool asst::TaskData::lazy_parse(const json::value& json)
for (const auto& [name, task_json] : json.as_object()) {
std::string_view name_view = task_name_view(name);
if (task_json.get("baseTask", "") == "#none") {
// 不继承同名任务参数
if (task_json.contains("baseTask")) {
// 直接声明 baseTask 的任务不继承同名任务参数而是直接覆盖
m_json_all_tasks_info[name_view] = task_json.as_object();
m_json_all_tasks_info[name_view].erase("baseTask");
std::string base_task = task_json.get("baseTask", "");
#ifdef ASST_DEBUG
if (base_task.empty()) {
Log.error("Task", name, "has empty baseTask");
}
#endif
if (base_task == "#none") {
m_json_all_tasks_info[name_view].erase("baseTask");
}
continue;
}
if (m_json_all_tasks_info.find(name_view) == m_json_all_tasks_info.cend()) {