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
7,708 Commits 60 Branches 1,841 Tags
5492f418c71cfeb82ac986bb6e75dcd977c09099
Commit Graph

4000 Commits

Author SHA1 Message Date
uye
e00f3e8434 fix: 集合已修改；可能无法执行枚举操作 
fix #2984
fix #5048
fix #5076
fix #5222
 2023-06-26 01:36:01 +08:00
uye
c99823c282 chore: Update en-us.xaml 2023-06-25 18:07:50 +08:00
Weblate
e9373e5683 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (523 of 523 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (523 of 523 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (523 of 523 strings)

Translated using Weblate (English (United States))

Currently translated at 100.0% (523 of 523 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (523 of 523 strings)

Co-authored-by: uye <2396806385@qq.com>
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/
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-06-25 17:53:24 +08:00
uye
81ddb25b8e feat: 添加 吃理智药 指定次数 右键选中功能，通过右键选中时重启后不保存 
fix #4960
fix #5244
 2023-06-25 17:15:55 +08:00
Weblate
eabaf2e4cf Translated using Weblate (Japanese) 
Currently translated at 100.0% (522 of 522 strings)

Co-authored-by: Yifan <cnjsnjlyf@gmail.com>
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/ja/
Translation: MaaAssistantArknights/MAA WPF Gui
 2023-06-24 12:34:15 +08:00
uye
07516db526 fix: 修复配置名为null时添加配置报错，留空时以当前时间作为配置名 2023-06-24 12:34:01 +08:00
David
4bd049c760 typo: useless \n 
In video recognition message there is a \n that is not needed.
 2023-06-23 22:56:07 +02:00
uye
154cd14759 feat: 关闭模拟器后重置连接状态，减少无意义重连尝试 2023-06-23 18:31:43 +08:00
uye
eb2afbe32e feat: 添加连接超时 2023-06-22 13:50:08 +08:00
uye
ad9e9e505d chore: 在连接前提示替换adb 2023-06-22 13:50:08 +08:00
MistEO
1dcd266609 fix: 修复自动编队超过10人时不选人的问题 2023-06-20 20:56:31 +08:00
uye
e951505a8f feat: 关卡提示支持多个活动 2023-06-20 01:17:31 +08:00
uye
abe60abbe4 chore: 优化界面显示 2023-06-20 01:17:31 +08:00
uye
ecb83c1267 fix: 点赞接口序列化两次导致后端报错 
fix #5201
 2023-06-19 23:52:30 +08:00
David
01b4e2d78b more refactoring of en-us and formatting for the other 2023-06-18 19:48:59 +02:00
David
90746864d7 translation refactoring 
I've checked the entire en-us.xaml and tried to uniform it
while correcting some mistakes
 2023-06-18 17:17:57 +02:00
枫雨
ad5c019c3d chore: ErrorLogBrush换个颜色 2023-06-16 16:18:31 +08:00
MistEO
c7639e006a fix: 修复自动基建 bskill_man_exp4 技能错误 
fix #5123
fix #5147
fix #5152
 2023-06-13 22:37:19 +08:00
uye
165bad0afc style: 修正拼写错误的函数名 2023-06-12 18:21:36 +08:00
uye
d7bb502e8f chore: 优化退出模拟器，添加日志 2023-06-12 18:21:36 +08:00
Đỗ Quang Minh
b85949b895 Update en-us.xaml 
Changed "Addiction Command arguments" to "Additional command arguments"
 2023-06-11 08:57:03 +07:00
uye
fa797255c9 chore: Changed translation en-us.xaml 2023-06-10 23:43:40 +08:00
David
80e2f5c0f3 Changed translation en-us.xaml 
"Foreign service adaptation is unsalable, help us! It's okay to not program." is not proper english, especially "unsalable": it makes little to no sense.
I've used the Japanese version and translated it to English, adding a bit of my own. I think this is better.
 2023-06-09 15:55:32 +02:00
uye
4d83feb6b4 style: &quot; -> " 2023-06-09 16:49:03 +08:00
uye
eb4f7c654c chore: 添加 XamlStyler 外部配置，统一 Xaml 格式 2023-06-09 16:43:57 +08:00
Weblate
9406464f98 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (522 of 522 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: uye <2396806385@qq.com>
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/zh_Hans/
Translation: MaaAssistantArknights/MAA WPF Gui
 2023-06-09 14:53:29 +08:00
uye
25290a5940 fix: 修复关卡选择显示错误 2023-06-08 19:27:16 +08:00
uye
eaa5862bf0 style: 格式化代码，消除警告 2023-06-08 14:20:58 +08:00
uye
6b64500fc7 feat: 自动公招/公开招募功能支持3星使用1:00招募时间 2023-06-08 13:53:43 +08:00
uye
3e99c98b8a fix: 休眠* 执行完后不会重置为 无动作 
fix #5040
 2023-06-07 21:37:54 +08:00
uye
0c583a78a4 feat: 强制替换adb前等待进程退出 2023-06-07 18:40:44 +08:00
MistEO
1e7477b5cb perf: 优化界面配置备份逻辑 2023-06-07 00:57:20 +08:00
MistEO
67328f3f9f fix: vcxproj config 2023-06-06 00:22:33 +08:00
Weblate
7fc0866bc5 Translated using Weblate (Japanese) 
Currently translated at 100.0% (521 of 521 strings)

Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (521 of 521 strings)

Translated using Weblate (Korean)

Currently translated at 100.0% (521 of 521 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (521 of 521 strings)

Translated using Weblate (English (United States))

Currently translated at 100.0% (521 of 521 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/ko/
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/zh_Hant/
Translation: MaaAssistantArknights/MAA WPF Gui
 2023-06-05 18:06:45 +08:00
MistEO
b33ce86f2a fix: 尝试修复一些类型 2023-06-05 13:17:26 +08:00
MistEO
17d367c8e8 Revert "chore: 加入一些日志排查死锁问题" 
This reverts commit 983a6cfb82.
 2023-06-05 13:16:18 +08:00
MistEO
c96f8d28f7 fix: Ended early for smoke testing 2023-06-05 13:13:32 +08:00
uye
4dcf9fe49e fix: 修正错误的日志上下文设置 2023-06-04 22:00:09 +08:00
huige
3cb4405896 chore: 增加log点 方便跟踪 (#5011) 2023-06-04 20:54:31 +08:00
MistEO
615d066f4f fix: 尝试修复类型错误 2023-06-04 19:57:49 +08:00
uye
aa42adbbfe chore: 调整指定材料刷取数量输入上限 2023-06-04 18:51:20 +08:00
MistEO
de11d3f196 fix: 尝试修复死锁问题 2023-06-04 18:06:24 +08:00
MistEO
983a6cfb82 chore: 加入一些日志排查死锁问题 2023-06-04 16:13:20 +08:00
uye
b0e807f8c3 chore: 指定材料-刷取数量 限制输入为0~9999 2023-06-03 22:32:58 +08:00
uye
7d81642633 chore: 基建计划显示在刷理智界面底部 2023-06-03 22:32:58 +08:00
uye
89b502fd32 fix: 自动启动模拟器时概率关闭上一个打开的模拟器 
fix #4988
 2023-06-02 22:19:53 +08:00
uye
b155f5ec85 fix: 修正错误的日志上下文设置 2023-06-02 22:04:32 +08:00
MistEO
ec79db6c88 補充繁中服圖片、更新繁中文案 (#5022) 2023-06-02 13:45:11 +08:00
MistEO
0067c061cc fix: 尝试优化连接历史 2023-06-02 11:33:51 +08:00
momomochi
56d588bb3e Merge branch 'MaaAssistantArknights:dev' into AbaAba 2023-06-01 22:08:06 +08:00