6758 Commits

Author SHA1 Message Date
Constrat
5d15c20b9e fix: silverash alter eye of the blizzard EN 2026-07-15 14:29:49 +02:00
github-actions[bot]
9df49e5cf0 chore: Auto Update Game Resources - 2026-07-14
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/29343384730

[skip changelog]
2026-07-14 15:01:23 +00:00
Constrat
6e69376dff chore: EN TA navigation 2026-07-14 16:56:44 +02:00
HX3N
327e1543cb chore: KR TA stage navigation 2026-07-14 19:43:03 +09:00
Saratoga-Official
78f092f855 fix: YJ暗改用户中心间距 2026-07-13 20:48:44 +08:00
Zian Wen
7746f07fc4 fix: 修正多作业 H 关 OCR 替换 / correct H-stage OCR replacement (#17326)
## 说明

多作业模式进入 H10-1 关卡详情页后,OCR 可能会把关卡名识别为 `H1O-1`。现有替换规则没有将它还原为 `H10-1`,而是处理成了
`-1`,导致关卡校验失败并重新开始导航。

本 PR 将 `ClickStageName` 和 `ClickedCorrectStage` 中的 `$010` 改为
`${1}0`,明确区分捕获组 1 和后面的字符 `0`。

## 原因

原规则的本意是保留捕获组 1,再补一个 `0`:

```json
["(H\\d+)O(?=-)", "$010"],
["(-\\d+)O", "$010"]
```

OCR 后处理使用 `boost::regex_replace`。这里的 `$010` 会被解析为捕获组 10,而不是捕获组 1 后接
`0`。这两个正则都没有第 10 个捕获组,因此 `H1O-1` 最终被处理成 `-1`。

修改后的规则使用无歧义写法:

```json
["(H\\d+)O(?=-)", "${1}0"],
["(-\\d+)O", "${1}0"]
```

## 验证

- `resource/tasks/tasks.json` 可以正常解析。
- 四处相关替换均已改为 `${1}0`,`git diff --check` 通过。
- 使用 MAA `v6.14.1`、明日方舟 PC 端、2560 × 1440 分辨率测试 H10-1 多作业导航。

修复前:

```text
CharOcr: H1O-1
Proceed: -1
confirm stage name failed after retrying 3 times, stage name: H10-1
```

修复后,同样的 OCR 输入可以正确进入编队流程:

```text
[2026-07-12 14:12:08.499][TRC] CharOcr: H1O-1
[2026-07-12 14:12:08.499][TRC] Proceed: H10-1
[2026-07-12 14:12:09.545][INF] task: BattleStartPre, text: 开始行动
[2026-07-12 14:12:11.670][INF] SubTaskStart: BattleFormationTask
```

本次测试中没有再出现 `confirm stage name failed`。

<details>
<summary>English</summary>

## Summary

In multi-copilot mode, the stage name on the H10-1 detail panel may be
recognized as `H1O-1`. The existing replacement rules turn it into `-1`
instead of restoring `H10-1`, so stage confirmation fails and navigation
starts over.

This PR changes `$010` to `${1}0` in both `ClickStageName` and
`ClickedCorrectStage`, making the boundary between capture group 1 and
the literal `0` explicit.

## Root cause

The original rules were intended to preserve capture group 1 and append
a literal `0`:

```json
["(H\\d+)O(?=-)", "$010"],
["(-\\d+)O", "$010"]
```

OCR post-processing uses `boost::regex_replace`, where `$010` is parsed
as capture group 10 rather than capture group 1 followed by `0`. Since
these expressions do not contain a tenth capture group, `H1O-1` is
reduced to `-1`.

The replacement now uses the unambiguous `${1}0` form.

## Verification

- Parsed `resource/tasks/tasks.json` successfully.
- Confirmed all four affected replacements use `${1}0`; `git diff
--check` passes.
- Tested H10-1 multi-copilot navigation with MAA `v6.14.1` on the
Arknights PC client at 2560 × 1440.
- The same `H1O-1` OCR result was corrected to `H10-1`, after which MAA
clicked `BattleStartPre` and entered `BattleFormationTask`.
- No `confirm stage name failed` entry was produced during the post-fix
attempt.

</details>

Refs #16888
2026-07-12 15:18:15 +08:00
Saratoga-Official
9cb0ed6803 fix: 因网络原因跳过肉鸽结局剧情出错
fix #17319
2026-07-11 14:55:48 +08:00
Saratoga-Official
3f3a936508 fix: 折桠识别
fix #17317
2026-07-11 12:48:50 +08:00
github-actions[bot]
678b47531d chore: Auto Update Game Resources - 2026-07-10
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/29107560091

[skip changelog]
2026-07-10 16:30:29 +00:00
Constrat
ef8cfcf316 fix: reduce size for template to fix EN 2026-07-10 15:38:49 +02:00
Manicsteiner
2dc7f5f9a5 chore: JP coppers ocr edit 2026-07-10 10:30:25 +08:00
github-actions[bot]
be41539ecb chore: Auto Update Game Resources - 2026-07-09
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/29057418750

[skip changelog]
2026-07-09 23:29:15 +00:00
Manicsteiner
80909f002c chore: JP roguelike JieGarden StartWithSeed and ocr edits 2026-07-08 19:18:38 +08:00
Constrat
b4cdd518af chore: EN IS6 StartWithSeed 2026-07-08 12:48:50 +02:00
Manicsteiner
100e6c7202 chore: JP roguelike JieGarden DLC2 edits (#17294)
* chore: JP roguelike JieGarden DLC2 edits

* chore: more edits
2026-07-08 10:45:09 +02:00
HX3N
45365520b3 chore: KR roguelike JieGarden StartExploreWithSeed 2026-07-08 13:44:44 +09:00
Constrat
7a1f42ff73 chore: move ancient 2 yro 153 base rotations 2026-07-07 16:38:33 +02:00
Constrat
ce6c255a11 fix: EN IS6 regex tongbao 2026-07-07 16:22:30 +02:00
Constrat
8f20181d10 perf: remove dupes EN 2026-07-07 14:43:56 +02:00
Constrat
62cd390016 chore: EN IS6 DLC2 2026-07-07 14:40:15 +02:00
HX3N
f75b1e84a9 chore: KR roguelike JieGarden DLC2 (#17290)
## Summary by Sourcery

为《JieGarden》肉鸽模式 DLC2 内容新增韩文任务定义,并更新 UI 本地化。

新特性:
- 在肉鸽任务资源文件中为《JieGarden》DLC2 引入韩文任务定义。

改进:
- 更新韩文 UI 本地化字符串,以涵盖新的《JieGarden》肉鸽内容和相关术语。

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

## Summary by Sourcery

Add Korean task definitions and UI localization updates for the
JieGarden roguelike DLC2 content.

New Features:
- Introduce Korean task definitions for JieGarden DLC2 in roguelike task
resource files.

Enhancements:
- Update Korean UI localization strings to cover new JieGarden roguelike
content and terminology.

</details>

新增功能:
- 在肉鸽任务资源文件中为《节园(JieGarden)》DLC2 添加韩文任务定义。

增强改进:
- 刷新韩文 UI 本地化文案,以支持新的与肉鸽《节园(JieGarden)》相关的内容和术语。

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

## Summary by Sourcery

为《JieGarden》肉鸽模式 DLC2 内容新增韩文任务定义,并更新 UI 本地化。

新特性:
- 在肉鸽任务资源文件中为《JieGarden》DLC2 引入韩文任务定义。

改进:
- 更新韩文 UI 本地化字符串,以涵盖新的《JieGarden》肉鸽内容和相关术语。

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

## Summary by Sourcery

Add Korean task definitions and UI localization updates for the
JieGarden roguelike DLC2 content.

New Features:
- Introduce Korean task definitions for JieGarden DLC2 in roguelike task
resource files.

Enhancements:
- Update Korean UI localization strings to cover new JieGarden roguelike
content and terminology.

</details>

</details>
2026-07-07 18:07:58 +08:00
github-actions[bot]
dbfb58d0ab chore: Auto Update Game Resources - 2026-07-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28812545808

[skip changelog]
2026-07-06 18:04:31 +00:00
Manicsteiner
1556ecd8f8 chore: JP roguelike JieGarden DLC2 (#17286) 2026-07-07 01:10:38 +08:00
github-actions[bot]
d70cbb592f chore: Auto Update Game Resources - 2026-07-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28808868165

[skip changelog]
2026-07-06 17:02:21 +00:00
HY
ffd094a5d3 chore: 繁中服「未許之地」 (#17285) 2026-07-07 00:52:13 +08:00
Constrat
c99c4c5265 fix: EN varkaris weird accent 2026-07-06 17:24:08 +02:00
github-actions[bot]
8fdc612796 chore: Auto Update Game Resources - 2026-07-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28794316170

[skip changelog]
2026-07-06 13:19:05 +00:00
github-actions[bot]
f859c21d1e chore: Auto Update Game Resources - 2026-07-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28783552961

[skip changelog]
2026-07-06 10:02:53 +00:00
Manicsteiner
cbc459062e chore: EN & JP roguelike options (#17261)
* chore: JP roguelike options

* chore: edits

* chore: edit 2

* chore: more EN IS6 encounter options

* chore: ocr edit

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2026-07-06 11:05:34 +02:00
github-actions[bot]
286fab5895 chore: Auto Update Game Resources - 2026-07-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28778443939

[skip changelog]
2026-07-06 08:32:25 +00:00
github-actions[bot]
2f5b6528cc chore: Auto Templates Optimization
Triggered by a5e468a608

[skip changelog]
2026-07-04 12:02:57 +00:00
uye
a5e468a608 feat: 自动战斗多作业模式支持异体字关卡导航(需更新版本) (#16984)
## Summary by Sourcery

通过基于模板的关卡导航来处理活动关卡与支线关卡,当没有可用模板时回退到 OCR。

新功能:
- 添加一个辅助工具,用标准化关卡代码解析活动关卡模板路径,并在资源存在时使用模板匹配进行关卡导航。
- 为多协助作战关卡选择和支线复刻关卡选择启用基于模板的导航,以提升关卡识别的稳定性。

改进:
- 在资源加载阶段,按完整相对路径索引所有模板图片文件,以便在 C++ 代码中动态查找关卡导航模板。

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

## Summary by Sourcery

Introduce template-based stage navigation for event and side-story
stages, falling back to OCR when no template is available.

New Features:
- Add a helper to resolve event stage template paths from standardized
stage codes and use template matching for stage navigation when
resources exist.
- Enable template-based navigation for multi-copilot stage selection and
side-story reopen stage selection to improve stage recognition
reliability.

Enhancements:
- Index all template image files by full relative path during resource
loading to allow dynamic lookup of stage navigation templates from C++
code.

</details>

新功能:
- 为事件关卡引入基于模板的导航机制,通过从标准化路径解析每个关卡的截图模板,并在可用时优先使用模板而不是 OCR。
- 将基于模板的导航应用于多协助器(multi-copilot)关卡选择以及支线故事重开关卡选择,以在这些流程中提供更稳健的关卡识别支持。

增强:
- 在加载模板资源时按相对路径索引所有模板图片文件,以便可以从 C++ 代码中动态查找关卡导航模板。

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

## Summary by Sourcery

通过基于模板的关卡导航来处理活动关卡与支线关卡,当没有可用模板时回退到 OCR。

新功能:
- 添加一个辅助工具,用标准化关卡代码解析活动关卡模板路径,并在资源存在时使用模板匹配进行关卡导航。
- 为多协助作战关卡选择和支线复刻关卡选择启用基于模板的导航,以提升关卡识别的稳定性。

改进:
- 在资源加载阶段,按完整相对路径索引所有模板图片文件,以便在 C++ 代码中动态查找关卡导航模板。

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

## Summary by Sourcery

Introduce template-based stage navigation for event and side-story
stages, falling back to OCR when no template is available.

New Features:
- Add a helper to resolve event stage template paths from standardized
stage codes and use template matching for stage navigation when
resources exist.
- Enable template-based navigation for multi-copilot stage selection and
side-story reopen stage selection to improve stage recognition
reliability.

Enhancements:
- Index all template image files by full relative path during resource
loading to allow dynamic lookup of stage navigation templates from C++
code.

</details>

</details>
2026-07-04 20:02:34 +08:00
Constrat
699066f33c fix: EN Sui MissionFailed2 yostar changed template who would have guessed 2026-07-04 12:34:16 +02:00
uye
c558e49ca6 fix: 肉鸽事件/选项 (#17256)
* fix: 全角问号事件/选项

* fix: remove dupes for EN

* fix: 鸭爵主演?工作热情?

* fix: anchor for similars

* chore: remove stale encounters

* chore: 合并重复正则

* chore: remove unused choices from base.json + fix ordering in sui.json

* fix: 多余空格

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
2026-07-04 18:30:04 +08:00
github-actions[bot]
884375e925 chore: Auto Templates Optimization
Triggered by 9f17325823

[skip changelog]
2026-07-04 08:33:03 +00:00
HY
9f17325823 chore: 繁中服「衛戍協議:盟約」 (#17257) 2026-07-04 16:31:59 +08:00
HX3N
384d0f927d chore: revert KR Roguelike/base.json 2026-07-04 08:59:36 +09:00
github-actions[bot]
fd60168269 chore: Auto Update Game Resources - 2026-07-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28685187590

[skip changelog]
2026-07-03 22:02:56 +00:00
Constrat
aec37bc9f2 chore: EN + others MASS choice encounters addition 2026-07-03 23:54:59 +02:00
萨拉托加
727905f54a fix: 萨米肉鸽特里蒙旅行社特派团识别错误
fix #17253
2026-07-04 00:09:45 +08:00
Rin
812e764bfb fix: 基建产物收取时因loading遮挡跳过 (#17232)
* fix: 基建产物收取时因loading遮挡跳过

* fix: 修正通知收取后的 loading 分支

Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>

---------

Co-authored-by: Status102 <102887808+status102@users.noreply.github.com>
2026-07-03 23:09:17 +08:00
github-actions[bot]
f2ddb7ca58 chore: Auto Update Game Resources - 2026-07-03
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28645528896

[skip changelog]
2026-07-03 07:31:09 +00:00
github-actions[bot]
6799816529 chore: Auto Update Game Resources - 2026-07-02
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28601750165

[skip changelog]
2026-07-02 15:27:58 +00:00
uye
a49bca5844 feat: 增加当前模拟器设置帧率检测与提示 (#17219) 2026-07-02 14:53:52 +08:00
github-actions[bot]
d41c370110 chore: Auto Update Game Resources - 2026-06-30
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28439907321

[skip changelog]
2026-06-30 11:10:47 +00:00
github-actions[bot]
55668face3 chore: Auto Update Game Resources - 2026-06-29
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28395806977

[skip changelog]
2026-06-29 19:02:38 +00:00
github-actions[bot]
0239409ef4 chore: Auto Update Game Resources - 2026-06-26
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28232398301

[skip changelog]
2026-06-26 10:29:16 +00:00
github-actions[bot]
b81e1d49b5 chore: Auto Update Game Resources - 2026-06-25
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28157219377

[skip changelog]
2026-06-25 08:29:20 +00:00
github-actions[bot]
9ab5912a4b chore: Auto Update Game Resources - 2026-06-24
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/28126992299

[skip changelog]
2026-06-24 20:20:15 +00:00
Manicsteiner
382f10a58c chore: JP episide new navigation and JieGarden theme recruit 2026-06-24 23:56:21 +08:00