fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,784 Commits 61 Branches 1,837 Tags
e46affea54c5ea7e68e355ffa5beea7bf65c640e
Commit Graph

9784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David
e46affea54 style: name 2023-11-05 20:42:07 +01:00
status102
a8a4df598c fix: 修复移除超额理智药后，如果没有使用任何药品会导致反复识别的错误 (#7195) 2023-11-05 19:33:53 +08:00
status102
8021d57a47 fix: 修改部分变量名称 2023-11-05 18:13:04 +08:00
status102
186326bdc6 fix: 修复移除超额理智药后，如果没有使用任何药品会导致反复识别的错误 2023-11-05 18:12:09 +08:00
zzyyyl
c338bb786a chore: 调整GetImageFromROI对未声明template任务截图时，直接使用任务名命名输出图片 (#7207) 2023-11-05 12:44:04 +08:00
status102
6510852637 chore: 调整GetImageFromROI对未声明template任务截图时，直接使用任务名命名输出图片 2023-11-05 10:29:26 +08:00
北雁 Cryolitia
a8220c2781 Update sync-resource.yml 2023-11-05 02:39:01 +08:00
北雁 Cryolitia
1fe598b3ab Update sync-resource.yml 2023-11-05 02:23:44 +08:00
北雁 Cryolitia
047538e78d Update sync-resource.yml 2023-11-05 02:09:12 +08:00
uye
0a82799897 fix: 设置为管理员权限启动的 MAA 无法开机自启 2023-11-05 00:50:22 +08:00
zzyyyl
e8bfd523cd perf: 统一 views::reverse 2023-11-04 20:53:21 +08:00
Horror Proton
cf89f87eed fix: fix recruit regression [skip changelog] 
ref: b852363d2
 2023-11-04 19:33:55 +08:00
uye
1b032cef72 fix: 移除游戏资源更新中提示信息的请勿关闭MAA说明 (#7191) 
- link to #6666
 2023-11-04 12:11:28 +08:00
status102
513c4f2fb7 fix: 移除游戏资源更新中提示信息的请勿关闭MAA说明 2023-11-04 10:56:27 +08:00
北雁 Cryolitia
538a654b3d Update sync-resource.yml 2023-11-04 04:08:07 +08:00
北雁 Cryolitia
420df9a5e9 Update sync-resource.yml 2023-11-04 04:05:44 +08:00
北雁 Cryolitia
09dc337c35 Add Sync-Resource-CI (#7186) 2023-11-04 03:55:46 +08:00
Lancarus
9c1c4b05e7 perf: 肉鸽适配新干员默认技能 (#7181) 
4.5周年干员默认技能
 2023-11-03 22:19:52 +08:00
uye
154d2e0864 choreUpdate 153_layout_3_times_a_day.json 2023-11-03 21:34:15 +08:00
Lancarus
8353374fba perf: 肉鸽适配新干员默认技能 2023-11-03 18:28:39 +08:00
zzyyyl
0944905af8 perf: 使用 std::erase 取代 erase-remove 惯用法 (#7179) 2023-11-03 17:17:27 +08:00
zzyyyl
311ac93377 perf: 使用 std::erase & std::erase_if 取代 remove-erase 2023-11-03 16:46:04 +08:00
zzyyyl
68f2448d21 fix: 修复干员识别没有收起职业栏导致最后一列干员可能识别错误的问题 
fix #7172
 2023-11-03 14:13:50 +08:00
zzyyyl
b1ded09f90 perf: 优化账号切换日志输出 
link to #7171
 2023-11-03 14:00:02 +08:00
Horror Proton
b852363d29 fix: update recruit m_slot_fail 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7159
 2023-11-03 11:37:44 +08:00
David
f92beff5c1 fix: minimum 0 for Recruit Time, Invest and Roguelike Start times 2023-11-02 21:43:17 +01:00
MistEO
0f5ce22c25 Release v4.26.1 (#7166) 2023-11-03 00:25:20 +08:00
MistEO
e72aeffb74 docs: Update CHANGELOG.md 2023-11-03 00:23:09 +08:00
uye
eb607a42be fix: 连战界面显示问题 2023-11-03 00:14:49 +08:00
zzyyyl
6505eb3f6f fix: 修复连续作战中间黑屏时间长会导致判定断线重连的问题 2023-11-03 00:13:18 +08:00
uye
a593a3f407 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-11-03 00:02:37 +08:00
uye
10765b5c49 feat: 连战界面显示当前次数 2023-11-03 00:02:30 +08:00
github-actions[bot]
3bf3b3aff4 docs: Auto Update Changelogs of v4.26.1 (#7167) 
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-11-02 23:50:44 +08:00
MistEO
29a38da213 chore: Auto Update Game Resources - 2023-11-02 2023-11-02 15:48:28 +00:00
uye
2d1496719b Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-11-02 23:37:14 +08:00
uye
3a7a2d2a35 feat: ZT 关卡导航 2023-11-02 23:37:07 +08:00
MistEO
1793e9365c chore: 掉落times字段修改 2023-11-02 23:36:23 +08:00
MistEO
0dace9ca5c feat: 支持掉落次数识别+上传 2023-11-02 23:23:17 +08:00
MistEO
37b1bd02d3 Revert "chore: 試試更新 version.json 內的東西" 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/7165
This reverts commit 167624eee4.
 2023-11-02 21:37:17 +08:00
uye
c1676d9f19 chore: 繁中服「將進酒」復刻活動導航 (#7158) 2023-11-02 17:21:55 +08:00
momomochi987
167624eee4 chore: 試試更新 version.json 內的東西 2023-11-02 16:33:29 +08:00
momomochi987
6d65b5b962 chore: 繁中服「將進酒」復刻活動導航 2023-11-02 16:30:52 +08:00
MistEO
6603ac6482 chore: Auto Update Game Resources - 2023-11-02 2023-11-02 05:05:56 +00:00
status102
ae9eff490b fix: 修复理智药插件中变量名错误；调整文档中理智药相关说明 (#7147) 
fix: 修复理智药插件中变量名错误；调整文档中理智药相关说明
 2023-11-02 12:43:49 +08:00
zzyyyl
ffe0255970 style: format 
[skip changelog]
 2023-11-02 12:09:43 +08:00
Hao Guan
a3413c32ab fix: Mac GUI 兼容旧版设置 2023-11-02 12:16:33 +10:00
Lancarus
55d6b1c4ea fix：战斗列表崔林特尔梅之金第十关ocr错误 2023-11-02 02:47:44 +08:00
David
86e5f64f6c fix: Skadi Alter EN ocrreplace regex 
[skip ci] [skip changelog]
 2023-11-01 17:38:03 +01:00
status102
363b128812 docs: 翻译更正 
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
 2023-11-02 00:33:04 +08:00
MistEO
094a66f834 chore: Auto Update Game Resources - 2023-11-01 2023-11-01 15:06:19 +00:00