Commit Graph

19051 Commits

Author SHA1 Message Date
status102
80c753b3d4 docs(wpf): 自动战斗右侧提示移除需要手动借助战的额外操作说明 2026-05-19 23:30:45 +08:00
uye
b06a824ae2 fix: 远控 LinkStart-* 子任务失败
fix #16740
2026-05-19 23:27:56 +08:00
uye
cb02b83f3d docs: 补充生息演算与小工具相关文档 2026-05-19 23:24:05 +08:00
Michael Liu 刘嘉远
fd10ca546c fix: 修复部分 RA-15 bug,优化逻辑 (#16725)
* fix: 修复部分ra15bug,优化逻辑

* fix: add stability

* fix: add stability
2026-05-19 22:17:49 +08:00
wryx166
212e9aa605 docs: 设备文档添加 steps/details容器,修复bat代码块格式,处理文档中demo-wrapper的废弃警告 (#16712)
* docs: 为设备文档添加步骤容器并修正代码块语言
  - 添加 `::: steps` 步骤容器
  - 将 Windows 批处理代码块修正为 `bat`,相应注释改为bat风格
  - i18n

  Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

* docs: 处理文档中demo-wrapper的废弃警告
2026-05-19 20:51:37 +08:00
uye
8274c0b23a chore: RA-1 部署基站失败时尝试重新部署 2026-05-19 20:25:18 +08:00
uye
7ce44a2f2c chore: 生息演算增加基础设施识别,避免二次点击制造图标进入错误位置 2026-05-19 19:44:56 +08:00
HY
ed30b4011c fix: 補上繁中服漏掉的「擬態學者分隊」 (#16731)
fix: 補上漏掉的「擬態學者分隊」
2026-05-19 13:14:50 +08:00
status102
e13461f972 Revert "feat: SwitchConfig 检测到配置缺失尝试从当前配置复制恢复通知用户"
This reverts commit b8b25d7c20.
2026-05-19 13:08:59 +08:00
status102
2effcbb065 perf: 配置部分损坏提示 2026-05-19 13:08:04 +08:00
status102
0b28249453 perf: Config检查到缺失时, 统一使用当前config进行赋值 2026-05-19 12:58:46 +08:00
github-actions[bot]
87d64af26f chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26061417579
[skip changelog]
alpha/v6.10.4-alpha.1.d008.g87d64af26f
2026-05-18 21:27:58 +00:00
Roland125
9475e2f76a fix: 剿灭掉落识别不到合成玉时不停止任务 (#16726) 2026-05-19 01:38:40 +08:00
uye
7583758492 chore: 调整坐标 2026-05-19 01:28:02 +08:00
Manicsteiner
87faaf2cfd chore: Yostar UR stage navigation (#16723) 2026-05-18 23:09:08 +08:00
uye
2bf3c937d4 Revert "fix: 当新配置损坏时, 重新补充默认配置"
This reverts commit 5c7ab5c3cd.
2026-05-18 21:02:14 +08:00
uye
b8b25d7c20 feat: SwitchConfig 检测到配置缺失尝试从当前配置复制恢复通知用户 2026-05-18 21:02:14 +08:00
H2O_MERO
266ae1cda6 chore: 更新基建排班文档中过时的链接 (#16700)
把基建排班文档中的链接从master存档分支改到了v2分支

## Summary by Sourcery

文档:
- 更新基础调度模式文档(EN/JA/KO/ZH)中的示例 JSON 链接,使其引用 master-v2 分支中的资源。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Documentation:
- Update example JSON links in base scheduling schema docs (EN/JA/KO/ZH)
to reference the master-v2 branch resources.

</details>
2026-05-18 20:35:40 +08:00
status102
5c7ab5c3cd fix: 当新配置损坏时, 重新补充默认配置
fix #16691
2026-05-18 20:25:37 +08:00
uye
f1a3627dc0 Release v6.10.3 (#16701)
## Summary by Sourcery

更新回收任务模式的处理方式,使用统一的标志位(flags)风格枚举,并通过改进的验证和容错机制,收紧 JSON 枚举转换行为。

New Features:
- 引入统一的 `ReclamationMode` 枚举,使用标志位(flags)风格的取值来同时表示 Tales 和 Relaunch
Anchor 模式。
- 在宽容(tolerant)的 JSON 枚举转换器中,新增对标志位(flags)风格枚举组合以及作为字典键使用的支持。

Bug Fixes:
- 通过更改底层数字取值,确保 Relaunch Anchor 的回收模式值在 C# 与 C++ 配置之间保持一致。
- 在切换主题时,正确保留或重置回收清除存储(clear store)和模式设置,并验证所选模式与当前主题是否兼容。

Enhancements:
- 优化宽容枚举 JSON 转换器,通过预计算掩码和预定义集合来验证枚举值,并在出错时抛出带路径信息的
`JsonException`,而不是默默回退到默认值。
- 简化回收设置视图模型,将分离的模式列表统一为单一模式列表,并根据所选主题进行刷新。
- 明确容错根级转换行为,改为依赖具备路径信息的枚举转换错误来恢复无效属性。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update reclamation task mode handling to use a unified flags-style enum
and tighten JSON enum conversion behavior with improved validation and
fault tolerance.

New Features:
- Introduce a unified ReclamationMode enum with flags-style values to
represent both Tales and Relaunch Anchor modes.
- Add support for flags-style enum combinations and dictionary keys in
the tolerant JSON enum converter.

Bug Fixes:
- Ensure Reclamation mode values for Relaunch Anchor align between C#
and C++ configurations by changing the underlying numeric values.
- Preserve or reset reclamation clear store and mode settings correctly
when switching themes, and validate that the selected mode is compatible
with the current theme.

Enhancements:
- Refine the tolerant enum JSON converter to validate enum values via a
precomputed mask and defined set, and to throw JsonException with path
information instead of silently defaulting.
- Simplify reclamation settings view model by unifying separate mode
lists into a single mode list that is refreshed based on the selected
theme.
- Clarify fault-tolerant root conversion behavior to rely on path-aware
enum conversion errors for recovering invalid properties.

</details>
v6.10.3
2026-05-18 12:57:48 +08:00
uye
39cb3fd32a docs: Bump version to v6.10.3 and update changelog
Updated version number to v6.10.3 and added highlights, improvements, and fixes.
2026-05-18 12:57:20 +08:00
uye
b20a05f2ea fix: review 2026-05-18 12:54:01 +08:00
uye
aa6ea24d8d fix: 不会现在还有人选沙中遗火吧 2026-05-18 12:42:20 +08:00
uye
8346706622 chore: 遇到无法转换的枚举值转换为带路径信息的 JsonException 2026-05-18 11:54:38 +08:00
Status102
ac3b826c55 rft: RA mode (#16697)
## Summary by Sourcery

围绕共享的 `ReclamationMode` 枚举统一回收任务模式处理方式,并相应更新 UI 和配置流程。

New Features:
- 引入共享的 `ReclamationMode` 枚举,在各类回收主题和任务中统一用于表示算法模式。

Bug Fixes:
- 确保 `RelaunchAnchor` 模式选择在使用新的基于位标志(bitflag)的模式值时,仍能正确映射到 `RA-1` 和
`RA-15`,并保持已序列化配置中的现有行为不变。

Enhancements:
- 更新回收设置视图模型,使其暴露统一的模式列表;该列表会根据当前选中的主题动态重建,同时在可能的情况下保留当前选择。
- 调整 `ReclamationTask` 及相关配置类,使用新的 `ReclamationMode` 枚举来替代原先按主题划分的整型模式值。
- 在主题或底层任务数据变更时刷新回收模式选项,以保持 UI 与模型的同步。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Unify reclamation task mode handling around a shared ReclamationMode
enum and update UI and config flows accordingly.

New Features:
- Introduce a shared ReclamationMode enum used across reclamation themes
and tasks to represent algorithm modes.

Bug Fixes:
- Ensure RelaunchAnchor mode selection correctly maps to RA-1 and RA-15
using the new bitflag-based mode values while maintaining existing
behavior in serialized configs.

Enhancements:
- Update reclamation settings view model to expose a unified mode list
that is dynamically rebuilt based on the selected theme while preserving
the current selection where possible.
- Adjust ReclamationTask and related config classes to use the new
ReclamationMode enum instead of theme-specific integer modes.
- Refresh reclamation mode options whenever the theme or underlying task
data changes to keep the UI and model in sync.

</details>

增强内容:
- 将原本分别使用整数和主题特定表示的回收模式,统一替换为在任务配置和视图模型中通用的 `ReclamationMode` 枚举。
- 更新回收设置的 UI,使其根据所选主题动态生成模式列表,并在主题变化时保持已选模式同步。
- 调整配置转换和任务序列化逻辑,使其使用新的枚举来读写回收模式,同时保持现有行为不变。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

围绕共享的 `ReclamationMode` 枚举统一回收任务模式处理方式,并相应更新 UI 和配置流程。

New Features:
- 引入共享的 `ReclamationMode` 枚举,在各类回收主题和任务中统一用于表示算法模式。

Bug Fixes:
- 确保 `RelaunchAnchor` 模式选择在使用新的基于位标志(bitflag)的模式值时,仍能正确映射到 `RA-1` 和
`RA-15`,并保持已序列化配置中的现有行为不变。

Enhancements:
- 更新回收设置视图模型,使其暴露统一的模式列表;该列表会根据当前选中的主题动态重建,同时在可能的情况下保留当前选择。
- 调整 `ReclamationTask` 及相关配置类,使用新的 `ReclamationMode` 枚举来替代原先按主题划分的整型模式值。
- 在主题或底层任务数据变更时刷新回收模式选项,以保持 UI 与模型的同步。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Unify reclamation task mode handling around a shared ReclamationMode
enum and update UI and config flows accordingly.

New Features:
- Introduce a shared ReclamationMode enum used across reclamation themes
and tasks to represent algorithm modes.

Bug Fixes:
- Ensure RelaunchAnchor mode selection correctly maps to RA-1 and RA-15
using the new bitflag-based mode values while maintaining existing
behavior in serialized configs.

Enhancements:
- Update reclamation settings view model to expose a unified mode list
that is dynamically rebuilt based on the selected theme while preserving
the current selection where possible.
- Adjust ReclamationTask and related config classes to use the new
ReclamationMode enum instead of theme-specific integer modes.
- Refresh reclamation mode options whenever the theme or underlying task
data changes to keep the UI and model in sync.

</details>

</details>
2026-05-18 11:42:29 +08:00
uye
b4d43cbfe3 perf: 优化 [Flags] 判断 2026-05-18 11:34:16 +08:00
uye
54f239411b fix: TolerantEnumConverter 支持 Flags 2026-05-18 11:14:45 +08:00
uye
82abc7e89a Release v6.10.2 (#16693)
## Summary by Sourcery

重构宽容枚举 JSON 转换器,以复用解析逻辑,并扩展对作为 JSON 属性名使用的枚举值的支持。

增强内容:
- 将通用的宽容枚举解析逻辑提取到一个辅助方法中,在字符串场景和属性名场景中复用。
- 为枚举序列化为 JSON 属性名时的宽容枚举处理添加读/写支持。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Refactor tolerant enum JSON converter to reuse parsing logic and extend
support to enum values used as JSON property names.

Enhancements:
- Extract shared tolerant enum parsing into a helper method reused
across string and property-name scenarios.
- Add read/write support for tolerant enum handling when enums are
serialized as JSON property names.

</details>
v6.10.2
2026-05-18 10:09:15 +08:00
uye
c5722c0f9d docs: Update CHANGELOG for version 6.10.2
Updated version number to v6.10.2 and added highlights and fixes.
2026-05-18 10:09:04 +08:00
uye
9456d7a5da fix: 自定义枚举转换器无法处理枚举作为字典键 2026-05-18 10:07:33 +08:00
uye
b687e5887a Release v6.10.1 (#16689) v6.10.1 2026-05-18 09:15:45 +08:00
uye
072666f425 fix: 日志顺序 2026-05-18 09:14:30 +08:00
uye
5207c09929 docs: Update CHANGELOG for version 6.10.1
Add changelog entry for version 6.10.1 with a fix.
2026-05-18 09:11:22 +08:00
uye
8c72cac105 fix: 在遇到多个非法配置参数时会直接重置配置 2026-05-18 09:08:16 +08:00
github-actions[bot]
629cb81c64 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26002960944
[skip changelog]
alpha/v6.10.1-alpha.1.d001.g629cb81c64
2026-05-17 21:18:14 +00:00
uye
d4776b872e Release v6.10.0 (#16682)
## Summary by Sourcery

在改进更新流程、任务配置和 CI 行为的同时,增强文档与本地化格式化支持。

New Features:
- 新增对主题特定 Reclamation 模式的支持,包括针对 Tales 和 Relaunch Anchor 的独立模式,并更新相关 UI
绑定和提示信息。
- 引入重试机制,在回退到整包更新之前,等待 MirrorChyan OTA 包可用。
- 在多语言文档中补充说明嵌套容器、标记(markers)、隐藏文本、步骤、智能图片容器以及字段容器的使用方法。

Bug Fixes:
- 修复多处面向用户的消息,统一改为使用本地化格式化助手而非手动字符串格式化,避免在边缘场景中出现格式问题。
- 确保 MirrorChyan CDK 错误处理在网络或 JSON 解析错误发生时,能够正确记录上下文日志并更新获取失败状态。

Enhancements:
- 将 MirrorChyan 更新处理重构为专门的助手模块,用于 HTTP 获取、错误处理和 OTA 等待逻辑。
- 调整高级设置的可见性,使其依赖当前任务和 Reclamation 主题,并在主题变化时自动刷新。
- 在核心和 GUI 两侧优化 Reclamation 配置,通过将模式拆分为 Tales 和 Relaunch Anchor
变体,并按主题校验模式取值。
- 改进小游戏任务列表以及其他 UI 代码路径的可读性与行为细节。

Build:
- 将 GitHub Actions artifact 上传步骤升级到最新的 action 版本,并配置制品在存储时不进行压缩。
- 优化 PR 提交检查工作流,以区分无效标题与合并提交,提供更丰富的双语反馈,并避免重复发表评论。

CI:
- 优化 PR 校验,对无效的提交标题和合并提交给出结构化反馈,并在无效集合发生变化时清理或复用此前的机器人评论。

Documentation:
- 扩展并修正 zh-cn、zh-tw、en-us、ja-jp 和 ko-kr
各语言下的文档规范,包括嵌套容器规则、替代容器语法、特殊演示容器、标记、隐藏文本、步骤容器、智能图片网格以及字段容器等内容。
- 新增关于在现代 Windows 版本上处理与 DWM 相关问题的内部知识说明。

Chores:
- 将较旧的自定义基础设施布局 JSON 以版本化文件名方式归档,并更新与 Reclamation 相关的资源定义和本地化内容。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Refine update, task configuration, and CI behaviors while enhancing
documentation and localization formatting support.

New Features:
- Add support for theme-specific Reclamation modes, including distinct
modes for Tales and Relaunch Anchor with updated UI bindings and tips.
- Introduce a retry mechanism to wait for MirrorChyan OTA packages
before falling back to full-package updates.
- Extend documentation in multiple languages with guidance on nested
containers, markers, hidden text, steps, smart image containers, and
field containers.

Bug Fixes:
- Fix various user-facing messages to consistently use the localization
formatting helper instead of manual string formatting, preventing
formatting issues in edge cases.
- Ensure MirrorChyan CDK error handling correctly logs context and
updates fetch-failed state when network or JSON parsing errors occur.

Enhancements:
- Refactor MirrorChyan update handling into dedicated helpers for HTTP
fetching, error processing, and OTA waiting logic.
- Adjust advanced settings visibility to depend on the current task and
Reclamation theme, and refresh automatically when the theme changes.
- Refine Reclamation configuration on both core and GUI sides by
splitting modes into Tales and Relaunch Anchor variants and validating
mode values per theme.
- Improve mini-game task listing and other UI code paths with minor
readability and behavior tweaks.

Build:
- Upgrade GitHub Actions artifact upload steps to the latest action
version and configure artifacts to be stored without compression.
- Improve the PR commit checker workflow to distinguish invalid titles
from merge commits, produce richer bilingual feedback, and avoid posting
duplicate comments.

CI:
- Refine PR validation to give structured feedback on invalid commit
titles and merge commits, and clean up or reuse previous bot comments
when the invalid set changes.

Documentation:
- Expand and correct documentation guidelines across zh-cn, zh-tw,
en-us, ja-jp, and ko-kr, including nested container rules, alternative
container syntaxes, special demo containers, markers, hidden text, step
containers, smart image grids, and field containers.
- Add internal knowledge notes about handling DWM-related issues on
modern Windows versions.

Chores:
- Archive older custom infrastructure layout JSONs under versioned
filenames and update Reclamation-related resource definitions and
localizations.

</details>
v6.10.0
2026-05-18 04:23:24 +08:00
uye
e6c48c40fa docs: changelog 2026-05-18 04:22:14 +08:00
uye
934bb62b7e chore: 为什么会叫这个名字呢? 2026-05-18 04:22:14 +08:00
github-actions[bot]
16c229002b chore: Auto Update Game Resources - 2026-05-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26000856514

[skip changelog]
2026-05-17 19:45:51 +00:00
uye
5c1f2dd080 chore: 调整 RA-15 滑动速度 2026-05-18 03:29:15 +08:00
github-actions[bot]
5adb91aad9 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26000258597
[skip changelog]
2026-05-17 19:18:46 +00:00
uye
469df500cf chore: 修改描述 2026-05-18 03:13:48 +08:00
uye
4805557242 FIX: 特意删的 PNS 怎么又给加回来了 2026-05-18 03:08:03 +08:00
uye
3ca37f8f1c fix: build warning 2026-05-18 02:53:04 +08:00
uye
1c0440436a rft: 生息演算策略逻辑修改 (#16680)
* rft: 生息演算策略逻辑修改

* chroe: review

* feat: 支持禁用高级设置

* chore: Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
2026-05-18 02:34:38 +08:00
Rbqwow
5787270eed docs: 修正嵌套容器说明
同时使用 LLM 同步文档 i18n
2026-05-18 02:27:40 +08:00
铃语
fd5ebb6670 perf: 更新 243 高配三队简化一天三换排班表(20260518 修订) (#16678)
* feat: 更新 243 高配三队简化一天三换排班表(20260518 修订)

* chore: move to old
2026-05-18 02:04:16 +08:00
铃语
485fb25fa0 perf: 更新 333 极限3队一天三换排班表(20260518 修订) (#16679)
* perf: 更新 333 极限3队一天三换排班表(20260518 修订)

* chore: move to old
2026-05-18 02:02:24 +08:00
github-actions[bot]
c66a2bc314 chore: Auto Update Game Resources - 2026-05-17
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/25995257682

[skip changelog]
2026-05-17 15:42:14 +00:00
AnnAngela
0954959e00 ci: Set compression level to 0 for artifact uploads
Added compression-level parameter to artifact uploads for various platforms.
2026-05-17 23:21:13 +08:00