fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,879 Commits 60 Branches 1,840 Tags
b88cb4e23755116a9bb84e7c8c494a3e969127cf
Commit Graph

8879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lancarus
b88cb4e237 Merge branch 'sami' of https://github.com/Lancarus/MaaAssistantArknights into sami 2023-09-18 01:29:08 +08:00
MistEO
5596ad5469 feat: 适配萨米肉鸽生活至上分队，优化部分逻辑 (#6385) 2023-09-17 02:12:51 +08:00
MistEO
ff147aed81 feat: 自动战斗新增战斗列表选项（异形UI不支持） (#6350) 2023-09-17 01:59:51 +08:00
Lancarus
9e70b7b8cf Merge branch 'MaaAssistantArknights:dev' into sami 2023-09-17 01:56:10 +08:00
Lancarus
4e4008f0e6 feat: 更新萨米纵向不期而遇截图 2023-09-17 01:54:12 +08:00
status102
b691078283 docs: 添加战斗列表相关说明 2023-09-16 23:48:21 +08:00
MistEO
1888770eea fix: 将基建换班编组匹配的可用干员缓存移动至Status，以免多实例时发生冲突 (#6391) 2023-09-16 23:33:49 +08:00
status102
c4e9c0c5dd feat: 自动战斗-战斗队列 新增 未三星结束时中止流程 2023-09-16 18:47:23 +08:00
status102
08ed5304c6 perf: 调整自动战斗UI 2023-09-16 15:20:13 +08:00
status102
cd4fd07891 fix: 将基建换班编组匹配的可用干员缓存移动至Status，以免多实例时发生冲突 2023-09-16 11:09:46 +08:00
David
92dde9f441 chore: ignore template 2023-09-15 23:37:54 +02:00
Lancarus
70387a918e feat: 适配萨米肉鸽生活至上分队 2023-09-16 04:27:18 +08:00
Alisa
8fa95e4c0c [skip ci] i18n: Translations update from MAA Weblate (#6348) 
Translations update from [MAA Weblate](https://weblate.maa-org.net) for
[MaaAssistantArknights/MAA WPF
Gui](https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/).



Current translation status:

![Weblate translation
status](https://weblate.maa-org.net/widget/maa-assistant-arknights/maa-wpf-gui/horizontal-auto.svg)
alpha/v4.24.0-beta.3.d031.g8fa95e4c0 		2023-09-15 07:43:36 -05:00
Weblate
40b3652a85 Translated using Weblate (Korean) 
Currently translated at 94.8% (558 of 588 strings)

Translated using Weblate (Japanese)

Currently translated at 99.8% (587 of 588 strings)

Translated using Weblate (English (United States))

Currently translated at 99.1% (583 of 588 strings)

Translated using Weblate (English (United States))

Currently translated at 99.1% (583 of 588 strings)

Co-authored-by: Alisa <alisa@alisaqaq.moe>
Co-authored-by: Constrat <david.pezzot@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/en_US/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/ja/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/ko/
Translation: MaaAssistantArknights/MAA WPF Gui
 2023-09-15 20:43:15 +08:00
MistEO
403f57fb2d fix: 修复task.png阈值 
fix #6286
 2023-09-15 19:48:21 +08:00
MistEO
9291ff6e1f perf: 基建换班-干员编组增加可用干员缓存，同时在单次换班任务中避免重复匹配已匹配的干员 (#6376) 2023-09-15 19:15:57 +08:00
status102
6616e6a08c fix: Apply suggestions from code review 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-09-15 19:15:08 +08:00
MistEO
171329994d fix: 修复SettingsView的Idle不生效，将开始唤醒-账号切换在非Idle情况下锁定 (#6364) 2023-09-15 19:13:33 +08:00
MistEO
518f826f89 perf: 再改改优化资源下载的写法 2023-09-15 19:03:27 +08:00
MistEO
ecc3dc2f37 perf: 优化资源下载的写法 2023-09-15 19:02:11 +08:00
MistEO
cc3e7f5810 fix: 下载更新资源先使用临时文件缓存 2023-09-15 18:58:28 +08:00
David
4cf609bbc9 fix: Gadget long name reduction for EN 2023-09-15 11:49:00 +02:00
status102
d9918c998c docs: 加点注释 2023-09-15 17:29:33 +08:00
status102
4fd4a2744b perf: 基建换班-干员编组增加可用干员缓存，同时在单次换班任务中避免重复匹配已匹配的干员 2023-09-15 17:02:09 +08:00
uye
9f66fd1039 chore: 优化定时任务 2023-09-15 12:57:58 +08:00
uye
f2d37627f1 fix: etag 解析报错 
fix #6368
fix #6365
fix #6345
 2023-09-15 12:20:05 +08:00
uye
f215305a0e feat: WPF自动战斗对于作业描述的视频自动跳转增加av号支持 (#6363) 2023-09-15 10:52:48 +08:00
status102
7a3b402cfe perf: 开始唤醒-账号切换在WpfGui增加Trim 2023-09-15 09:30:36 +08:00
Lancarus
7bc861e412 feat: 优化萨米肉鸽策略 2023-09-15 03:04:08 +08:00
status102
757c0a4551 fix: 修复SettingsView的Idle不生效，将自动唤醒-账号切换在非Idle情况下锁定 2023-09-14 21:51:08 +08:00
status102
4c1499de79 feat: 自动战斗-战斗列表清空按钮增加右键清除 未激活 / 已完成 项目 2023-09-14 19:28:09 +08:00
status102
c923792a45 fix: 修复在重新启动MAA后使用本地保存的战斗列表无法直接使用自动战斗 2023-09-14 19:07:07 +08:00
status102
22b50709a4 feat: WPF自动战斗对于作业描述的视频自动跳转增加av号支持 2023-09-14 17:36:43 +08:00
status102
cca287dbb7 feat: 自动战斗新增战斗列表选项 2023-09-14 14:58:52 +08:00
MistEO
8de6799bdd fix: 将账号切换输出文本中的目标账号由输入文本改为OCR结果，尝试修复账号切换出错 (#6353) 
尝试修复#6346
 2023-09-14 14:29:42 +08:00
status102
b5e6f21c1a fix: 将账号切换输出文本中的目标账号由输入文本改为OCR结果，尝试修复账号切换出错 2023-09-13 23:03:02 +08:00
David
2102fd1e69 revert: EN version.json 
[skip ci]
alpha/v4.24.0-beta.3.d011.g2102fd1e6 		2023-09-13 12:12:48 +02:00
枫雨
36c5bca88a fix: 给关卡选择为 null 时打个补丁 
#5742
 2023-09-13 16:01:47 +08:00
枫雨
2b55f982c4 Revert "chore: 兼容旧配置" 
This reverts commit 8e044b9bdc.
 2023-09-13 16:01:47 +08:00
MistEO
886a15f318 chore: Auto Update Game Resources - 2023-09-13 2023-09-13 07:46:42 +00:00
David
05c7776f1a docs: YostarEN recommended resolution (#6303) 
1920*1080 recommendation for YostarEN clients
 2023-09-13 09:34:27 +02:00
enVineLab
2ca8d8c10c feat: 添加日服生息演算翻译 | Reclamation Algorithm JP (#6340) 
Co-authored-by: Manicsteiner <63437036+Manicsteiner@users.noreply.github.com>
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
 2023-09-13 09:28:25 +02:00
Alisa
771077cde1 [skip ci] i18n: Translations update from MAA Weblate (#6334) 
Translations update from [MAA Weblate](https://weblate.maa-org.net) for
[MaaAssistantArknights/MAA WPF
Gui](https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/).



Current translation status:

![Weblate translation
status](https://weblate.maa-org.net/widget/maa-assistant-arknights/maa-wpf-gui/horizontal-auto.svg)
 2023-09-12 21:35:50 -05:00
Weblate
0577f4b980 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (588 of 588 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (588 of 588 strings)

Translated using Weblate (Japanese)

Currently translated at 95.7% (563 of 588 strings)

Translated using Weblate (English (United States))

Currently translated at 99.1% (582 of 587 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (587 of 587 strings)

Translated using Weblate (English (United States))

Currently translated at 96.7% (568 of 587 strings)

Co-authored-by: Alisa <alisa@alisaqaq.moe>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/en_US/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/ja/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/zh_Hans/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/zh_Hant/
Translation: MaaAssistantArknights/MAA WPF Gui
 2023-09-13 04:44:55 +08:00
David
98d64be44c chore: EN infrast workshop and i18n 2023-09-12 22:44:44 +02:00
David
16f0c49098 tools: ignore templates 2023-09-12 22:33:35 +02:00
MistEO
a502330d8b feat: 更新游戏资源时弹窗提示 2023-09-12 22:39:28 +08:00
MistEO
32d402b53c Release v4.24.0-beta.3 (#6318) v4.24.0-beta.3 2023-09-12 22:19:41 +08:00
MistEO
9c36e4d90d docs: Update CHANGELOG.md 2023-09-12 22:19:31 +08:00
MistEO
4be35069e6 fix: warnings 2023-09-12 22:16:54 +08:00