diff --git a/src/MaaCore/Task/Roguelike/RoguelikeLastRewardSelectTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeLastRewardSelectTaskPlugin.cpp index 016f0ca8d3..47d888537d 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeLastRewardSelectTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeLastRewardSelectTaskPlugin.cpp @@ -35,8 +35,7 @@ bool asst::RoguelikeLastRewardSelectTaskPlugin::_run() PipelineAnalyzer analyzer(ctrler()->get_image()); analyzer.set_tasks(list); if (auto ret = analyzer.analyze(); !ret) { - // 未获取到期望物品,结束重开 - // TODO 临时处理 !!! m_is_next_hardest 及 奖励选择baseTask重置时机判定 + // 未获取到期望物品,设置烧水flag,重开 m_config->set_run_for_collectible(true); m_control_ptr->exit_then_stop(true); } diff --git a/src/MaaCore/Task/Roguelike/RoguelikeLastRewardTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeLastRewardTaskPlugin.cpp index bb5c11ef2b..28e82acb8a 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeLastRewardTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeLastRewardTaskPlugin.cpp @@ -22,18 +22,8 @@ bool asst::RoguelikeLastRewardTaskPlugin::verify(AsstMsg msg, const json::value& if (task_view.starts_with(roguelike_name)) { task_view.remove_prefix(roguelike_name.length()); } - if (task_view == "Roguelike@StartExplore") { - // 标记开始行动 - m_is_next_hardest = false; - return false; - } - if (task_view == "Roguelike@ExitThenAbandon") { - // 开始行动过且没有打完三层,重开低难度 - return !m_is_next_hardest; - } if (task_view == "Roguelike@ExitThenAbandon_ToHardest") { // 打完低难度的三层,重开高难度烧水壶 - m_is_next_hardest = true; return true; } else { @@ -58,14 +48,8 @@ bool asst::RoguelikeLastRewardTaskPlugin::_run() } if (m_config->get_theme() != RoguelikeTheme::Phantom && mode == RoguelikeMode::Collectible) { - if (!m_is_next_hardest) { - // 开启烧开水 Flag,将难度设置为 0 - m_config->set_run_for_collectible(true); - } - else { - // 关闭烧开水 Flag,将难度调整回用户设置的数值 - m_config->set_run_for_collectible(false); - } + // 关闭烧开水 Flag,将难度调整回用户设置的数值 + m_config->set_run_for_collectible(false); } return true; } diff --git a/src/MaaCore/Task/Roguelike/RoguelikeLastRewardTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeLastRewardTaskPlugin.h index 4d182f4e60..01f3c6761f 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeLastRewardTaskPlugin.h +++ b/src/MaaCore/Task/Roguelike/RoguelikeLastRewardTaskPlugin.h @@ -14,8 +14,5 @@ public: protected: virtual bool _run() override; - -private: - mutable bool m_is_next_hardest = false; // 下一局是否是高难烧水局 }; }