fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 10:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,486 Commits 60 Branches 1,841 Tags
eff92fcaeb1a338695fad6feee37bfa8a589cb5b
Commit Graph

17486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Constrat
eff92fcaeb fix: allow usage of CLI build instead of only VS (#15190) 
* fix: change solutiondir to msbuildproject

* chore: perhaps a better solution
 2025-12-24 14:08:20 +01:00
Manicsteiner
9e31c5907d chore: YostarJP roguelike JieGarden ocr edit 2025-12-24 21:02:12 +08:00
萨拉托加
980b1965ab fix: 萨米积冰岩骸识别 2025-12-24 20:58:22 +08:00
Constrat
0f72f29920 i18n: EN typo 2025-12-24 13:47:35 +01:00
SherkeyXD
65b643effa chore: remove codeql workflow 2025-12-24 19:38:04 +08:00
uye
1ce3e98645 perf: RefreshCustomInfrastPlanIndexByPeriod 支持传入当前时间 2025-12-24 19:12:38 +08:00
uye
c7e3da54f0 fix: 保全关卡名识别 2025-12-24 19:05:09 +08:00
uye
1c9ba02708 chore: 资源更新忽略 .gitignore 文件 2025-12-24 17:15:48 +08:00
uye
4719135672 feat: 支持点击标题栏左上角的检测到新版本提示触发更新 2025-12-24 16:51:16 +08:00
uye
6c1bee1c36 fix: 两个检测更新的按钮在更新时禁用 2025-12-24 16:46:07 +08:00
uye
fb21199db6 fix: 未勾选自动下载更新包且无可用的 OTA 增量更新包时仍然提示“将下载完整包xxx” 2025-12-24 16:42:04 +08:00
uye
9d0b09356f feat: 右键图标菜单栏中增加日志悬浮窗切换 2025-12-24 16:09:47 +08:00
uye
1bfc0ad74b feat: 悬浮窗支持自动战斗日志源 2025-12-24 15:38:49 +08:00
Constrat
b30f7caaf2 perf: optimize templates for secrentfront 2025-12-24 00:46:06 +01:00
Constrat
8dbe2f5626 feat: YostarEN SecretFront (Hidden Front) 2025-12-24 00:45:22 +01:00
github-actions[bot]
9f0562f81e chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20471520173
[skip changelog]
 2025-12-23 21:06:06 +00:00
github-actions[bot]
db18c23375 chore: Auto Update Game Resources - 2025-12-23 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20467704410

[skip changelog]
 2025-12-23 17:47:53 +00:00
uye
38252a3424 feat: 隐秘战线 (#15115) 
* feat: 隐秘战线

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 抵达终点

* chore: Auto update by pre-commit hooks [skip changelog]

* perf: 抑制一下低概率

* feat: ui 新增隐秘战线入口

* chore: Auto update by pre-commit hooks [skip changelog]

* i18n: zh-tw

* i18n: KR

* chore: fix typo

* i18n: JP

* chore: txwy update

* chore: Auto update by pre-commit hooks [skip changelog]

* i18n: placehold

* rft: roi to json

* i18n: 翻译

* chore: 插件只在传入对应任务时启用

* fix: 任务名错误

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2025-12-24 01:43:35 +08:00
uye
052a7f861c feat: 日志悬浮窗 (#15185) 
* feat: 日志叠加层

* feat: 添加窗口选择和持久化保存

* rft: 调整部分后台代码至 vm 中

* feat: 选择列表添加 ProcessId 显示

* i18n: 翻译

* rft: 改用 CsWin32

* fix: MessageBoxResult ShowNative 报错

* chore: 移除多余的 PInvoke

* rft: OverlayViewModel 改用 PInvoke

* style: 编译警告

* rft: OverlayWindow.xaml.cs 改用 PInvoke

* perf: 优化显示效果，添加控制按钮

* chore: 改用 SetWindowLongPtr

* perf: 优化性能

* i18n: 翻译

* feat: 增加 TooltipBlock 提示

* fix: 中途开启不会滚动到日志最后一栏

* chore: 使用属性而不是字段

* chore: 注释

* fix: 窗口未显示的时候不会持久化保存目标窗口

* chore: 移除未使用变量
 2025-12-24 01:23:42 +08:00
yali-hzy
aea52328dc feat: 在任务开始后的禁用组件内也能查看tooltip (#15186) 2025-12-24 01:02:26 +08:00
Constrat
516cb292fb fix: more tongbaso regex en 2025-12-23 17:36:04 +01:00
Manicsteiner
b98e392708 chore: YostarJP roguelike JieGarden ocr edit 2025-12-23 23:24:11 +08:00
MistEO
f955cc6c06 refactor(core): 重构 ResourceLoader::load 资源加载逻辑 (#15132) 
* refactor(core): 重构 ResourceLoader::load 资源加载逻辑

- 将函数内宏定义替换为类型安全的泛型 lambda
- 修复 _custom.json 路径计算错误（仅对 .json 文件生效）
- 使用循环和数组消除 Roguelike 配置的重复加载代码
- 添加结构化注释分隔符提升可读性
- 移除未使用的 AsyncLoadConfig 宏和错误的 #undef

* fix: 修复行为不一致

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-12-23 21:42:30 +08:00
Status102
b597d0d1c1 feat: ProcessTask任务命中缓存结果 (#12651) 
* feat: ProcessTask任务命中缓存结果

* perf: 加个函数

* perf: 合并直接截图

* feat: 增加匹配模板及文字

* fix: win

* fix: ptr check

* fix: template func

* fix: type

* fix: import

* fix: empty

* perf: early retrun

* perf: shared image

* fix: import
 2025-12-23 21:40:56 +08:00
github-actions[bot]
457803748b chore: Auto Update Game Resources - 2025-12-23 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20462178052

[skip changelog]
 2025-12-23 13:37:08 +00:00
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