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

feat: 基建新增领取专精功能 (#7164)

Browse Source 
close #503

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Sherkey <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
This commit is contained in:
youqii
2023-12-14 10:29:41 +08:00
committed by GitHub
parent fdca4c8aca
commit ceb6b6aced
26 changed files with 400 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MaaCore/Task/Interface/InfrastTask.cpp
View File

@@ -8,6 +8,7 @@
#include "Task/Infrast/InfrastInfoTask.h"
#include "Task/Infrast/InfrastMfgTask.h"
#include "Task/Infrast/InfrastOfficeTask.h"
#include "Task/Infrast/InfrastTrainingTask.h"
#include "Task/Infrast/InfrastPowerTask.h"
#include "Task/Infrast/InfrastProcessingTask.h"
#include "Task/Infrast/InfrastReceptionTask.h"
@@ -26,6 +27,7 @@ asst::InfrastTask::InfrastTask(const AsstCallback& callback, Assistant* inst)
m_reception_task_ptr(std::make_shared<InfrastReceptionTask>(callback, inst, TaskType)),
m_office_task_ptr(std::make_shared<InfrastOfficeTask>(callback, inst, TaskType)),
m_processing_task_ptr(std::make_shared<InfrastProcessingTask>(callback, inst, TaskType)),
m_training_task_ptr(std::make_shared<InfrastTrainingTask>(callback, inst, TaskType)),
m_dorm_task_ptr(std::make_shared<InfrastDormTask>(callback, inst, TaskType))
{
LogTraceFunction;
@@ -39,6 +41,7 @@ asst::InfrastTask::InfrastTask(const AsstCallback& callback, Assistant* inst)
m_control_task_ptr->set_ignore_error(true);
m_reception_task_ptr->set_ignore_error(true);
m_office_task_ptr->set_ignore_error(true);
m_training_task_ptr->set_ignore_error(true);
m_processing_task_ptr->set_ignore_error(true);
m_dorm_task_ptr->set_ignore_error(true);
@@ -96,6 +99,9 @@ bool asst::InfrastTask::set_params(const json::value& params)
else if (facility == "Processing") {
m_subtasks.emplace_back(m_processing_task_ptr);
}
else if (facility == "Training") {
m_subtasks.emplace_back(m_training_task_ptr);
}
else {
Log.error(__FUNCTION__, "| Unknown facility", facility);
m_subtasks.clear();
@@ -106,6 +112,9 @@ bool asst::InfrastTask::set_params(const json::value& params)
}
}
bool continue_training = params.get("continueTraining", false);
m_training_task_ptr->set_continue_training(continue_training);
if (!is_custom) {
std::string drones = params.get("drones", "_NotUse");
m_mfg_task_ptr->set_uses_of_drone(drones);