fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复刷理智-SS复刻模式下无法使用理智药

Browse Source
This commit is contained in:
status102
2023-12-22 21:48:04 +08:00
parent a8031dec6b
commit 607d0f9d72
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MaaCore/Task/Interface/FightTask.cpp
View File

@@ -52,7 +52,8 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst)
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_medicine_plugin_ptr = m_fight_task_ptr->register_plugin<MedicineCounterPlugin>();
m_sidestory_reopen_medicine_plugin_ptr = m_sidestory_reopen_task_ptr->register_plugin<MedicineCounterPlugin>();
m_subtasks.emplace_back(m_start_up_task_ptr);
m_subtasks.emplace_back(m_stage_navigation_task_ptr);
@@ -116,14 +117,15 @@ bool asst::FightTask::set_params(const json::value& params)
m_stage_drops_plugin_ptr->set_server(server);
}
m_fight_task_ptr->set_times_limit("MedicineConfirm", medicine)
.set_times_limit("ExpiringMedicineConfirm", expiring_medicine)
.set_times_limit("StoneConfirm", stone)
m_fight_task_ptr->set_times_limit("StoneConfirm", stone)
.set_times_limit("StartButton1", times)
.set_times_limit("StartButton2", times);
m_medicine_plugin->set_count(medicine);
m_medicine_plugin->set_use_expiring(expiring_medicine != 0);
m_medicine_plugin->set_dr_grandet(is_dr_grandet);
m_medicine_plugin_ptr->set_count(medicine);
m_medicine_plugin_ptr->set_use_expiring(expiring_medicine != 0);
m_medicine_plugin_ptr->set_dr_grandet(is_dr_grandet);
m_sidestory_reopen_medicine_plugin_ptr->set_count(medicine);
m_sidestory_reopen_medicine_plugin_ptr->set_use_expiring(expiring_medicine != 0);
m_sidestory_reopen_medicine_plugin_ptr->set_dr_grandet(is_dr_grandet);
m_dr_grandet_task_plugin_ptr->set_enable(is_dr_grandet);
m_stage_drops_plugin_ptr->set_enable_penguin(enable_penguin);
m_stage_drops_plugin_ptr->set_penguin_id(penguin_id);

3
src/MaaCore/Task/Interface/FightTask.h
View File

@@ -26,9 +26,10 @@ namespace asst
std::shared_ptr<ProcessTask> m_start_up_task_ptr = nullptr;
std::shared_ptr<StageNavigationTask> m_stage_navigation_task_ptr = nullptr;
std::shared_ptr<ProcessTask> m_fight_task_ptr = nullptr;
std::shared_ptr<MedicineCounterPlugin> m_medicine_plugin = nullptr;
std::shared_ptr<MedicineCounterPlugin> m_medicine_plugin_ptr = nullptr;
std::shared_ptr<StageDropsTaskPlugin> m_stage_drops_plugin_ptr = nullptr;
std::shared_ptr<DrGrandetTaskPlugin> m_dr_grandet_task_plugin_ptr = nullptr;
std::shared_ptr<SideStoryReopenTask> m_sidestory_reopen_task_ptr = nullptr;
std::shared_ptr<MedicineCounterPlugin> m_sidestory_reopen_medicine_plugin_ptr = nullptr;
};
}