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

fix.修复公招任务的一些问题

Browse Source
This commit is contained in:
MistEO
2022-03-12 22:14:36 +08:00
parent 009beda8c7
commit e9171b90be
6 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/MeoAssistant/RecruitTask.cpp
View File

@@ -1,16 +1,21 @@
#include "RecruitTask.h"
#include "AutoRecruitTask.h"
#include "RecruitCalcTask.h"
#include "ProcessTask.h"
asst::RecruitTask::RecruitTask(AsstCallback callback, void* callback_arg)
: PackageTask(callback, callback_arg, TaskType),
m_recruit_begin_task_ptr(std::make_shared<ProcessTask>(callback, callback_arg, TaskType)),
m_recruit_task_ptr(std::make_shared<AutoRecruitTask>(callback, callback_arg, TaskType))
m_auto_recruit_task_ptr(std::make_shared<AutoRecruitTask>(callback, callback_arg, TaskType)),
m_recruit_only_calc_task_ptr(std::make_shared<RecruitCalcTask>(callback, callback_arg, TaskType))
{
m_recruit_begin_task_ptr->set_tasks({ "RecruitBegin" });
m_recruit_only_calc_task_ptr->set_enable(false);
m_subtasks.emplace_back(m_recruit_begin_task_ptr);
m_subtasks.emplace_back(m_recruit_task_ptr);
m_subtasks.emplace_back(m_auto_recruit_task_ptr);
m_subtasks.emplace_back(m_recruit_only_calc_task_ptr);
}
bool asst::RecruitTask::set_params(const json::value& params)
@@ -37,22 +42,29 @@ bool asst::RecruitTask::set_params(const json::value& params)
}
bool refresh = params.get("refresh", false);
bool set_time = params.get("set_time", true);
int times = params.get("times", 0);
bool expedite = params.get("expedite", false);
[[maybe_unused]] int expedite_times = params.get("expedite_times", 0);
if (times <= 0 || confirm.empty()) { // 仅识别的情况
m_recruit_begin_task_ptr->set_enable(false);
m_recruit_only_calc_task_ptr->set_enable(true);
m_auto_recruit_task_ptr->set_enable(false);
m_recruit_only_calc_task_ptr->set_param(std::move(select), set_time);
}
else {
m_recruit_begin_task_ptr->set_enable(true);
}
m_recruit_only_calc_task_ptr->set_enable(false);
m_auto_recruit_task_ptr->set_enable(true);
m_recruit_task_ptr->set_max_times(times)
.set_need_refresh(refresh)
.set_use_expedited(expedite)
.set_select_level(std::move(select))
.set_confirm_level(std::move(confirm));
m_auto_recruit_task_ptr->set_max_times(times)
.set_need_refresh(refresh)
.set_use_expedited(expedite)
.set_select_level(std::move(select))
.set_confirm_level(std::move(confirm));
}
return true;
}