From 7c3a2778f498ef1bb25196bc8b99352fb44eb97f Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 22 Sep 2022 17:56:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=9F=BA=E5=BB=BA=E7=AC=AC=E4=B8=80=E9=97=B4=E6=88=BF?= =?UTF-8?q?=E9=97=B4skip=E5=8F=82=E6=95=B0=E4=B8=8D=E7=94=9F=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1905 --- src/MeoAssistant/InfrastAbstractTask.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/MeoAssistant/InfrastAbstractTask.cpp b/src/MeoAssistant/InfrastAbstractTask.cpp index 55468e0c29..7fdb5601ef 100644 --- a/src/MeoAssistant/InfrastAbstractTask.cpp +++ b/src/MeoAssistant/InfrastAbstractTask.cpp @@ -1,5 +1,6 @@ #include "InfrastAbstractTask.h" +#include #include #include @@ -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() From 8faa3e8bd51df794b2aa379aca17c4e9dbe54313 Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 22 Sep 2022 18:02:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=85=B3=E5=8D=A1=E5=AF=BC=E8=88=AA=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/Helper/StageManager.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/MeoAsstGui/Helper/StageManager.cs b/src/MeoAsstGui/Helper/StageManager.cs index c4924fcd14..63901de8eb 100644 --- a/src/MeoAsstGui/Helper/StageManager.cs +++ b/src/MeoAsstGui/Helper/StageManager.cs @@ -45,14 +45,15 @@ namespace MeoAsstGui _stages = new Dictionary { - // 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" } }, From f3693754555e575ee7080ec1aaeb15883058fd64 Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 22 Sep 2022 18:04:27 +0800 Subject: [PATCH 3/4] docs: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abb7eb0421..caf32b29fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,4 +2,5 @@ - 新增 自定义基建 `sort` 字段，判断是否排序干员，默认关闭，请参考文档/示例使用 @MistEO - 修复 自定义基建 找不到人时的滑动操作 @MistEO - 修复 基建 组合干员不足时的计算逻辑 @MistEO +- 修复 刷理智 剩余理智即使不选择也会去刷 `NL-10` 的问题 @MistEO - 优化 项目 格式化脚本 @zzyyyl From 69579c7303eb92168d0c8528f1318a8fc0267b6a Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 22 Sep 2022 18:05:18 +0800 Subject: [PATCH 4/4] docs: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index caf32b29fb..d18b9870db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ - 更新 `长夜临光` 活动 关卡导航、资源 @ABA2396 @zzyyyl - 新增 自定义基建 `sort` 字段，判断是否排序干员，默认关闭，请参考文档/示例使用 @MistEO +- 修复 自定义基建 `skip` 字段对类型中第一个房间不生效问题 @MistEO - 修复 自定义基建 找不到人时的滑动操作 @MistEO - 修复 基建 组合干员不足时的计算逻辑 @MistEO - 修复 刷理智 剩余理智即使不选择也会去刷 `NL-10` 的问题 @MistEO