Merge branch 'dev' into upload_to_yituliu

This commit is contained in:
uye
2023-11-14 16:40:41 +08:00
committed by GitHub
123 changed files with 12575 additions and 3011 deletions

View File

@@ -4,6 +4,7 @@
#include "Config/TaskData.h"
#include "Task/Fight/DrGrandetTaskPlugin.h"
#include "Task/Fight/FightTimesPlugin.h"
#include "Task/Fight/MedicineCounterPlugin.h"
#include "Task/Fight/SanityBeforeStagePlugin.h"
#include "Task/Fight/SideStoryReopenTask.h"
@@ -50,6 +51,7 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst)
m_dr_grandet_task_plugin_ptr = m_fight_task_ptr->register_plugin<DrGrandetTaskPlugin>();
m_dr_grandet_task_plugin_ptr->set_enable(false);
m_fight_task_ptr->register_plugin<SanityBeforeStagePlugin>();
m_fight_task_ptr->register_plugin<FightTimesPlugin>();
m_medicine_plugin = m_fight_task_ptr->register_plugin<MedicineCounterPlugin>();
m_subtasks.emplace_back(m_start_up_task_ptr);