fix: 月度小队/深入调查未启用自动切换会以当前游戏模式开始探索 (#12032)

fix: MS/DE now switch to correct tabs even without autoiterate ticked

src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.cpp

@@ -45,6 +45,10 @@ bool asst::RoguelikeIterateDeepExplorationPlugin::_run()
         ProcessTask(*this, { m_config->get_theme() + "@Roguelike@DeepExploration" }).run();
     }
 
+    if (!m_iterateDE) {
+        return true;
+    }
+
     bool ret;
     for (int i = 0; i < deepExplorationCount[m_config->get_theme()]; i++) {
         ret = ProcessTask(*this, { m_config->get_theme() + "@Roguelike@DeepExplorationRewardMiss" }).run();

src/MaaCore/Task/Roguelike/RoguelikeIterateDeepExplorationPlugin.h

@@ -22,5 +22,6 @@ private:
                                                                   { "Sami", 13 },
                                                                   { "Sarkaz", 0 } };
     bool m_completed;
+    bool m_iterateDE;
 };
 }

src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.cpp

@@ -9,8 +9,8 @@ bool asst::RoguelikeIterateMonthlySquadPlugin::load_params([[maybe_unused]] cons
 {
     m_checkComms = params.find<bool>("monthly_squad_check_comms").value_or(false);
 
-    auto iterateMS = params.find<bool>("monthly_squad_auto_iterate");
-    return m_config->get_mode() == RoguelikeMode::Squad && iterateMS.value_or(false);
+    m_iterateMS = params.find<bool>("monthly_squad_auto_iterate").value_or(false);
+    return m_config->get_mode() == RoguelikeMode::Squad;
 }
 
 bool asst::RoguelikeIterateMonthlySquadPlugin::verify(AsstMsg msg, const json::value& details) const
@@ -47,6 +47,10 @@ bool asst::RoguelikeIterateMonthlySquadPlugin::_run()
         ProcessTask(*this, { m_config->get_theme() + "@Roguelike@MonthlySquad" }).run();
     }
 
+    if (!m_iterateMS) {
+        return true;
+    }
+
     for (int i = 0; i < monthlySquadCount[m_config->get_theme()]; i++) {
         if (m_checkComms) {
             ProcessTask(*this, { m_config->get_theme() + "@Roguelike@MonthlySquadComms" }).run();

src/MaaCore/Task/Roguelike/RoguelikeIterateMonthlySquadPlugin.h

@@ -23,6 +23,7 @@ private:
                                                                { "Sarkaz", 1 } };
     bool m_checkComms;
     bool m_completed;
+    bool m_iterateMS;
     virtual bool try_task(const char*) const;
 };