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

Revert 基建新增领取专精功能 (#7624)

Browse Source 
* Revert "fix: 基建换班-继续专精 参数字段名格式不一致"

This reverts commit 341273e44f.

* Revert "chore: 部分客户端未支持的功能添加注释"

This reverts commit 186584321e.

* Revert "fix: 修复基建训练室-继续训练字符串键值冲突"

This reverts commit bf0f85eef0.

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

This reverts commit ceb6b6aced.
This commit is contained in:
status102
2023-12-15 16:23:11 +08:00
committed by GitHub
parent fb50942ccf
commit 6474fe092f
26 changed files with 89 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@
#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"
@@ -27,7 +26,6 @@ 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;
@@ -41,7 +39,6 @@ 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);
@@ -99,9 +96,6 @@ 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();
@@ -112,9 +106,6 @@ bool asst::InfrastTask::set_params(const json::value& params)
}
}
bool continue_training = params.get("continue_training", 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);