Commit Graph

17819 Commits

Author SHA1 Message Date
github-actions[bot]
dd703da02f feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20853303793
[skip changelog]
2026-01-09 13:24:02 +00:00
uye
efadf87944 rft: 重构自动战斗标签页逻辑, 拆分悖论模拟任务 (#15327)
* fix: 自动战斗切换至其他活动时不会取消战斗列表

* fix: 运行时禁止切换标签页

* fix: 调整悖论模拟检查顺序

* chore: 移除视频识别

* rft: 重构自动战斗选项页,增加列表混用与类型检查

* feat: 切换标签页时清空作业输入框

* chore: 添加注释

* refactor: 移除 CopilotItemViewModel 中的 Index 属性并更新相关逻辑 (#15328)

* rft: 重构拆分悖论模拟任务

* fix: stage_name

* Revert "refactor: 移除 CopilotItemViewModel 中的 Index 属性并更新相关逻辑 (#15328)"

This reverts commit bbdca4ebcb.

* fix: Wpf 自动战斗-战斗列表 拖动后index错误

* i18n: zh-tw

* i18n: KR

* i18n: EN

* i18n: JP

* style: 空格

---------

Co-authored-by: yali-hzy <48376189+yali-hzy@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2026-01-09 21:16:16 +08:00
uye
fae39b8fa4 refactor(BREAKING): rename Dps to Ops (#15325)
* refactor!: rename Dps to Ops (breaking change for callbacks)

BREAKING CHANGE: This changes all callback interfaces from Dps to Ops naming.

* chore: 删除 AutoLocalization

* fix: typo
2026-01-09 20:54:49 +08:00
uye
6e0e3998b9 fix: 撷英调香师 2026-01-09 20:42:15 +08:00
uye
5a30197362 debug: 测试代码
[skip changelog]
2026-01-09 20:41:56 +08:00
uye
60e191adf7 feat: 自动战斗日志栏添加日志悬浮窗按钮 2026-01-09 20:36:02 +08:00
github-actions[bot]
a02e9b8fc0 chore: Auto Update Game Resources - 2026-01-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20850458500

[skip changelog]
2026-01-09 11:34:40 +00:00
uye
224ede8c31 feat: 低于 2 核心电脑使用单线程 OCR 2026-01-09 19:28:01 +08:00
uye
82ee510499 feat: 更新库存提示移到 ToolTip 2026-01-09 19:25:23 +08:00
uye
6f99eb5a7b feat: 关卡提示支持显示库存 2026-01-09 18:43:03 +08:00
uye
04b7b11dfc perf: 优化线索交流、获取好友线索逻辑 2026-01-09 17:45:33 +08:00
status102
352ae52ca1 chore: H16-4, 引航者#6 TN-1~TN-4 剩余地图 view[1] 2026-01-09 17:34:02 +08:00
雪银星月
1b98edc30a feat(roguelike): 新增肉鸽主题推荐配置tip并适配多语言 (#15324)
* feat(roguelike): 新增肉鸽主题推荐配置提示并适配多语言

* fix(roguelike): 用显式映射获取主题提示并添加本地化回退

* fix(roguelike): 优化注释以统一风格

* i18n: KR

* i18n: KR use direct text

* i18n: JP

* i18n: EN + ★ changes

* i18n: zh-tw

* feat: 调整界面布局

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HY <45387477+momomochi987@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2026-01-09 17:20:15 +08:00
MistEO
bb9fc88042 feat: Disable CoreML for detection and recognition on macOS
Comment out CoreML usage for detection and recognition options due to precision issues reported by users.
2026-01-09 14:04:12 +08:00
status102
ccf6df9046 fix: 20260109 游戏更新导致自动战斗失效 2026-01-09 13:37:19 +08:00
SherkeyXD
2c82a696d8 chore: 移除多余关卡 2026-01-09 12:55:24 +08:00
SherkeyXD
4ec4d33d49 feat: SideStory「雅赛努斯复仇记」导航 2026-01-09 12:06:38 +08:00
SherkeyXD
df79e53b31 chore: port changes from api 2026-01-09 10:31:39 +08:00
github-actions[bot]
1bcb29ded2 chore: Auto Update Game Resources - 2026-01-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20835385463

[skip changelog]
2026-01-08 23:28:22 +00:00
github-actions[bot]
96d2ccac88 feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20833010392
[skip changelog]
alpha/v6.2.0-beta.2.d017.g96d2ccac8
2026-01-08 21:53:11 +00:00
github-actions[bot]
6784e6fcab chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20831693747
[skip changelog]
2026-01-08 21:04:56 +00:00
uye
577399c1f6 chore: 添加挂调试器下使用 GPU 的注释 2026-01-09 03:59:10 +08:00
uye
a46387b28b feat: 限制使用 CPU 推理时的线程占用数,优先保证模拟器运行
Test (operator recognition OCR, high-frequency)
Platform: i7-13700KF + RTX 4080S

CPU:
1t  11%  3m30s
2t  24%  2m11s
3t  28%  1m42s
4t  36%  1m29s
5t  50%  1m25s

GPU (DirectML):
5% CPU / 2% GPU / 36s
2026-01-09 03:09:47 +08:00
uye
cea14f843b feat: 基建进入设施失败时保留测试截图 2026-01-09 01:42:24 +08:00
uye
6657421336 feat: 将自动重载资源独立出来,在 debug 模式下显示勾选框 2026-01-09 01:03:19 +08:00
github-actions[bot]
1091dfceb1 chore: Auto Templates Optimization
Triggered by b385b472e4

[skip changelog]
2026-01-08 16:25:48 +00:00
uye
b385b472e4 feat: 尝试增加 b服 开屏活动跳过 2026-01-09 00:25:23 +08:00
uye
91971ce650 fix: 线索数量识别 2026-01-08 19:27:33 +08:00
github-actions[bot]
d6723d93de feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20797719573
[skip changelog]
alpha/v6.2.0-beta.2.d008.gd6723d93d
2026-01-07 21:53:24 +00:00
Rbqwow
58d71d79c1 feat: 检测到自身处于临时路径中时阻止启动 (#14961)
* feat: 检测到自身处于临时路径中时阻止启动

* feat: 增加环境变量中的 temp 判断

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2026-01-08 01:40:38 +08:00
github-actions[bot]
31eb59e5ff chore: Auto Templates Optimization
Triggered by 2288392dde

[skip changelog]
2026-01-07 17:20:06 +00:00
uye
2288392dde fix: 线索板上有线索时无法一键放置线索 2026-01-08 01:19:34 +08:00
uye
be4a96a06f feat: 企鹅物流上报 ID 不为空时禁止被上报结果赋值 2026-01-07 23:21:54 +08:00
uye
34fa52495f fix: 同时开启 剿灭模式备选关卡 会导致 企鹅物流汇报 ID 被修改
fix #15323
2026-01-07 23:14:58 +08:00
晓丶梦丶仁
b877be6b30 fix: Filename too long 2026-01-07 18:11:33 +08:00
github-actions[bot]
95d2d1dcf3 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20762004855
[skip changelog]
alpha/v6.2.0-beta.2.d001.g95d2d1dcf
2026-01-06 21:04:29 +00:00
uye
48ca14e835 Release v6.2.0-beta.2 (#15315)
## Summary by Sourcery

优化日志卡片和缩略图处理,引入可复用的属性依赖初始化方式,并新增可配置的卡片日志选项,同时更新 copilot 路径解析、游戏内任务行为以及
VSCode 扩展文档。

New Features:
- 新增一个 GUI 设置和配置键,用于启用或禁用卡片样式日志。
- 更新 copilot 配置文件名处理逻辑,在通过已知映射找不到文件时支持使用原始路径。
- 在确认基础设施操作时输出额外信息,并使用更新后的卡片图片将其同步到 GUI 日志中。

Bug Fixes:
- 防止将缩略图附加到已经被移除的日志卡片上。
- 在获取日志缩略图信号量时允许短暂等待,以在高并发情况下减少丢失的截图。
- 确保在肉鸽设置中只有在指定核心角色时才会使用支援单位。
- 修复 Secret Front 关卡名称解析和路线匹配,以正确处理新增关卡。
- 调整数字正则表达式以改进对掉落时间文本的识别。

Enhancements:
- 将 PropertyDependsOn 支持重构为共享工具,并更新各视图模型以使用带有新辅助方法的通用
PropertyChangedBase。
- 调整日志卡片创建与拆分逻辑,使空日志也能按预期触发图片更新和卡片边界。
- 当战斗轮次上限可能无法完全消耗配置的次数时,向用户发出警告。
- 调整多语言的 VSCode 扩展文档,以说明快速识别功能并澄清 OCR 模型的处理方式。

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

## Summary by Sourcery

Refine log card and thumbnail handling, introduce reusable
property-dependency initialization, and add a configurable card-log
option while updating copilot path resolution, in-game task behavior,
and VSCode extension docs.

New Features:
- Add a GUI setting and configuration key to enable or disable
card-style logging.
- Update copilot configuration filename handling to support raw paths
when files are not found via known mappings.
- Emit extra info when confirming infrastructure actions and sync it to
the GUI log with updated card images.

Bug Fixes:
- Prevent attaching thumbnails to log cards that have already been
removed.
- Allow a short wait when acquiring the log thumbnail semaphore to
reduce dropped captures under contention.
- Ensure support units are only used when a core character is specified
in roguelike settings.
- Fix Secret Front stage name parsing and route matching to correctly
handle additional stages.
- Improve recognition of drop times text by adjusting the numeric regex.

Enhancements:
- Refactor PropertyDependsOn support into a shared utility and update
view models to use the common PropertyChangedBase with the new helper.
- Adjust log card creation and splitting logic so empty logs can still
trigger image updates and card boundaries as intended.
- Warn users when battle run limits may not fully consume the configured
number of runs.
- Tweak VSCode extension documentation in multiple languages to describe
quick recognition and clarify OCR model handling.

</details>

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

## Summary by Sourcery

优化日志卡片和缩略图处理,引入可复用的属性依赖初始化方式,并新增可配置的卡片日志选项,同时更新 copilot 路径解析、游戏内任务行为以及
VSCode 扩展文档。

New Features:
- 新增一个 GUI 设置和配置键,用于启用或禁用卡片样式日志。
- 更新 copilot 配置文件名处理逻辑,在通过已知映射找不到文件时支持使用原始路径。
- 在确认基础设施操作时输出额外信息,并使用更新后的卡片图片将其同步到 GUI 日志中。

Bug Fixes:
- 防止将缩略图附加到已经被移除的日志卡片上。
- 在获取日志缩略图信号量时允许短暂等待,以在高并发情况下减少丢失的截图。
- 确保在肉鸽设置中只有在指定核心角色时才会使用支援单位。
- 修复 Secret Front 关卡名称解析和路线匹配,以正确处理新增关卡。
- 调整数字正则表达式以改进对掉落时间文本的识别。

Enhancements:
- 将 PropertyDependsOn 支持重构为共享工具,并更新各视图模型以使用带有新辅助方法的通用
PropertyChangedBase。
- 调整日志卡片创建与拆分逻辑,使空日志也能按预期触发图片更新和卡片边界。
- 当战斗轮次上限可能无法完全消耗配置的次数时,向用户发出警告。
- 调整多语言的 VSCode 扩展文档,以说明快速识别功能并澄清 OCR 模型的处理方式。

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

## Summary by Sourcery

Refine log card and thumbnail handling, introduce reusable
property-dependency initialization, and add a configurable card-log
option while updating copilot path resolution, in-game task behavior,
and VSCode extension docs.

New Features:
- Add a GUI setting and configuration key to enable or disable
card-style logging.
- Update copilot configuration filename handling to support raw paths
when files are not found via known mappings.
- Emit extra info when confirming infrastructure actions and sync it to
the GUI log with updated card images.

Bug Fixes:
- Prevent attaching thumbnails to log cards that have already been
removed.
- Allow a short wait when acquiring the log thumbnail semaphore to
reduce dropped captures under contention.
- Ensure support units are only used when a core character is specified
in roguelike settings.
- Fix Secret Front stage name parsing and route matching to correctly
handle additional stages.
- Improve recognition of drop times text by adjusting the numeric regex.

Enhancements:
- Refactor PropertyDependsOn support into a shared utility and update
view models to use the common PropertyChangedBase with the new helper.
- Adjust log card creation and splitting logic so empty logs can still
trigger image updates and card boundaries as intended.
- Warn users when battle run limits may not fully consume the configured
number of runs.
- Tweak VSCode extension documentation in multiple languages to describe
quick recognition and clarify OCR model handling.

</details>

</details>
v6.2.0-beta.2
2026-01-07 03:56:33 +08:00
github-actions[bot]
cce5463e5c docs: Auto Update Changelogs of v6.2.0-beta.2 (#15316)
* docs: Auto Generate Changelog of Release v6.2.0-beta.2

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2026-01-07 03:54:00 +08:00
uye
f98ccb6eaf fix: ai review 2026-01-07 03:42:15 +08:00
github-actions[bot]
c963384124 feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20759668897
[skip changelog]
2026-01-06 19:30:40 +00:00
uye
d3aaf5645e feat: 支持日志样式切换 2026-01-07 03:21:20 +08:00
uye
f6b4072780 perf: 优化缩略图逻辑 2026-01-07 02:41:26 +08:00
Constrat
f404eaa3c8 i18n: EN for FightTimesMayNotExhausted 2026-01-06 19:01:27 +01:00
uye
eab9143533 chore: 调整 MaxNumberOfLogThumbnails 作用域,调整默认数量 2026-01-07 01:48:02 +08:00
uye
9456f73ea7 feat: 基建设施缩略图 2026-01-07 01:37:06 +08:00
uye
59db82e638 feat: addlog 允许只更新图片不添加内容 2026-01-07 00:28:26 +08:00
Constrat
29f63322ba fix: fix SA1518 warnings 2026-01-06 14:32:24 +01:00
芆芮
eac2d39834 chore: YoStarJP SN device ocr (#15310) 2026-01-06 21:07:53 +08:00
uye
4abf4d63d0 fix: 肉鸽未填写开局干员时借助战强制为 false
fix #15311
2026-01-06 20:37:48 +08:00
uye
ab32660f41 fix: 隐秘战线结局识别 2026-01-06 19:49:45 +08:00