fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,715 Commits 61 Branches 1,840 Tags
8edfb40ce1bd2ca890f4c5f2a2e9039c60fa8721
Commit Graph

6449 Commits

Author SHA1 Message Date
github-actions[bot]
83ce081ac5 chore: Auto Update Game Resources - 2026-04-25 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24932890662

[skip changelog]
 2026-04-25 14:18:43 +00:00
Constrat
d6cdfc6c77 fix: EN IS6 trail regex 2026-04-25 15:27:15 +02:00
github-actions[bot]
f1be7f5711 chore: Auto Update Game Resources - 2026-04-24 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24893433596

[skip changelog]
 2026-04-24 14:00:14 +00:00
Roland125
e6fad34468 修复截图延迟极低时，可能会随机出现，更换产物/订单失败的问题 (#16330) 
fix: 给更换产物/订单的一环任务步骤加延时，避免在极低截图延迟下（5ms)出现更换不成功的情况。
fix: 给ConfirmProductChange任务添加一个stop出口，避免在单独测试更换产物任务时，可能会出现的一个意外报错。

点击更换订单和点击更换产物的时候（见下方两图）会有一个动画时间。

以前cpp代码里，任务执行默认有个500ms延时，可能是现在没有了吧，导致mumu extra模式下，有随机概率卡动画，点击产物会不生效，而且。

大概今年1月份就在我的基建里发现换班出问题了，但是再手动link start一次通常又能换好。

观察一段时间之后，发现能不能换成功都是随机的感觉。

同时，不管换没换对，在基建换班任务执行中，都是返回产物已切换，没有报错的。这个没搞懂怎么回事。

<img width="921" height="517" alt="image"
src="https://github.com/user-attachments/assets/5a45910d-8a87-47b8-8695-4e0f4242df8a"
/>
<img width="918" height="518" alt="image"
src="https://github.com/user-attachments/assets/c4132171-4978-4dbd-afbd-a9aaad13b6b0"
/>


额外加的stop入口是因为在执行自定任务测试的时候发现，如果切换到的产物和当前产物一致，会报错。

正常来说如果产物一致是不会进换产物流程的，所以不影响正常的换班逻辑。

## Summary by Sourcery

为产品/订单变更任务添加时序和控制流调整，以在截图延迟极低的情况下提升可靠性。

Bug Fixes:
- 在产品/订单变更步骤中引入延迟，以防止在截图延迟极低时出现随机失败。
- 为 `ConfirmProductChange` 任务添加停止退出逻辑，以避免在隔离任务测试期间，当目标产品与当前产品相同时出现错误。

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

## Summary by Sourcery

Add timing and control-flow adjustments to product/order change tasks to
improve reliability under very low screenshot latency.

Bug Fixes:
- Introduce a delay in the product/order change step to prevent random
failures when screenshots are taken with extremely low latency.
- Add a stop exit to the ConfirmProductChange task to avoid errors when
the target product is the same as the current one during isolated task
testing.

</details>
 2026-04-24 21:25:13 +08:00
github-actions[bot]
4a3780528a chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24803125569
[skip changelog]
 2026-04-22 21:18:18 +00:00
github-actions[bot]
4fb1570f91 chore: Auto Update Game Resources - 2026-04-22 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24769128852

[skip changelog]
 2026-04-22 08:48:02 +00:00
萨拉托加
3a050d301a chore: 更新保全作业 2026-04-22 09:16:47 +08:00
github-actions[bot]
a3fd3055c0 chore: Auto Update Game Resources - 2026-04-20 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24696524499

[skip changelog]
 2026-04-20 23:56:57 +00:00
github-actions[bot]
d9991239b7 chore: Auto Templates Optimization 
Triggered by af783dd558

[skip changelog]
 2026-04-20 23:37:10 +00:00
travellerse
af783dd558 feat: 线索交流时先移除所有放置的线索 (#16054) 
* feat: 线索交流时先移除所有放置的线索

* feat: 线索过多时向下滑动线索列表

* feat: 优化重试机制以处理线索过多情况

* perf: 优化移除线索逻辑

* fix: 线索板为空时移除线索视为成功
 2026-04-21 07:36:43 +08:00
github-actions[bot]
b3f9ecc259 chore: Auto Update Game Resources - 2026-04-20 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24688942932

[skip changelog]
 2026-04-20 20:34:27 +00:00
soundofautumn
1e0d04fe48 feat: 新增吃指定天数过期的理智药 (#13849) 
* chore: 格式化

i18n: 日志本地化

# Conflicts:
#	src/MaaWpfGui/Main/AsstProxy.cs
#	src/MaaWpfGui/Res/Localizations/en-us.xaml
#	src/MaaWpfGui/Res/Localizations/ko-kr.xaml
#	src/MaaWpfGui/Res/Localizations/zh-tw.xaml

feat: 删除48小时选项

# Conflicts:
#	src/MaaWpfGui/Constants/ConfigurationKeys.cs
#	src/MaaWpfGui/Res/Localizations/en-us.xaml
#	src/MaaWpfGui/Res/Localizations/ja-jp.xaml
#	src/MaaWpfGui/Res/Localizations/ko-kr.xaml
#	src/MaaWpfGui/Res/Localizations/zh-cn.xaml
#	src/MaaWpfGui/Res/Localizations/zh-tw.xaml
#	src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
#	src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml

feat: wpf添加吃N天理智药的选项

# Conflicts:
#	src/MaaWpfGui/Constants/ConfigurationKeys.cs
#	src/MaaWpfGui/Res/Localizations/zh-cn.xaml
#	src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
#	src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml

feat: api兼容

chore: 添加注释

feat: deprecated提示

feat: 每次执行任务时修改expiring_task

feat: 支持i18n

feat: 修改expiring_task

feat: 新增吃几天之内的过期药的接口

# Conflicts:
#	src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs

* fix: ocr require

* rft: 参数迁移

* rft: core结构完善

* feat: Wpf支持

* fix: 还原 StageManager中的天书, 刷理智中使用 n+标识鹰历天书

* perf: 下拉选小时

* i18n: 占位

* i18n: wpf

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2026-04-19 10:59:30 +08:00
github-actions[bot]
110db7ab85 chore: Auto Templates Optimization 
Triggered by d88d4ad484

[skip changelog]
 2026-04-18 08:39:50 +00:00
HY
d88d4ad484 chore: 繁中服宿舍截圖 & 部分 OCR 內容 (#16298) 
close #16272

## Summary by Sourcery

更新 Roguelike 任务资源，为 JieGarden 和基础任务添加新的繁体中文内容和截图。

增强内容：
- 刷新 Roguelike JieGarden 任务配置，以纳入更新后的资源和文本。
- 调整通用的 Roguelike 基础任务定义，使其与新的繁体中文本地化数据保持一致。
- 更新整体 Roguelike 任务列表元数据，以引用新增和已更新的任务资源。

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

## Summary by Sourcery

Update Roguelike task resources for JieGarden and base tasks with new
Traditional Chinese content and screenshots.

Enhancements:
- Refresh Roguelike JieGarden task configuration to incorporate updated
assets and text.
- Adjust shared Roguelike base task definitions to align with new
Traditional Chinese localization data.
- Update overall Roguelike task list metadata to reference the new and
updated task resources.

</details>
 2026-04-18 10:39:26 +02:00
Constrat
4d08a2cdbd chore: implement Quickly Place Clues for Global (#14966) 2026-04-16 14:03:44 +02:00
Constrat
84b7ed59d9 chore: EN OS minigame (#16283) 
* feat: minigame

* fix: typo

* fix: typo optimized
 2026-04-16 12:51:55 +02:00
晓丶梦丶仁
a1b6f0e9bb fix: KR OSChapterToOS OCR 2026-04-14 22:34:17 +08:00
github-actions[bot]
a852ab31b0 chore: Auto Templates Optimization 
Triggered by 757cfbf99a

[skip changelog]
 2026-04-14 14:28:42 +00:00
uye
757cfbf99a fix: yj 怎么还暗改老主题 
fix #16218
 2026-04-14 22:28:12 +08:00
Manicsteiner
7ed7d8af92 chore: YostarJP OS stages and more ocr 2026-04-14 22:21:13 +08:00
github-actions[bot]
b8f279abfa chore: Auto Templates Optimization 
Triggered by 4443367709

[skip changelog]
 2026-04-14 14:10:54 +00:00
HX3N
4443367709 chore: YostarKR OS ocr and minigame (#16268) 
* chore: KR OS stage

* chore: minigame placeholder

* chore: MiniGame OS

* chore: ocr edit

* i18n: MiniGame OS
 2026-04-14 22:10:00 +08:00
Manicsteiner
32805735ed chore: YostarJP OS ocr and minigame (#16267) 2026-04-14 22:09:33 +08:00
github-actions[bot]
b8a052fc88 chore: Auto Update Game Resources - 2026-04-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24399489743

[skip changelog]
 2026-04-14 12:42:59 +00:00
github-actions[bot]
db35bf16c8 chore: Auto Update Game Resources - 2026-04-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24389664505

[skip changelog]
 2026-04-14 08:45:37 +00:00
github-actions[bot]
5cb72d7d64 chore: Auto Update Game Resources - 2026-04-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24381737109

[skip changelog]
 2026-04-14 04:59:05 +00:00
Reverse0xCC
5b75f1caed chore: 肉鸽添加怒潮凛冬招募逻辑 (#16217) 
* chore: 肉鸽添加怒潮凛冬招募逻辑

* chore: 肉鸽添加怒潮凛冬招募逻辑

* chore: 肉鸽添加怒潮凛冬招募逻辑

* chore: 肉鸽添加怒潮凛冬招募逻辑

* chore: 肉鸽添加怒潮凛冬招募逻辑
 2026-04-13 23:05:50 +08:00
drway
98070cb7f7 chore: 添加贝洛内、怒潮凛冬基建技能数值 (#16260) 
* chore: 添加贝洛内、怒潮凛冬基建技能数值

添加贝洛内、怒潮凛冬基建技能数值

* fix: i am stupid
 2026-04-13 23:05:11 +08:00
Constrat
8c51447c86 fix: EN IS6 DLC1 regexes 2026-04-11 13:29:49 +02:00
github-actions[bot]
77df12afc2 chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24213715144
[skip changelog]
 2026-04-09 21:16:58 +00:00
github-actions[bot]
1e3e97556f chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24159097562
[skip changelog]
 2026-04-08 21:16:39 +00:00
HY
e2ebf09bd8 chore: 繁中服「次生方案」小活動 (#16216) 2026-04-08 23:11:05 +08:00
github-actions[bot]
645f402865 chore: Auto Update Game Resources - 2026-04-08 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24126353103

[skip changelog]
 2026-04-08 08:44:37 +00:00
SherkeyXD
36d47d6b89 fix: 欸我草我是啥比 2026-04-07 18:07:58 +08:00
SherkeyXD
ca3b2fa65f fix: 我是🐖 2026-04-07 18:04:49 +08:00
SherkeyXD
20c8f8ec22 feat: SideStory「人们，我们」导航 2026-04-07 12:33:14 +08:00
github-actions[bot]
041d1aa712 chore: Auto Update Game Resources - 2026-04-07 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24064379048

[skip changelog]
 2026-04-07 04:32:23 +00:00
github-actions[bot]
fbbcbc6d78 chore: Auto Update Game Resources - 2026-04-06 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24055824962

[skip changelog]
 2026-04-06 23:13:36 +00:00
github-actions[bot]
f5520e3985 chore: Auto Update Game Resources - 2026-04-06 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24055245319

[skip changelog]
 2026-04-06 22:55:36 +00:00
github-actions[bot]
c0f225231f chore: Auto Update Game Resources - 2026-04-05 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/24009463476

[skip changelog]
 2026-04-05 20:09:10 +00:00
vonnoq
d4c44bf19f fix: 繁中服基建幹員識別 (#16183) 
closes #16182

## Summary by Sourcery

错误修复：
- 修复繁体中文（txwy）任务配置文件中对基础运算符识别不正确的问题。

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

## Summary by Sourcery

Bug Fixes:
- Fix incorrect base operator identification in the Traditional Chinese
(txwy) task configuration file.

</details>
 2026-04-03 22:36:00 +08:00
github-actions[bot]
90accc86d0 chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/23922154429
[skip changelog]
 2026-04-02 21:11:34 +00:00
uye
d6e9464e1e chore: 延长一点干员冲突确认按钮后的等待时间 2026-04-03 00:11:00 +08:00
github-actions[bot]
fca7f2c8ca chore: Auto Update Game Resources - 2026-04-02 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/23908723143

[skip changelog]
 2026-04-02 15:40:46 +00:00
HY
80035fa95a chore: 繁中服「命運」主題 &「無憂夢囈」導航 (#16174) 
* chore: 「命運」主題

* chore:「無憂夢囈」導航

* chore: 跑一下 optimize_templates
 2026-04-02 17:08:28 +02:00
github-actions[bot]
1600a5afd6 chore: Auto Update Game Resources - 2026-04-01 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/23856701355

[skip changelog]
 2026-04-01 15:31:40 +00:00
github-actions[bot]
099fdf2c47 chore: Auto Update Game Resources - 2026-04-01 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/23844541937

[skip changelog]
 2026-04-01 10:40:18 +00:00
github-actions[bot]
c8d90b97a6 chore: Auto Update Game Resources - 2026-04-01 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/23837374310

[skip changelog]
 2026-04-01 07:34:14 +00:00
CH4
505d1c32c2 feat: 剿灭关卡在结算时识别周限进度 (#15847) 
* feat: 提供了基于任务协议的剿灭刷取进度识别，并以此为依据完成或继续剿灭

* fix: 添加延时以减少极端情况发生可能性

* perf: 简化检查流程

* chore: 移除不再使用的模板图

* perf: task优化

* rft: 识别迁移至掉落插件

* chore: 漏了个图

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2026-04-01 15:06:27 +08:00
github-actions[bot]
0b44a86755 chore: Auto Update Game Resources - 2026-04-01 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/23833538415

[skip changelog]
 2026-04-01 05:31:14 +00:00