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,629 Commits 60 Branches 1,841 Tags
aa1b267278bd600d5abdcfc262ea3b09827637ab
Commit Graph

17629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
aa1b267278 perf: 优化悬浮窗布局 2025-12-26 03:06:45 +08:00
status102
017c6bdce5 fix: 基建自定义配置迁移加个try 2025-12-26 02:25:52 +08:00
SherkeyXD
ccd5d30ac0 chore: 更新 pre-commit 配置 2025-12-26 00:53:35 +08:00
github-actions[bot]
e20f02c5d2 chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20508148724
[skip changelog]
 2025-12-25 16:53:07 +00:00
SherkeyXD
925bb69111 chore: 移除 isort/black 配置 2025-12-26 00:50:55 +08:00
SherkeyXD
232d4adb04 chore: update pre-commit toolchain (#15179) 2025-12-26 00:50:14 +08:00
SherkeyXD
2bae56659b chore: devcontainer 迁移至 ruff 2025-12-26 00:48:18 +08:00
SherkeyXD
b70d662a3e chore: 修复 roi updater 工具的问题 2025-12-26 00:44:27 +08:00
uye
25222f6e9a fix: 保全自动战斗日志悬浮窗 2025-12-25 22:47:19 +08:00
uye
25786dabeb fix: 保全派驻因网络波动可能无法点击阵容确认 2025-12-25 22:11:15 +08:00
uye
b8b020e839 fix: 未设置自定义基建排班路径时第一次启动会报错 2025-12-25 21:37:23 +08:00
uye
45162e093e chore: 悬浮窗移动时不隐藏，避免某些窗口点击就会触发闪烁（说的就是 QQ） 2025-12-25 21:28:11 +08:00
Status102
61fbba4b12 fix: 自定义基建计划指定某个计划后会在1分钟后被重置为定时计划 (#14649) 
* fix: 选中计划转换

fix: 解析警告

rft: 重构完成

perf: 移除_customInfrastPlanHasPeriod

rft: 设置读取

perf: 加上数量检查

i18n: warning

fix: 基建自定义计划手动选择后依旧会被时间刷新

* i18n: placehold

* i18n: KR

* i18n: EN

* fix: 时间轮换UI刷新错误

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-12-25 19:41:21 +08:00
Manicsteiner
86376c9118 feat: YostarJP SecretFront edit (#15191) 2025-12-25 15:11:57 +08:00
Constrat
dcc2c05aee Release v6.1.0-beta.3 (#15188) v6.1.0-beta.3 2025-12-25 01:24:50 +01:00
github-actions[bot]
48315226dd docs: Auto Update Changelogs of v6.1.0-beta.3 (#15195) 
* docs: Auto Generate Changelog of Release v6.1.0-beta.3

* docs: highlight

---------

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-25 01:24:23 +01:00
github-actions[bot]
7817b15929 chore: Auto Update Game Resources - 2025-12-24 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20493071706

[skip changelog]
alpha/v6.1.0-beta.2.d035.g7817b1592 		2025-12-24 20:03:47 +00:00
萨拉托加
b683cdc400 fix: 避免肉鸽快速编队点太快可能点不上 
还是先加500吧，不够再加
 2025-12-24 21:27:12 +08:00
萨拉托加
9d24679cab fix: 肉鸽因模拟器卡顿可能点进招募界面 2025-12-24 21:12:08 +08:00
Constrat
957f821976 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
b1d7950843 chore: YostarJP roguelike JieGarden ocr edit 2025-12-24 21:02:12 +08:00
萨拉托加
0bb546d1d8 fix: 萨米积冰岩骸识别 2025-12-24 20:58:22 +08:00
Constrat
49ad57dc2c i18n: EN typo 2025-12-24 13:47:35 +01:00
SherkeyXD
42d8699e63 chore: remove codeql workflow 2025-12-24 19:38:04 +08:00
uye
8dbc73e0fe perf: RefreshCustomInfrastPlanIndexByPeriod 支持传入当前时间 2025-12-24 19:12:38 +08:00
uye
0148b78711 fix: 保全关卡名识别 2025-12-24 19:05:09 +08:00
uye
dc50e93075 chore: 资源更新忽略 .gitignore 文件 2025-12-24 17:15:48 +08:00
uye
a5e7477b90 feat: 支持点击标题栏左上角的检测到新版本提示触发更新 2025-12-24 16:51:16 +08:00
uye
093320a4c8 fix: 两个检测更新的按钮在更新时禁用 2025-12-24 16:46:07 +08:00
uye
db2dfbce78 fix: 未勾选自动下载更新包且无可用的 OTA 增量更新包时仍然提示“将下载完整包xxx” 2025-12-24 16:42:04 +08:00
uye
c1a0d38037 feat: 右键图标菜单栏中增加日志悬浮窗切换 2025-12-24 16:09:47 +08:00
uye
2380db976b feat: 悬浮窗支持自动战斗日志源 2025-12-24 15:38:49 +08:00
Constrat
6f52b01076 perf: optimize templates for secrentfront 2025-12-24 00:46:06 +01:00
Constrat
4fd44e2315 feat: YostarEN SecretFront (Hidden Front) 2025-12-24 00:45:22 +01:00
github-actions[bot]
1cbe7e2670 chore: Auto update by pre-commit hooks 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20471520173
[skip changelog]
alpha/v6.1.0-beta.2.d017.g1cbe7e267 		2025-12-23 21:06:06 +00:00
github-actions[bot]
9d4a9b801b 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
442474cce1 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
5880499330 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
419d3a6711 feat: 在任务开始后的禁用组件内也能查看tooltip (#15186) 2025-12-24 01:02:26 +08:00
Constrat
e0e037fd8d fix: more tongbaso regex en 2025-12-23 17:36:04 +01:00
Manicsteiner
7ca6845b35 chore: YostarJP roguelike JieGarden ocr edit 2025-12-23 23:24:11 +08:00
MistEO
55beea8593 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
801d656329 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]
0cd1d1b63e 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
e71037a1b0 fix: 单切换账号时，任务运行计时错误 2025-12-23 21:23:48 +08:00
yali-hzy
fef77f5780 fix: 招募助战后补充低信赖干员数量不足 (#15184) 
fix: 修正补充低信赖干员数量计算，考虑是否已经招募助战干员
 2025-12-23 18:41:57 +08:00
Status102
ca9807ce09 chore: Update C# EditorConfig for c# 13 & 14 (#15146) 
[blame ignore]
 2025-12-23 17:11:48 +08:00
Constrat
32c6429825 fix: BattleStageName requiring ^$ for EN 2025-12-23 00:07:28 +01:00
HX3N
56f6ef419c i18n: KR improve client display names 2025-12-23 07:46:47 +09:00
Constrat
6532e29d88 fix: wrong template for EN 2025-12-22 23:25:53 +01:00