fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,391 Commits 61 Branches 1,836 Tags
87ed43301cb7ee4c2d2982dd9cd58535ead4e79a
Commit Graph

15391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
87ed43301c chore: Auto Update Game Resources - 2025-06-12 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15606390837

[skip changelog]
 2025-06-12 09:09:08 +00:00
HY
3c628e95dd fix: 繁中服 肉鴿助戰可能招募失敗 (#12966) 2025-06-12 10:57:32 +02:00
github-actions[bot]
21a40cc685 chore: Auto Update Game Resources - 2025-06-12 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15603966383

[skip changelog]
 2025-06-12 07:08:36 +00:00
uye
cbe1c991cc fix: 成就 id 错误 alpha/v5.18.0-beta.1.d007.gcbe1c991c 2025-06-12 02:57:15 +08:00
github-actions[bot]
f68d1dd308 chore: Auto Templates Optimization 
Triggered by bbe22ea5a2

[skip changelog]
 2025-06-11 14:46:27 +00:00
HX3N
bbe22ea5a2 chore: YostarKR ocr fix and update Infrast templates 
Changed the Training template because the mastery symbol prevented recognition when training finished.
ocr fix for EP update.
 2025-06-11 23:28:10 +09:00
dependabot[bot]
8d29464ed3 ci: bump actions/github-script from 6 to 7 in /.github/workflows in the github-actions group (#12946) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-06-11 21:29:35 +08:00
HX3N
c97c525d74 fix: UseReaminingSanityStageTip (#12959) 2025-06-11 08:21:24 +08:00
uye
c6536af73d fix: 午夜 0 点没算 0 点 alpha/v5.18.0-beta.1.d002.gc6536af73 2025-06-11 01:03:44 +08:00
uye
a903486c71 fix: 使用 Mirror 源的时候也显示了强制使用 Github 的TooltipBlock 2025-06-11 01:02:45 +08:00
uye
725a178708 Release v5.18.0-beta.1 (#12956) 
sb gh 炸了（）
v5.18.0-beta.1 		2025-06-11 00:34:11 +08:00
uye
12cbc7d47b ci: Update ci.yml 2025-06-11 00:31:31 +08:00
uye
620c63c6b0 Release v5.18.0-beta.1 (#12954) 2025-06-11 00:11:29 +08:00
github-actions[bot]
bcd61de277 docs: Auto Update Changelogs of v5.18.0-beta.1 (#12955) 
* docs: Auto Generate Changelog of Release v5.18.0-beta.1

* docs: Update CHANGELOG.md

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-06-11 00:07:08 +08:00
uye
53cb5cc3e8 chore: 多余文件描述 2025-06-10 23:59:07 +08:00
soundofautmn
839835fcba chore: 统一更新copyright 2025-06-10 23:56:27 +08:00
soundofautmn
466cd719d7 chore: 统一copyright 2025-06-10 23:56:23 +08:00
soundofautmn
ee9a44b957 chore: 修正注释warning 
warning SA1512: Single-line comments should not be followed by blank line
 2025-06-10 23:56:21 +08:00
uye
1b2df5ff5d feat: 成就系统 (#12823) 
* feat: 成就系统

* chore: 调整时间

* feat: 追溯同类成就

* chore: 调整弹窗显示

* feat: 增加解锁条件

* feat: 使用静态类替代硬编码 id

* feat: 刷理智类成就实现

* chore: 抽离 CheckProgressUnlock

* chore: 加个保底

* feat: 手动停止

* chore: 修改描述

* feat: 成就列表（待翻译）

* i18n: english

* chore: 调整排序

* chore: 使用 DynamicResource 替代硬编码颜色，取消选中高亮

* feat: 可露希尔代理程序正常运转中(1000次刷理智)

* feat: 第一次启动软件

* feat: 使用理智药

* chore: 右键图标的停止也改成ManualStop

* feat: Growl 延迟到窗口显示时弹出

* chore: 默认 WindowState 为 null

* perf: 弹窗居中，虚拟化StackPanel

* chore: 定时执行

* chore: 解锁时间显示改为本地时间

* chore: 已完成的成就不显示进度条

* chore: 统一格式

* feat: 临期理智药

* chore: 你进行了一次能将大道磨灭的代理任务

* debug: 忘了删

* feat: 使用 MirrorChyan 更新 / 输入错误 cdk

* chore: 调整设置顺序

* chore: 截图测试显示在应用中心

* chore: 调整 AchievementListWindow 绑定

* chore: summary

* fix: 卡启动

* feat: 恢复进度后保存文件

* feat(#12823): 新增成就 (#12840)

* feat: 真正的抽卡

* feat: 窥屏

* feat: 喜报

* feat: 不速之客

* feat: 自定义达人

* feat: 火星人

* feat: 严重错讠

* feat: 这也能点？

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>

* chore: 火星人

* feat: 勋章颜色

* feat: 成就图标

* feat: 问题反馈

* feat: 成就等级

* feat: 急急国王

* feat: 自动战斗

* i18n: 打个框先

* i18n: KR translation

* feat: 公招

* i18n: 翻译

* chore: 隐藏吉吉国王

* feat: 借助战

* chore: 测试版

* feat: 作弊

* chore: 优化显示效果

* chore: 忽略返回值

* feat: 或许我应该换一份作业？

* feat: 平均截图速度

* feat: 验证成就合法性，新增 CustomData 字段

* chore: 调整延迟时间过长为隐藏成就

* feat: 今日宜抽卡

* feat: 分组

* feat: 彩色！

* chore: 忘加[JsonIgnore]了

* feat: 彩色！

* chore: 这玩意啥时候混进来了

* feat: 网络折磨人

* chore: 调整描述

* chore: httpService unused

* chore: debug 模式点一次触发

* feat: 新增成就 new 提示，仅本次关闭前生效

* chore: 隐藏未解锁的隐藏成就

* feat: 挂机

* feat: 一天启动 3 次任务

* chore: lock 时重置进度

* feat: 肉鸽相关成就

* chore: 调整放弃次数

* feat: 作业点赞

* feat: 立刻停止任务

* fix: RoguelikeRetreat

* chore: 不存非法成就

* feat: 代理指挥出现错误

* fix: 次数填错了

* feat: 新增 CustomData 类辅助函数，添加时长类成就

* chore: 调整 rare 逻辑

* chore: 注释

* chore: 调整成就分类

* chore: 调整描述

* i18n: 打个框

* fix: wpf binding error

* feat: 肉鸽通关难度

* perf: 解锁和锁定全成就时禁止保存

* chore: 调整成就显示

* chore: 调整 LinearGradientBrush

* feat: 新增肉鸽 n4

* i18n: fully Claude Sonnet 4 EN translation

* i18n: 繁中翻译

* i18n: KR translation

* i18n: JP translation

* feat: JsonDataHelper 支持自定义文件夹

* feat: 自定义备份路径

* chore: 哦这该死的 xaml designer

* fix: 避免设计时生成不必要的data文件夹

* feat: 触发牛牛时按钮位置移动

* Revert "fix: 避免设计时生成不必要的data文件夹"

This reverts commit 2ac878dbbd.

* fix: 不许save, 给你抽出来

* Reapply "fix: 避免设计时生成不必要的data文件夹"

This reverts commit 76985896cb.

* chore: 调整显示顺序

* feat: 添加搜索

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Lemon-miaow <61692393+Lemon-miaow@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
 2025-06-10 23:40:25 +08:00
status102
3db8613a43 chore: wpf各种提示 (#12930) 
* chore: 给喜欢指定参数不看说明的加个提示

* chore: 给代理倍率加个?

* fix: 减重繁中

* chore: KR tweak translation

* i18n: EN dot symbol

* feat: 带提示控件使用 TooltipBlock

* chore: 调整无序列表显示

* chore: 调整显示效果

* perf: 简化自定干员提示

* fix: TooltipText 内容错误

* chore: 调整 TooltipBlock 默认 Margin

* chore: 重置 TextBox InitialShowDelay 默认行为

* chore: 修改描述

* chore: 修改自动战斗描述

* perf: 优化控件布局

* feat: 新增强制Github下载描述

* chore: 调整绑定

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-06-10 23:33:35 +08:00
status102
499564694c perf: 刷理智增加未耗尽战斗次数提示输出 2025-06-10 22:04:47 +08:00
HY
88eb57d63d fix: 繁中服 傀影肉鴿 卡在通關劇情 (#12952) 
* 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-06-10 19:56:06 +08:00
HY
4aeeac2e65 chore: update txwy for update infrast training room (#12953) 2025-06-10 19:52:59 +08:00
uye
ce2031704f perf: 移除解决方案名 
Signed-off-by: status102 <102887808+status102@users.noreply.github.com>
 2025-06-10 15:02:38 +08:00
uye
f2558002f0 perf: 移除解决方案名 
Signed-off-by: status102 <102887808+status102@users.noreply.github.com>
 2025-06-10 15:01:06 +08:00
status102
99958533ef fix: rect width & height = 0 2025-06-10 14:54:22 +08:00
status102
b6e6080f36 fix: StageDrops-Item warning 2025-06-10 14:52:52 +08:00
status102
96df05800c fix: 未进入战斗期间检测技能使用 2025-06-10 09:10:29 +08:00
HX3N
625db77e00 chore: update KR for update infrast training room 
ref 673b1b082f
 2025-06-10 09:46:59 +09:00
github-actions[bot]
96d9cad344 chore: Auto Templates Optimization 
Triggered by 12f165e08d

[skip changelog]
 2025-06-10 00:28:00 +00:00
HX3N
12f165e08d fix: YostarKR changed EnterInfrastSami due to low recognition score 2025-06-10 09:27:02 +09:00
Constrat
d96143eab2 style: fix clang alpha/v5.17.3-alpha.1.d036.gd96143eab 2025-06-09 23:17:48 +02:00
Constrat
673b1b082f chore: update EN for update infrast training room 2025-06-09 21:42:29 +02:00
status102
3a15195178 fix: 还原外服的StageDrops-TimesRec 2025-06-09 22:57:23 +08:00
uye
59c632f628 fix: 代理次数 2025-06-09 22:53:51 +08:00
ABA2396
1d54b13f6d Merge tag 'v5.17.2' into dev 
v5.17.2
 2025-06-09 11:02:25 +00:00
uye
2e9408efa9 Release v5.17.2 (#12943) v5.17.2 2025-06-09 19:01:50 +08:00
status102
02ec0426f0 Release v5.17.2 (#12941) 
fix: non ota package remove old resource
 2025-06-09 17:47:54 +08:00
status102
5bc4a68a71 fix: non ota package remove old resource 2025-06-09 17:31:13 +08:00
Hao Guan
3682278967 fix(mac): 编译兼容Swift 6.0 2025-06-09 17:07:19 +08:00
Hao Guan
ff40ff6e91 fix(mac): 资源更新改进 2025-06-09 16:48:14 +08:00
uye
f329411768 docs: 高分辨率滑动修复文档 2025-06-09 16:15:13 +08:00
uye
7988229cba fix: 高分辨率下无法进入特定关卡（虽然修了但还是不建议用 2k 4k 2025-06-09 15:44:42 +08:00
uye
67eb0aa7ca style: 多余的空格 
[skip changelog][skip ci]
 2025-06-09 14:25:17 +08:00
uye
cd25bb9fa9 perf: 优化导航逻辑 
link to #10691
 2025-06-09 14:23:11 +08:00
status102
503029581a rft: 基建技能专精状态分析 2025-06-09 09:21:50 +08:00
Constrat
5b3d638048 fix: EPChapterToEP for EN alpha/v5.17.2-alpha.1.d023.g5b3d63804 2025-06-08 19:26:07 +02:00
Constrat
edf4905733 perf: remove unneccesary InfrastTrainingTime from EN 2025-06-08 17:37:34 +02:00
Constrat
09de23dd26 style: clang format 2025-06-08 17:07:07 +02:00
status102
b96bcc2e2b perf: 合并Tooltip 2025-06-08 21:53:53 +08:00