Commit Graph

18205 Commits

Author SHA1 Message Date
uye
5d7ea00ff5 chore: Update src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
2026-02-25 23:21:38 +08:00
uye
7ddb8234f7 docs: Bump version to v6.3.5 and update changelog
Updated version number to v6.3.5 and added release notes.
2026-02-25 23:20:09 +08:00
uye
5872357881 chore: BattleKills roi 2026-02-25 22:21:26 +08:00
uye
8cd6b1d7ec fix: 击杀数部分识别错误时闪退 2026-02-25 21:36:24 +08:00
uye
f638fcb886 Release v6.3.4 (#15807)
## Summary by Sourcery

杂务:
- 为 v6.3.4 版本更新任务配置和模板优化配置。

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

## Summary by Sourcery

Chores:
- Update task configuration and template optimization configuration for
the v6.3.4 release.

</details>
2026-02-25 19:53:19 +08:00
uye
38d6cbb3e8 docs: Bump version to v6.3.4 in CHANGELOG.md
Updated version to v6.3.4 and added release notes.
2026-02-25 19:51:59 +08:00
github-actions[bot]
bdcd657088 feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/22395513088
[skip changelog]
2026-02-25 11:48:44 +00:00
github-actions[bot]
f9b866000d chore: Auto Templates Optimization
Triggered by fd718fa355

[skip changelog]
2026-02-25 11:38:52 +00:00
uye
fd718fa355 fix: 沟槽的 yj 怎么有倒计时的时候击杀数图标都不一样 2026-02-25 19:38:17 +08:00
uye
447d0f2d17 chore: 调整 BattleKillsFlag height 2026-02-25 19:37:35 +08:00
uye
11a4894182 Release v6.3.3 (#15776)
- ~~等 #15773 ,以及顺带修一下掉落识别~~

## Summary by Sourcery

准备 6.3.3
版本发布,包含对视觉识别、干员招募、基建规划、启动流程以及窗口附加行为的多项稳定性修复,并加入新的输入模式以及更新后的游戏/任务资源和 UI
文本。

新功能:
- 暴露新的 Win32 输入方式,可使用窗口相对位置发送或投递消息,并在附加窗口的鼠标方式设置中提供这些选项。

错误修复:
- 加强矩形校正逻辑以应对完全在屏幕外的区域,避免在基于视觉的识别中产生无效 ROI。
- 确保招募计算使用视图模型中配置的选择时间,而不是任务队列中的数值。
- 将基建自定义方案选择默认为未设置状态,并相应迁移现有配置。
- 当使用附加窗口连接时自动禁用 StartGame 选项,以防止产生冲突的启动行为。
- 阻止启动任务重复尝试主开始按钮的动作,以减少不必要的重试。

增强内容:
- 调整游戏/任务资源定义(包括肉鸽玩法以及特定关卡/任务配置),以适配更新后的游戏流程和掉落识别行为。
- 刷新本地化内容和版本更新对话框文案,以适配 6.3.3 版本发布。

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

## Summary by Sourcery

Prepare 6.3.3 release with multiple stability fixes to vision,
recruitment, infrastructure planning, startup, and attach-window
behavior, plus new input modes and updated game/task resources and UI
text.

New Features:
- Expose new Win32 input methods that send or post messages using
window-relative positions and surface them in the attach-window mouse
method settings.

Bug Fixes:
- Harden rectangle correction against completely off-screen regions to
avoid invalid ROIs during vision-based recognition.
- Ensure recruitment calculation uses the view model’s configured
selection times instead of the task queue’s values.
- Default infrastructure custom plan selection to an unset state and
migrate existing configs accordingly.
- Disable the StartGame option automatically when using attach-window
connection to prevent conflicting launch behavior.
- Prevent startup tasks from retrying the primary start button action to
reduce erroneous retries.

Enhancements:
- Adjust game/task resource definitions (including Roguelike and
specific stage/task configs) for updated gameplay flows and drop
recognition behavior.
- Refresh localizations and version update dialog content for the 6.3.3
release.

</details>

## Summary by Sourcery

重构任务队列视图模型以共享通用序列化接口,提升基于视觉的识别与任务执行流程的稳定性,并为 6.3.3 版本更新输入选项、配置默认值和游戏资源。

新特性:
- 新增 Win32 输入方式,可发送或投递相对窗口的消息,并将其作为可选的鼠标输入选项用于“附加窗口”连接。

错误修复:
- 防止无效或完全位于屏幕外的矩形在视觉处理过程中产生错误的感兴趣区域(ROI)。
- 确保干员招募概率计算使用视图模型中配置的选人时间,而不是任务模型中的值。
- 通过将主开始按钮在启动任务中的重试上限设为 0,避免对主开始按钮进行重复重试。
- 将基础设施自定义方案选择默认为未设置状态,并迁移现有配置以避免意外选择方案。
- 在使用“附加窗口”模式时自动禁用 StartGame 行为,以防止启动流程冲突。

增强改进:
- 引入任务队列视图模型的共享序列化接口,并迁移多个任务设置模型以使用该接口,实现统一的任务编码。
- 收紧肉鸽、战斗、贸易站(商城)、基建、启动、奖励、回收与自定义任务的序列化逻辑,同时不改变用户可见行为。
- 调整关卡掉落 OCR,当关卡编号已确定为无效时跳过特殊的二次识别,减少不必要的工作量。
- 更新商城信用战验证和黑名单处理逻辑,更好地遵守每周日程并兼容不同客户端的黑名单映射。
- 统一配置序列化选项及默认值,并在各服务器区域刷新肉鸽与关卡任务的资源定义。
- 为 6.3.3 版本刷新本地化内容以及版本更新对话框文案。

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

## Summary by Sourcery

Refactor task queue view models to share a common serialization
interface, improve stability of vision-based recognition and task
execution flows, and update input options, configuration defaults, and
game resources for the 6.3.3 release.

New Features:
- Add new Win32 input methods that send or post window-relative messages
and expose them as selectable mouse input options for attach-window
connections.

Bug Fixes:
- Prevent invalid or fully off-screen rectangles from producing
incorrect regions of interest during vision processing.
- Ensure recruit probability calculations use the view model’s
configured selection times instead of the task model values.
- Avoid retrying the primary start button in startup tasks by capping
its retry limit at zero.
- Default infrastructure custom plan selection to an unset value and
migrate existing configuration accordingly, avoiding unintended plan
selection.
- Disable the StartGame behavior automatically when using attach-window
mode to prevent conflicting launch flows.

Enhancements:
- Introduce a shared serialization interface for task queue view models
and migrate multiple task setting models to use it for consistent task
encoding.
- Tighten Roguelike, fight, mall, infrastructure, startup, award,
reclamation, and custom task serialization logic without changing
user-facing behavior.
- Adjust stage drop OCR to skip special-case re-recognition when the
stage code is known invalid, reducing unnecessary work.
- Update mall credit-fight validation and blacklist handling to better
respect weekly schedules and client-specific blacklist mappings.
- Normalize configuration serialization options and defaults and refresh
Roguelike and stage task resource definitions across regions.
- Refresh localizations and the version update dialog copy for the 6.3.3
release.

</details>
2026-02-25 18:41:02 +08:00
uye
845197f860 docs: Update CHANGELOG for version 6.3.3
Updated CHANGELOG.md with new entries, improvements, and fixes for version 6.3.3.
2026-02-25 18:40:07 +08:00
github-actions[bot]
fb46cbd55d chore: Auto Update Game Resources - 2026-02-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/22393069463

[skip changelog]
2026-02-25 10:37:16 +00:00
Status102
22f343d368 fix: 修复游戏内快捷编队在矢量突破S2不会自动重置回技能选择界面 (#15802)
* fix: 修复游戏内快捷编队在矢量突破S2不会自动重置回技能选择界面

* chore: 注释

* perf: 外服先跳过

* chore: EN

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2026-02-25 18:35:20 +08:00
github-actions[bot]
4855537bd3 chore: Auto Templates Optimization
Triggered by e4ba0f1efe

[skip changelog]
2026-02-25 10:21:21 +00:00
uye
e4ba0f1efe perf: 优化击杀数模板图 2026-02-25 18:20:51 +08:00
Constrat
190940dfb7 ci: updates to Resource Updater and clangd (#15758)
* fix: update classifyType assignment in update_items_data function
(global and txwy are up to date)

* fix: add CMAKE_INSTALL_PREFIX to cacheVariables in CMakePresets.json

* test: cleanup infrast_data

* chore: move submodules behind cache

* fix: CMake configs update for clangd code navigation

* docs: add windows vscode docs

---------

Co-authored-by: soundofautumn <62000745+soundofautumn@users.noreply.github.com>
2026-02-25 09:57:39 +01:00
status102
c25419256f perf(wpf): 悖论和保全作业解析后自动切换作业类型 2026-02-25 16:27:20 +08:00
status102
c1fee0c5ad perf: 自动编队无干员等级、技能等级要求时跳过识别 2026-02-25 15:58:00 +08:00
Manicsteiner
3e574dfded chore: YostarJP ocr fix (#15793) 2026-02-25 00:04:01 +01:00
Constrat
b0f58ed14e fix: IS6 EN encounter regex 2026-02-24 22:36:49 +01:00
Constrat
cdb1ff11bd fix: YostarEN GO navigation fix 2026-02-24 22:02:34 +01:00
Constrat
04d55b1c02 fix: IS6 EN tongbao regex 2026-02-24 22:01:51 +01:00
github-actions[bot]
2c66199706 docs: Auto Update Changelogs of v6.3.3 (#15790)
* docs: Auto Generate Changelog of Release v6.3.3

* docs: changelog

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
2026-02-25 00:13:58 +08:00
github-actions[bot]
c9a1a2fbed chore: Auto Update Game Resources - 2026-02-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/22356445499

[skip changelog]
2026-02-24 15:04:07 +00:00
github-actions[bot]
2208e464b1 chore: Auto Update Game Resources - 2026-02-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/22348671848

[skip changelog]
2026-02-24 11:23:35 +00:00
github-actions[bot]
ed74da6d43 chore: Auto Update Game Resources - 2026-02-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/22343717529

[skip changelog]
2026-02-24 09:01:17 +00:00
status102
482c30ebbe perf: 被禁用的关卡错误进入关卡名二次识别 2026-02-24 15:19:21 +08:00
status102
832c1ebbe3 fix: 刷理智关卡名识别错误替换 2026-02-24 15:19:21 +08:00
github-actions[bot]
52455fc308 chore: Auto Update Game Resources - 2026-02-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/22340370862

[skip changelog]
2026-02-24 07:07:51 +00:00
Constrat
ff84a470f7 fix: EN IS6 tongbao wrong regex 2026-02-23 21:28:37 +01:00
github-actions[bot]
d6d8814e80 chore: Auto Update Game Resources - 2026-02-23
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/22320576641

[skip changelog]
2026-02-23 19:03:06 +00:00
Status102
e93d60a25b rft(wpf): 长草任务序列化接口重构拆分 (#15773)
## Summary by Sourcery

将任务序列化逻辑从任务设置视图模型中抽取出来,放入一个专门的序列化接口中,并在每个任务特定的视图模型中通过内部接口实现。

Enhancements:
- 引入 `ITaskQueueModelSerialize` 接口,将任务序列化相关的逻辑与 `TaskSettingsViewModel`
解耦。
- 重构多个任务特定的设置视图模型,通过私有的嵌套 `ISerialize` 接口来实现新的序列化接口。
- 简化或移除未使用的 `using` 指令,并在相关视图模型中进行一些次要的属性格式整理。

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

## Summary by Sourcery

Extract task serialization logic from task settings view models into a
dedicated serialization interface implemented via inner interfaces on
each task-specific view model.

Enhancements:
- Introduce the ITaskQueueModelSerialize interface to decouple task
serialization concerns from TaskSettingsViewModel.
- Refactor multiple task-specific settings view models to implement the
new serialization interface via private nested ISerialize interfaces.
- Simplify or remove unused using directives and minor property
formatting cleanups across affected view models.

</details>

增强内容:
- 让 TaskSettingsViewModel 实现新的 ITaskQueueModelSerialize
接口,以将任务序列化相关的关注点从视图模型中分离出来。
- 清理 TaskSettingsViewModel 中未使用的 using 指令,以减少依赖。

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

## Summary by Sourcery

将任务序列化逻辑从任务设置视图模型中抽取出来,放入一个专门的序列化接口中,并在每个任务特定的视图模型中通过内部接口实现。

Enhancements:
- 引入 `ITaskQueueModelSerialize` 接口,将任务序列化相关的逻辑与 `TaskSettingsViewModel`
解耦。
- 重构多个任务特定的设置视图模型,通过私有的嵌套 `ISerialize` 接口来实现新的序列化接口。
- 简化或移除未使用的 `using` 指令,并在相关视图模型中进行一些次要的属性格式整理。

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

## Summary by Sourcery

Extract task serialization logic from task settings view models into a
dedicated serialization interface implemented via inner interfaces on
each task-specific view model.

Enhancements:
- Introduce the ITaskQueueModelSerialize interface to decouple task
serialization concerns from TaskSettingsViewModel.
- Refactor multiple task-specific settings view models to implement the
new serialization interface via private nested ISerialize interfaces.
- Simplify or remove unused using directives and minor property
formatting cleanups across affected view models.

</details>

</details>
2026-02-24 01:06:49 +08:00
status102
4d00cc5ca3 style: format
[skip changelog]
2026-02-23 20:11:57 +08:00
status102
dd8abf3472 fix(wpf): 肉鸽烧水参数在特定情况未能生效 2026-02-23 20:04:41 +08:00
status102
69157915b5 rft(wpf): 长草任务序列化接口重构拆分 2026-02-23 20:03:45 +08:00
Status102
667a82ede4 fix: 超出范围的Rect使用{0, 0, 0, 0}代替原样返回, x, y为负值时width和height改正错误 (#15695)
* fix: 超出范围的Rect使用{0, 0, 0, 0}代替原样返回

* fix: x, y为负值时width和height改正错误

* fix: 全出去的直接0
2026-02-23 10:02:00 +08:00
status102
25df4b14a9 perf: 开始唤醒支持战斗中识别 2026-02-22 16:01:23 +08:00
Constrat
eb7d5aa523 fix: IS6 EN yostar decided to finally fix the tongbaos releasing an official translation + resource updater copper-ability 2026-02-22 00:13:29 +01:00
status102
1cad7d4e96 fix(wpf): 修复自定义基建计划在迁移时基建计划选择转换错误 2026-02-21 19:58:51 +08:00
HX3N
abbc155204 chore: YostarKR SSS#9 SSSBuffChoose
and GO-OpenOcr
2026-02-21 18:02:25 +09:00
Constrat
b2f0151ce8 fix: EN Operator OCR roi fixes + skadi alter simplification 2026-02-20 23:45:10 +01:00
MistEO
bf8e28231d feat: 适配maafw新Win32触控方式 (#15755) 2026-02-20 23:44:50 +08:00
Constrat
96f1392039 fix: IS6 EN encounter regex post ROI increase 2026-02-20 16:04:14 +01:00
undefined
393e8cb9c2 fix: touch screen support for version updated page (#15747) 2026-02-20 17:07:21 +08:00
uye
f768d21789 feat: PC 提示新增分辨率要求
close #15749
2026-02-20 16:59:38 +08:00
Constrat
107db626c0 fix: invert dice refresh with invest system priority in IS3 (#15740) 2026-02-20 16:52:33 +08:00
status102
e5e64f9e50 fix: 小工具=-公招识别3~5星设置时间未遵循设置 2026-02-20 11:24:07 +08:00
SherkeyXD
a84482374e feat: PC端忽略启动客户端设置 2026-02-19 14:17:04 +08:00
uye
c6931013d9 Release v6.3.2 (#15737)
## Summary by Sourcery

更新公招工具箱的时间选项、改进干员列表排序与电源操作的交互体验,并简化旧版 Windows 支持文档。

新功能:
- 在工具箱界面中为 3★–5★ 干员新增可配置的公招时间设置,并持久化到配置中。

缺陷修复:
- 确保自定义剿灭关卡在执行战斗任务时被正确应用,并在关卡列表中正确显示。
- 改进基建收取任务的异常处理,在出错时关闭线索发送对话框并正常停止任务。
- 修复公招时间选择器的绑定问题,确保当底层时间变化时,小时与分钟选择器能够保持同步。

优化改进:
- 优化与公招相关的视图模型属性,使用更简洁的自动属性模式,并以配置作为默认值来源。
- 以稀有度、精英化阶段、等级、潜能和 ID 的固定顺序对干员列表进行确定性排序,使已拥有与未拥有干员更易浏览。
- 用可取消的确认对话框替代固定延时的睡眠/休眠提示,将主窗口置于前台并记录操作结果。

文档:
- 在所有支持的语言中简化并统一常见问题(FAQ)部分,明确说明不再支持 Windows 7/8/8.1,并移除过时的版本说明和解决方案指引。

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

## Summary by Sourcery

Update recruitment toolbox timing options, improve operator box sorting
and power actions UX, and simplify legacy Windows support documentation.

New Features:
- Add configurable recruitment time settings for 3★–5★ operators within
the toolbox UI, persisted in configuration.

Bug Fixes:
- Ensure custom annihilation stages are correctly applied and reflected
in the stage list when running battle tasks.
- Improve infrastructure reception task failure handling by closing the
clue sending dialog and stopping cleanly on errors.
- Fix recruitment time picker bindings so hour and minute selectors stay
in sync when the underlying time changes.

Enhancements:
- Refine recruit-related view model properties to use simpler
auto-property patterns with configuration-backed defaults.
- Sort operator box lists deterministically by rarity, promotion, level,
potential, and ID to make owned and unowned operators easier to browse.
- Replace fixed-delay sleep/hibernate prompts with a cancelable
confirmation dialog that brings the main window to the foreground and
logs the result.

Documentation:
- Simplify and unify FAQ sections in all supported languages to state
that Windows 7/8/8.1 are no longer supported, removing outdated version
and workaround guidance.

</details>

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

## Summary by Sourcery

更新公招工具箱的时间选项、改进干员列表排序与电源操作的交互体验,并简化旧版 Windows 支持文档。

新功能:
- 在工具箱界面中为 3★–5★ 干员新增可配置的公招时间设置,并持久化到配置中。

缺陷修复:
- 确保自定义剿灭关卡在执行战斗任务时被正确应用,并在关卡列表中正确显示。
- 改进基建收取任务的异常处理,在出错时关闭线索发送对话框并正常停止任务。
- 修复公招时间选择器的绑定问题,确保当底层时间变化时,小时与分钟选择器能够保持同步。

优化改进:
- 优化与公招相关的视图模型属性,使用更简洁的自动属性模式,并以配置作为默认值来源。
- 以稀有度、精英化阶段、等级、潜能和 ID 的固定顺序对干员列表进行确定性排序,使已拥有与未拥有干员更易浏览。
- 用可取消的确认对话框替代固定延时的睡眠/休眠提示,将主窗口置于前台并记录操作结果。

文档:
- 在所有支持的语言中简化并统一常见问题(FAQ)部分,明确说明不再支持 Windows 7/8/8.1,并移除过时的版本说明和解决方案指引。

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

## Summary by Sourcery

Update recruitment toolbox timing options, improve operator box sorting
and power actions UX, and simplify legacy Windows support documentation.

New Features:
- Add configurable recruitment time settings for 3★–5★ operators within
the toolbox UI, persisted in configuration.

Bug Fixes:
- Ensure custom annihilation stages are correctly applied and reflected
in the stage list when running battle tasks.
- Improve infrastructure reception task failure handling by closing the
clue sending dialog and stopping cleanly on errors.
- Fix recruitment time picker bindings so hour and minute selectors stay
in sync when the underlying time changes.

Enhancements:
- Refine recruit-related view model properties to use simpler
auto-property patterns with configuration-backed defaults.
- Sort operator box lists deterministically by rarity, promotion, level,
potential, and ID to make owned and unowned operators easier to browse.
- Replace fixed-delay sleep/hibernate prompts with a cancelable
confirmation dialog that brings the main window to the foreground and
logs the result.

Documentation:
- Simplify and unify FAQ sections in all supported languages to state
that Windows 7/8/8.1 are no longer supported, removing outdated version
and workaround guidance.

</details>

</details>
2026-02-18 23:35:46 +08:00