diff --git a/src/MaaCore/Task/Fight/SideStoryReopenTask.cpp b/src/MaaCore/Task/Fight/SideStoryReopenTask.cpp index 36838a0c62..cd54d36529 100644 --- a/src/MaaCore/Task/Fight/SideStoryReopenTask.cpp +++ b/src/MaaCore/Task/Fight/SideStoryReopenTask.cpp @@ -33,9 +33,9 @@ bool asst::SideStoryReopenTask::set_server(std::string server) m_server = std::move(server); return true; } -bool asst::SideStoryReopenTask::set_enable_penguid(bool enable) +bool asst::SideStoryReopenTask::set_enable_penguin(bool enable) { - m_enable_penguid = enable; + m_enable_penguin = enable; return true; } bool asst::SideStoryReopenTask::set_penguin_id(std::string id) @@ -190,7 +190,7 @@ bool asst::SideStoryReopenTask::fight(bool use_medicine, bool use_stone) auto plugin = fight_task.register_plugin(); plugin->set_drop_stats(std::move(m_drop_stats)); - plugin->set_enable_penguid(m_enable_penguid); + plugin->set_enable_penguin(m_enable_penguin); plugin->set_server(m_server); plugin->set_penguin_id(m_penguin_id); auto result = fight_task.run(); diff --git a/src/MaaCore/Task/Fight/SideStoryReopenTask.h b/src/MaaCore/Task/Fight/SideStoryReopenTask.h index 65e37aee5e..9c97d0311a 100644 --- a/src/MaaCore/Task/Fight/SideStoryReopenTask.h +++ b/src/MaaCore/Task/Fight/SideStoryReopenTask.h @@ -15,7 +15,7 @@ namespace asst void set_expiring_medicine(int expiring_medicine); void set_stone(int stone); - bool set_enable_penguid(bool enable); + bool set_enable_penguin(bool enable); bool set_penguin_id(std::string id); bool set_server(std::string server); @@ -42,7 +42,7 @@ namespace asst bool m_sanity_not_enough = false; std::unordered_map m_drop_stats; // 企鹅物流上报用 - bool m_enable_penguid = false; + bool m_enable_penguin = false; std::string m_penguin_id; std::string m_server = "CN"; }; diff --git a/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp index 880d8ad588..b6239ce9f7 100644 --- a/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.cpp @@ -46,9 +46,9 @@ void asst::StageDropsTaskPlugin::set_task_ptr(AbstractTask* ptr) m_cast_ptr = dynamic_cast(ptr); } -bool asst::StageDropsTaskPlugin::set_enable_penguid(bool enable) +bool asst::StageDropsTaskPlugin::set_enable_penguin(bool enable) { - m_enable_penguid = enable; + m_enable_penguin = enable; return true; } @@ -91,7 +91,7 @@ bool asst::StageDropsTaskPlugin::_run() stop_task(); } - if (m_enable_penguid && !m_is_annihilation) { + if (m_enable_penguin && !m_is_annihilation) { if (!upload_to_penguin()) { save_img(utils::path("debug") / utils::path("drops")); } diff --git a/src/MaaCore/Task/Fight/StageDropsTaskPlugin.h b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.h index 8a01892ced..960ddcd3c8 100644 --- a/src/MaaCore/Task/Fight/StageDropsTaskPlugin.h +++ b/src/MaaCore/Task/Fight/StageDropsTaskPlugin.h @@ -24,7 +24,7 @@ namespace asst virtual bool verify(AsstMsg msg, const json::value& details) const override; virtual void set_task_ptr(AbstractTask* ptr) override; - bool set_enable_penguid(bool enable); + bool set_enable_penguin(bool enable); bool set_penguin_id(std::string id); bool set_server(std::string server); bool set_specify_quantity(std::unordered_map quantity); @@ -62,7 +62,7 @@ namespace asst ProcessTask* m_cast_ptr = nullptr; std::shared_ptr m_report_penguin_task_ptr = nullptr; std::shared_ptr m_report_yituliu_task_ptr = nullptr; - bool m_enable_penguid = false; + bool m_enable_penguin = false; std::string m_penguin_id; std::string m_server = "CN"; std::unordered_map m_specify_quantity; diff --git a/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.cpp b/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.cpp index c1cee5c479..19940e0a9e 100644 --- a/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.cpp +++ b/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.cpp @@ -124,7 +124,7 @@ void asst::StageQueueMissionCompletedPlugin::drop_info_callback(std::string stag callback(AsstMsg::SubTaskExtraInfo, info); m_cur_info_json = std::move(details); - if (m_enable_penguid) { + if (m_enable_penguin) { upload_to_penguin(stage_code, analyzer.get_stars()); } } @@ -133,9 +133,9 @@ bool asst::StageQueueMissionCompletedPlugin::set_server(std::string server) m_server = std::move(server); return true; } -bool asst::StageQueueMissionCompletedPlugin::set_enable_penguid(bool enable) +bool asst::StageQueueMissionCompletedPlugin::set_enable_penguin(bool enable) { - m_enable_penguid = enable; + m_enable_penguin = enable; return true; } bool asst::StageQueueMissionCompletedPlugin::set_penguin_id(std::string id) diff --git a/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.h b/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.h index d0ea470992..c675799fe8 100644 --- a/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.h +++ b/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.h @@ -22,7 +22,7 @@ namespace asst void set_drop_stats(std::unordered_map m_drop_stats); std::unordered_map get_drop_stats(); - bool set_enable_penguid(bool enable); + bool set_enable_penguin(bool enable); bool set_penguin_id(std::string id); bool set_server(std::string server); @@ -38,7 +38,7 @@ namespace asst std::unordered_map m_drop_stats; json::value m_cur_info_json; // 企鹅物流上报用 - bool m_enable_penguid = false; + bool m_enable_penguin = false; std::string m_penguin_id; std::string m_server = "CN"; std::shared_ptr m_report_penguin_task_ptr = nullptr; diff --git a/src/MaaCore/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp index b834178e4e..d8ed0ba679 100644 --- a/src/MaaCore/Task/Interface/FightTask.cpp +++ b/src/MaaCore/Task/Interface/FightTask.cpp @@ -67,7 +67,7 @@ bool asst::FightTask::set_params(const json::value& params) const int expiring_medicine = params.get("expiring_medicine", 0); const int stone = params.get("stone", 0); const int times = params.get("times", INT_MAX); - bool enable_penguid = params.get("report_to_penguin", false); + bool enable_penguin = params.get("report_to_penguin", false); std::string penguin_id = params.get("penguin_id", ""); std::string server = params.get("server", "CN"); std::string client_type = params.get("client_type", std::string()); @@ -119,13 +119,13 @@ bool asst::FightTask::set_params(const json::value& params) 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_penguid(enable_penguid); + m_stage_drops_plugin_ptr->set_enable_penguin(enable_penguin); m_stage_drops_plugin_ptr->set_penguin_id(penguin_id); m_sidestory_reopen_task_ptr->set_medicine(medicine); m_sidestory_reopen_task_ptr->set_expiring_medicine(expiring_medicine); m_sidestory_reopen_task_ptr->set_stone(stone); - m_sidestory_reopen_task_ptr->set_enable_penguid(enable_penguid); + m_sidestory_reopen_task_ptr->set_enable_penguin(enable_penguin); m_sidestory_reopen_task_ptr->set_penguin_id(std::move(penguin_id)); m_sidestory_reopen_task_ptr->set_server(server);