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

feat: 完成自定义基建肥鸭换班，修复一些bug

Browse Source
This commit is contained in:
MistEO
2022-09-18 20:13:42 +08:00
parent db664a5344
commit cb85782b65
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MeoAssistant/InfrastAbstractTask.cpp
View File

@@ -163,7 +163,8 @@ bool asst::InfrastAbstractTask::swipe_and_select_custom_opers()
if (!select_custom_opers()) {
return false;
}
if (m_current_room_custom_config.selected >= max_num_of_opers()) {
if (m_current_room_custom_config.selected >= max_num_of_opers() ||
(m_current_room_custom_config.names.empty() && m_current_room_custom_config.candidates.empty())) {
break;
}
swipe_of_operlist();
@@ -209,6 +210,9 @@ bool asst::InfrastAbstractTask::select_custom_opers()
candd_iter != m_current_room_custom_config.candidates.end()) {
m_current_room_custom_config.candidates.erase(candd_iter);
}
else {
continue;
}
}
else {
continue;

26
src/MeoAssistant/InfrastTask.cpp
View File

@@ -116,7 +116,7 @@ bool asst::InfrastTask::set_params(const json::value& params)
if (is_custom && !m_running) {
std::string filename = params.at("filename").as_string();
int index = params.at("index").as_integer();
int index = params.get("index", 0);
return parse_and_set_custom_config(utils::path(filename), index);
}
@@ -190,5 +190,29 @@ bool asst::InfrastTask::parse_and_set_custom_config(const std::filesystem::path&
}
}
if (auto Fia_opt = cur_plan.find<json::object>("Fiammetta")) {
const auto& Fia_json = Fia_opt.value();
auto target_opt = Fia_json.find<std::string>("target");
if (!target_opt) {
Log.error("Fiammetta target not setted");
return false;
}
const std::string& target = target_opt.value();
infrast::CustomFacilityConfig facility_config(1);
facility_config.front().names = { target, "菲亚梅塔" };
auto Fia_task_ptr = std::make_shared<InfrastDormTask>(m_callback, m_callback_arg, TaskType);
Fia_task_ptr->set_custom_config(std::move(facility_config));
if (Fia_json.get("order", "pre") != "post") {
m_subtasks.insert(m_subtasks.begin(), m_infrast_begin_task_ptr);
m_subtasks.insert(m_subtasks.begin() + 1, std::move(Fia_task_ptr));
}
else {
m_subtasks.emplace_back(std::move(Fia_task_ptr));
m_subtasks.emplace_back(m_infrast_begin_task_ptr);
}
}
return true;
}