From f0a9eae6bc5187272041ffa9a75baae7fffd3c34 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Sat, 23 Dec 2023 20:43:35 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20=E4=BF=AE=E5=A4=8D=E5=88=B7?= =?UTF-8?q?=E7=90=86=E6=99=BA-SS=E5=A4=8D=E5=88=BB=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E7=90=86=E6=99=BA?= =?UTF-8?q?=E8=8D=AF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 893805a814a1510cfbc5f488567a06e75dec0d7d. --- src/MaaCore/Task/Interface/FightTask.cpp | 16 +++++++--------- src/MaaCore/Task/Interface/FightTask.h | 3 +-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/MaaCore/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp index 12dcf0c32d..c6e44944bb 100644 --- a/src/MaaCore/Task/Interface/FightTask.cpp +++ b/src/MaaCore/Task/Interface/FightTask.cpp @@ -52,8 +52,7 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst) m_dr_grandet_task_plugin_ptr->set_enable(false); m_fight_task_ptr->register_plugin(); m_fight_task_ptr->register_plugin(); - m_medicine_plugin_ptr = m_fight_task_ptr->register_plugin(); - m_sidestory_reopen_medicine_plugin_ptr = m_sidestory_reopen_task_ptr->register_plugin(); + m_medicine_plugin = m_fight_task_ptr->register_plugin(); m_subtasks.emplace_back(m_start_up_task_ptr); m_subtasks.emplace_back(m_stage_navigation_task_ptr); @@ -117,15 +116,14 @@ bool asst::FightTask::set_params(const json::value& params) m_stage_drops_plugin_ptr->set_server(server); } - m_fight_task_ptr->set_times_limit("StoneConfirm", stone) + m_fight_task_ptr->set_times_limit("MedicineConfirm", medicine) + .set_times_limit("ExpiringMedicineConfirm", expiring_medicine) + .set_times_limit("StoneConfirm", stone) .set_times_limit("StartButton1", times) .set_times_limit("StartButton2", times); - 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_medicine_plugin->set_count(medicine); + m_medicine_plugin->set_use_expiring(expiring_medicine != 0); + m_medicine_plugin->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); diff --git a/src/MaaCore/Task/Interface/FightTask.h b/src/MaaCore/Task/Interface/FightTask.h index a7a4c7aa7f..d3f11c1fbc 100644 --- a/src/MaaCore/Task/Interface/FightTask.h +++ b/src/MaaCore/Task/Interface/FightTask.h @@ -26,10 +26,9 @@ namespace asst std::shared_ptr m_start_up_task_ptr = nullptr; std::shared_ptr m_stage_navigation_task_ptr = nullptr; std::shared_ptr m_fight_task_ptr = nullptr; - std::shared_ptr m_medicine_plugin_ptr = nullptr; + std::shared_ptr m_medicine_plugin = nullptr; std::shared_ptr m_stage_drops_plugin_ptr = nullptr; std::shared_ptr m_dr_grandet_task_plugin_ptr = nullptr; std::shared_ptr m_sidestory_reopen_task_ptr = nullptr; - std::shared_ptr m_sidestory_reopen_medicine_plugin_ptr = nullptr; }; }