Merge pull request #1906 from MaaAssistantArknights/dev

Release v4.5.0-rc.2

CHANGELOG.md

@@ -1,5 +1,7 @@
 - 更新 `长夜临光` 活动 关卡导航、资源 @ABA2396 @zzyyyl
 - 新增 自定义基建 `sort` 字段，判断是否排序干员，默认关闭，请参考文档/示例使用 @MistEO
+- 修复 自定义基建 `skip` 字段对类型中第一个房间不生效问题 @MistEO
 - 修复 自定义基建 找不到人时的滑动操作 @MistEO
 - 修复 基建 组合干员不足时的计算逻辑 @MistEO
+- 修复 刷理智 剩余理智即使不选择也会去刷 `NL-10` 的问题 @MistEO
 - 优化 项目 格式化脚本 @zzyyyl

src/MeoAssistant/InfrastAbstractTask.cpp

@@ -1,5 +1,6 @@
 #include "InfrastAbstractTask.h"
 
+#include <algorithm>
 #include <regex>
 #include <utility>
 
@@ -57,6 +58,9 @@ std::string asst::InfrastAbstractTask::facility_name() const
 void asst::InfrastAbstractTask::set_custom_config(infrast::CustomFacilityConfig config) noexcept
 {
     m_custom_config = std::move(config);
+    if (!m_custom_config.empty()) {
+        m_current_room_custom_config = m_custom_config.front();
+    }
     m_is_custom = true;
 }
 
@@ -64,6 +68,8 @@ void asst::InfrastAbstractTask::clear_custom_config() noexcept
 {
     m_is_custom = false;
     m_custom_config.clear();
+    infrast::CustomRoomConfig empty;
+    std::swap(m_current_room_custom_config, empty);
 }
 
 bool asst::InfrastAbstractTask::on_run_fails()

src/MeoAsstGui/Helper/StageManager.cs

@@ -45,14 +45,15 @@ namespace MeoAsstGui
 
             _stages = new Dictionary<string, StageInfo>
             {
-                // SideStory「长夜临光」复刻活动
-                { "NL-10", new StageInfo { Display = "NL-10", Value = "NL-10", Activity = sideStory } },
-                { "NL-9", new StageInfo { Display = "NL-9", Value = "NL-9", Activity = sideStory } },
-                { "NL-8", new StageInfo { Display = "NL-8", Value = "NL-8", Activity = sideStory } },
-
+                // 这里会被 “剩余理智” 复用，第一个必须是 string.Empty 的
                 // 「当前/上次」关卡导航
                 { string.Empty, new StageInfo { Display = Localization.GetString("DefaultStage"), Value = string.Empty } },
 
+                // SideStory「长夜临光」复刻活动
+                { "NL-8", new StageInfo { Display = "NL-8", Value = "NL-8", Activity = sideStory } },
+                { "NL-9", new StageInfo { Display = "NL-9", Value = "NL-9", Activity = sideStory } },
+                { "NL-10", new StageInfo { Display = "NL-10", Value = "NL-10", Activity = sideStory } },
+
                 // 主线关卡
                 { "1-7", new StageInfo { Display = "1-7", Value = "1-7" } },