Commit Graph

17461 Commits

Author SHA1 Message Date
status102
7104f29ec0 fix: 单切换账号时,任务运行计时错误 2025-12-23 21:23:48 +08:00
yali-hzy
2bf02da551 fix: 招募助战后补充低信赖干员数量不足 (#15184)
fix: 修正补充低信赖干员数量计算,考虑是否已经招募助战干员
2025-12-23 18:41:57 +08:00
Status102
0d1cd4aefb chore: Update C# EditorConfig for c# 13 & 14 (#15146)
[blame ignore]
2025-12-23 17:11:48 +08:00
Constrat
0696b31aff fix: BattleStageName requiring ^$ for EN 2025-12-23 00:07:28 +01:00
HX3N
92f644cd98 i18n: KR improve client display names 2025-12-23 07:46:47 +09:00
Constrat
df0bee3e85 fix: wrong template for EN 2025-12-22 23:25:53 +01:00
github-actions[bot]
dc8a53d45b feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20444930763
[skip changelog]
2025-12-22 21:52:47 +00:00
Constrat
863745066c Release v6.1.0-beta.2 (#15172)
> [!IMPORTANT]
> - [x] #15167 ~~to be merged~~ merged

## Summary by Sourcery

更新 roguelike 任务配置、区域任务资源、韩语本地化字符串,以及面向即将到来的测试版发布的模板优化设置。

改进内容:
- 刷新多个地区的 roguelike 任务配置文件和共享任务资源。
- 调整 WPF GUI 中的韩语本地化资源。
- 为更新后的资源微调模板优化配置。

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

## Summary by Sourcery

Update roguelike task configurations, regional task resources, Korean
localization strings, and template optimization settings for the
upcoming beta release.

Enhancements:
- Refresh roguelike task configuration files and shared task resources
for multiple regions.
- Adjust Korean localization resources in the WPF GUI.
- Tune template optimization configuration for updated assets.

</details>

## Summary by Sourcery

为 v6.1.0-beta.2 版本准备 Roguelike 任务处理、本地化资源和构建工具。

新特性:
- 将 Roguelike 铜币识别错误从核心任务插件上报到 WPF UI,以便进行用户可见的日志记录。

错误修复:
- 改进 Roguelike 铜币拾取行为,通过减少重试交换模式的次数,并在只检测到无效铜币时点击回退位置。

增强改进:
- 优化 macOS xcframework 的生成方式,以使用目标产物、专用构建目录以及对第三方 dylib 的动态发现。
- 调整 Roguelike 铜币调试图像的保存逻辑,以支持可选的自动清理。
- 刷新多个地区的 Roguelike 任务配置和共享任务资源。
- 更新 WPF 本地化资源(包括韩文字符串),以支持 Roguelike UI 和新增消息。
- 重新调校模板优化配置,使其与更新后的资源和素材保持一致。

CI:
- 将预定执行的 pre-commit 工作流更新为使用更高版本的 checkout 和 setup-python GitHub
Actions。

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

## Summary by Sourcery

Prepare roguelike task handling, localization resources, and build
tooling for the v6.1.0-beta.2 release.

New Features:
- Report roguelike copper recognition errors from the core task plugin
to the WPF UI for user-visible logging.

Bug Fixes:
- Improve roguelike copper pickup behavior by retrying exchange mode
fewer times and clicking a fallback position when only invalid coppers
are detected.

Enhancements:
- Refine macOS xcframework generation to use target outputs, a dedicated
build directory, and dynamic discovery of third-party dylibs.
- Adjust roguelike copper debug image saving to support optional
automatic cleanup.
- Refresh roguelike task configuration and shared task resources across
multiple regions.
- Update WPF localization resources, including Korean strings, for the
roguelike UI and new messages.
- Retune template optimization configuration to align with updated
assets and resources.

CI:
- Update scheduled pre-commit workflow to newer checkout and
setup-python GitHub Actions versions.

</details>
2025-12-22 18:18:37 +01:00
github-actions[bot]
0eed9d8ecf docs: Auto Update Changelogs of v6.1.0-beta.2 (#15135)
* docs: Auto Generate Changelog of Release v6.1.0-beta.2

* docs: early changelog. requires CN checking

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2025-12-22 18:12:22 +01:00
HX3N
859aa6fc39 chore: KR 同心 ocr 2025-12-23 02:11:51 +09:00
Constrat
4031b780ba fix: more copper regex for EN 2025-12-22 18:11:16 +01:00
Constrat
0d6b15d3da fix: update GetDropSwitch for EN
to make it same size as CN for ROI Pickup reasons
2025-12-22 17:51:30 +01:00
travellerse
22f78d1c24 fix: 完善通宝识别失败时的分支处理 (#15180) 2025-12-22 17:17:45 +01:00
github-actions[bot]
ca098c721c feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20436912089
[skip changelog]
2025-12-22 15:52:36 +00:00
Constrat
44e676d864 fix: more tongbao EN regex 2025-12-22 16:45:09 +01:00
HY
8d90f4c4f8 chore: 繁中服保全派駐 8 清音安保派駐 (#15110)
* chore: sss8 txwy

* Revert "chore: sss8 txwy"

This reverts commit 75912772e2.

* chore: 拆出 text

* chore: 先把上個週期的作業移進 old

* chore: 把作業搬移的部分交給其他 PR

This reverts commit c3904dd896.
2025-12-22 16:37:25 +01:00
HY
edfa5ca83e fix: SendClues for txwy (#15178) 2025-12-22 16:16:22 +01:00
travellerse
f563a0a451 fix: 通宝识别失败时放弃通宝 (#15167)
* fix: 通宝识别失败时放弃通宝

* fix: 初始化click_point_fallback

* fix: 通宝交换任务仅尝试2次

* fix: 不小心把调试用的传上去了

* fix: 所有通宝名称识别错误都发送反馈

* i18n: KR

* fix: Tongbao error info tweak

* perf: disable auto clean for Tongbao unknown debug image

* fix: Tongbao info case tweak

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
2025-12-22 16:15:40 +01:00
Manicsteiner
07417b012e chore: YostarJP roguelike JieGarden ocr edit 2025-12-22 23:08:31 +08:00
HX3N
dc7cb9fe2b chore: YostarKR JieGarden Encounter ocr 2025-12-22 22:59:48 +09:00
dependabot[bot]
94086a82f3 ci: bump the github-actions group in /.github/workflows with 2 updates (#15177)
Bumps the github-actions group in /.github/workflows with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/setup-python](https://github.com/actions/setup-python).


Updates `actions/checkout` from 4 to 6
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

Updates `actions/setup-python` from 5 to 6
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/setup-python
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-22 14:22:19 +01:00
Weiyou Wang
14e9d7e0ad chore(ci): 更新 macos.cmake (#15173) 2025-12-22 11:19:35 +08:00
Constrat
8ab7845222 fix: more Coppers EN regexes 2025-12-22 01:48:17 +01:00
github-actions[bot]
6e3e153e66 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20415763013
[skip changelog]
2025-12-21 21:05:48 +00:00
Constrat
ae9beb011b fix: missing Special Squad for EN 2025-12-21 21:34:26 +01:00
Constrat
6187a23a7a fix: more regex for CoppersNameOcrReplace EN 2025-12-21 21:25:36 +01:00
HX3N
1b83a46dbe fix: SendClues for Yostar server (#15168)
* fix: SendClues

* chore: expand roi

* Revert "chore: expand roi"

This reverts commit b764d81792.
2025-12-21 19:32:03 +01:00
Constrat
08e7ab88f5 fix: Missing GetDropSelectRecruit for EN 2025-12-21 19:24:10 +01:00
Constrat
534f0a7b00 fix: missing CoppersAbandonExchange for EN 2025-12-21 16:47:18 +01:00
HX3N
c787d8706f i18n: KR tweak InvestmentReach 2025-12-21 23:58:12 +09:00
Constrat
c6561616a3 fix: tonbgbao regex for EN 2025-12-21 15:07:17 +01:00
github-actions[bot]
5bec9f915d chore: Auto Templates Optimization
Triggered by ac9a7ed17b

[skip changelog]
2025-12-21 13:23:25 +00:00
uye
ac9a7ed17b feat:满线索再一键置入 2025-12-21 21:22:56 +08:00
Constrat
57ac8176a8 Release v6.1.0-beta.1 (#15134)
Sui Garden for EN KR JP
2025-12-21 13:58:38 +01:00
Manicsteiner
8b4266fbbb chore: YostarJP roguelike JieGarden ocr edits (#15162) 2025-12-21 13:56:47 +01:00
Constrat
d9be14cf3e fix: regex off all double letters for EN coppers 2025-12-21 13:56:05 +01:00
HX3N
3da6542d72 chore: YostarKR JieGarden ocr edit 2025-12-21 17:27:05 +09:00
萨拉托加
819b10d30a feat: 极寒保全派驻作业 2025-12-21 11:25:50 +08:00
github-actions[bot]
45f8acab26 chore: Auto Update Game Resources - 2025-12-21
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20402818215

[skip changelog]
2025-12-21 01:32:03 +00:00
Constrat
bb349c6a26 fix: EN requires GetDropSwitch2 2025-12-21 02:06:25 +01:00
Constrat
ec2b1749e0 fix: remove case sensitivity from CoppersNameOcrReplace 2025-12-20 22:48:03 +01:00
HX3N
1fc28cc1e0 i18n: KR tweak translation for IS nodes, achievements and general UI 2025-12-21 06:43:59 +09:00
Constrat
32527f238c i18n: EN tweak 2025-12-20 21:32:32 +01:00
status102
ca47a8eaf9 feat: Wpf日志文件输出分级 2025-12-21 00:59:38 +08:00
Constrat
19735b9018 fix: Ruwu Gate ROI is too big and detects floor number (IV) 2025-12-20 16:20:37 +01:00
Constrat
142752d5af i18n: various tweaks to IS nodes and stages 2025-12-20 16:12:54 +01:00
github-actions[bot]
7a898e9bc9 chore: Auto Templates Optimization
Triggered by 004cb671e8

[skip changelog]
2025-12-20 14:51:38 +00:00
Manicsteiner
004cb671e8 chore: YostarJP roguelike JieGarden edits (#15153) 2025-12-20 15:51:19 +01:00
Constrat
9ce36b71c3 fix: use template instead of reduced score
thanks to @HX3N
2025-12-20 15:49:09 +01:00
github-actions[bot]
ffa386932c chore: Auto Update Game Resources - 2025-12-20
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20395883077

[skip changelog]
2025-12-20 14:44:39 +00:00