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: 初步跑通保全关卡切换流程

Browse Source
This commit is contained in:
MistEO
2023-01-03 00:00:29 +08:00
parent d25c2c04ef
commit b0547c302a
10 changed files with 174 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/MaaCore/Task/Interface/SSSCopilotTask.cpp
View File

@@ -3,7 +3,7 @@
#include "Config/Miscellaneous/SSSCopilotConfig.h"
#include "Config/TaskData.h"
#include "Task/Miscellaneous/BattleFormationTask.h"
#include "Task/Miscellaneous/SSSBattleProcessTask.h"
#include "Task/Miscellaneous/SSSStageManagerTask.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
#include "Utils/Platform.hpp"
@@ -12,19 +12,19 @@ asst::SSSCopilotTask::SSSCopilotTask(const AsstCallback& callback, Assistant* in
: InterfaceTask(callback, inst, TaskType),
m_begin_task_ptr(std::make_shared<ProcessTask>(callback, inst, TaskType)),
m_formation_task_ptr(std::make_shared<BattleFormationTask>(callback, inst, TaskType)),
m_battle_task_ptr(std::make_shared<SSSBattleProcessTask>(callback, inst, TaskType))
m_stage_task_ptr(std::make_shared<SSSStageManagerTask>(callback, inst, TaskType))
{
// m_begin_task_ptr->set_tasks({ inst_string() + "@SSSBegin" }).set_ignore_error(false);
// m_subtasks.emplace_back(m_begin_task_ptr);
m_begin_task_ptr->set_tasks({ inst_string() + "@SSSBegin" }).set_ignore_error(false);
m_subtasks.emplace_back(m_begin_task_ptr);
// m_formation_task_ptr->set_data_resource(BattleFormationTask::DataResource::SSSCopilot);
// m_subtasks.emplace_back(m_formation_task_ptr);
m_formation_task_ptr->set_data_resource(BattleFormationTask::DataResource::SSSCopilot);
m_subtasks.emplace_back(m_formation_task_ptr);
// auto start_2_tp = std::make_shared<ProcessTask>(callback, inst, TaskType);
// start_2_tp->set_tasks({ inst_string() + "@SSSTeamConfirm" }).set_ignore_error(false);
// m_subtasks.emplace_back(start_2_tp);
auto start_2_tp = std::make_shared<ProcessTask>(callback, inst, TaskType);
start_2_tp->set_tasks({ inst_string() + "@SSSTeamConfirm" }).set_ignore_error(false);
m_subtasks.emplace_back(start_2_tp);
m_subtasks.emplace_back(m_battle_task_ptr)->set_retry_times(0);
m_subtasks.emplace_back(m_stage_task_ptr);
}
bool asst::SSSCopilotTask::set_params(const json::value& params)
@@ -62,9 +62,5 @@ bool asst::SSSCopilotTask::set_params(const json::value& params)
};
m_formation_task_ptr->append_additional_formation(std::move(additional_formation));
// for debug
m_battle_task_ptr->set_stage_index(0);
m_battle_task_ptr->set_stage_name("蜂拥而上");
return true;
}

6
src/MaaCore/Task/Interface/SSSCopilotTask.h
View File

@@ -5,9 +5,9 @@
namespace asst
{
class SSSBattleProcessTask;
class BattleFormationTask;
class ProcessTask;
class BattleFormationTask;
class SSSStageManagerTask;
// 保全派驻抄作业任务
class SSSCopilotTask final : public InterfaceTask
@@ -23,6 +23,6 @@ namespace asst
private:
std::shared_ptr<ProcessTask> m_begin_task_ptr = nullptr;
std::shared_ptr<BattleFormationTask> m_formation_task_ptr = nullptr;
std::shared_ptr<SSSBattleProcessTask> m_battle_task_ptr = nullptr;
std::shared_ptr<SSSStageManagerTask> m_stage_task_ptr = nullptr;
};
}