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
8,845 Commits 61 Branches 1,840 Tags
8de6799bddfdb0a656dcaac4dd431cb79097d4b6
Commit Graph

8845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MistEO
4a7b5cca9c fix: 优化异常情况下etag一直不存的问题 2023-09-12 22:10:25 +08:00
MistEO
83aed90ffd fix: 修复检查更新按钮过早亮起的问题 2023-09-12 22:09:14 +08:00
MistEO
669ff378f8 fix: 修复OTA资源下载错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/6329
 2023-09-12 22:00:21 +08:00
Alisa
dc11119e8b feat: 外部通知 （ServerChan 和 SMTP） (#6332) 
fix #6257

接入外部通知，SMTP 和 ServerChan

~~还没有做哪些通知会往外部通知发。~~
仅所有任务完成后会发送通知。

发通知：`public static async Task
ExternalNotificationService.SendAsync(string title, string content);`
 2023-09-12 08:49:53 -05:00
Liam Sho
9bc5a35557 fix: send test button status wont change 2023-09-12 21:48:07 +08:00
Liam Sho
4e5e17e241 feat: add external notification tips 2023-09-12 21:46:04 +08:00
Liam Sho
258a5243ec feat: send external notification when all tasks are finished 2023-09-12 21:37:48 +08:00
MistEO
843a599bc1 feat: 繁中服「敘拉古人」活動導航 (#6330) 2023-09-12 21:22:27 +08:00
MistEO
6a38be7280 fix: 修复肉鸽某些开局干员精二后首次进入关卡时不选三技能的问题 (#6333) 2023-09-12 21:22:10 +08:00
MiaoYan JY
677bd72012 fix: 修复肉鸽某些开局干员精二后首次进入关卡时不选三技能的问题 2023-09-12 20:49:29 +08:00
Liam Sho
1243a6e6be feat: add external notification 2023-09-12 20:23:16 +08:00
momomochi987
4a169f32e7 敘拉古人活動導航 2023-09-12 20:04:28 +08:00
momomochi987
0747a6a8df 補充 "暫不下載" 圖片 2023-09-12 20:02:15 +08:00
David
aae06a4812 fix: auto update correction 2023-09-12 12:14:30 +02:00
MistEO
662498ffe8 chore: Auto Update Game Resources - 2023-09-12 2023-09-12 09:07:44 +00:00
github-actions[bot]
fa2ecdbc37 docs: Auto Update Changelogs of v4.24.0-beta.3 (#6324) 
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-09-12 17:06:43 +08:00
David
075ca891a1 revert: EN version.json d810df9bf0 2023-09-12 10:16:47 +02:00
Liam Sho
11fde1b76a Merge branch 'dev' into feat/notifications 2023-09-12 16:13:05 +08:00
MistEO
d810df9bf0 chore: Auto Update Game Resources - 2023-09-12 2023-09-12 07:34:29 +00:00
Alisa
596831fde2 i18n: Translations update from MAA Weblate (#6323) 
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/widgets/maa-assistant-arknights/-/maa-wpf-gui/horizontal-auto.svg)
 2023-09-12 02:12:00 -05:00
Weblate
f8a713c31e Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (563 of 563 strings)

Translated using Weblate (English (United States))

Currently translated at 99.1% (558 of 563 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (563 of 563 strings)

Co-authored-by: Alisa <alisa@alisaqaq.moe>
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/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-12 15:04:43 +08:00
MistEO
f69d70b1e1 doc: fix error (#6300) 
https://t.me/c/1657785089/46924
找到之前改了一半的pr了
解决问题的最好办法就是删掉问题√
 2023-09-12 15:04:37 +08:00
MistEO
4824f1c10a perf: 优化自动战斗-自动编队-追加自定干员选项UI，当选项禁用时，居中CheckBox (#6322) 
忘了居中，丑了吧唧的

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/102887808/469faad6-2b3f-4d7e-97d2-3d3665c3298a)
 2023-09-12 15:04:02 +08:00
status102
4878f62f68 perf: 优化自动战斗-自动编队-追加自定干员选项UI，当选项禁用时，居中CheckBox 2023-09-12 10:32:55 +08:00
Rbqwow
2ab0c688c7 Merge branch 'dev' into dev 2023-09-12 09:52:18 +08:00
Lancarus
53402df68c feat: 优化萨米肉鸽策略 (#6321) 
尝试修复连续两次商店节点，在第二次退出的bug（第二次进商店直接是确认离开界面）
优化招募策略
优化藏品优先度
 2023-09-12 09:29:46 +08:00
Lancarus
5332afc134 feat: 修改先行一步策略，不拿路网 2023-09-12 02:56:53 +08:00
Lancarus
d82f9e53e8 feat: 优化萨米肉鸽策略 2023-09-12 01:56:15 +08:00
松坂砂糖浆
856ce1d800 doc: 修复404的链接 (#6317) 2023-09-12 01:14:26 +08:00
Rbqwow
2d72cb09d6 doc: resolve conflicts 2023-09-11 22:57:21 +08:00
MistEO
e7fd011cc0 feat: 基建 制造站、贸易站、控制中枢 新增支持干员编组配置 (#6249) alpha/v4.24.0-beta.2.d024.ge7fd011cc 2023-09-11 22:47:06 +08:00
MistEO
c8ea39f883 feat: 新增开始唤醒时账号切换功能 (官服、B服 only) (#6268) 2023-09-11 22:46:13 +08:00
MistEO
5bfb033426 Merge branch 'dev' into dev_account_switch 2023-09-11 22:46:05 +08:00
MistEO
9ab6598d05 feat: 自动战斗-自动编队，新增自动补充低信赖干员、追加自定干员选项 (#6282) 2023-09-11 22:43:18 +08:00