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
8,072 Commits 60 Branches 1,841 Tags
5f5e1f296a3c86f82a5b9d8a2df2bb016643789d
Commit Graph

8072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
5f5e1f296a chore: 界面选项改为 mumu 6 2023-07-27 20:07:46 +08:00
uye
0a58b23d76 fix: 本地化文件错误/localization file error 
fix #5671
alpha/v4.20.1-alpha.1.d019.g0a58b23d7 		2023-07-27 19:32:01 +08:00
MistEO
a6a741ce10 docs: MaaFramework! 2023-07-27 14:34:15 +08:00
MistEO
fe1f59997c docs: 添加关联项目 MaaFramework 2023-07-27 14:32:30 +08:00
MistEO
cd886320d0 chore: Auto Update Game Resources - 2023-07-27 alpha/v4.20.1-alpha.1.d016.gcd886320d 2023-07-27 05:48:17 +00:00
MistEO
4f01f3a7ca feat: 选择刷源石锭策略时强制启用投资选项 (#5625) 2023-07-26 10:03:01 +08:00
MistEO
3ea44dd134 JP : add Operators 登臨意 (#5636) 2023-07-26 10:02:52 +08:00
Sherkey
d6124fd37c fix: 优化肉鸽招募逻辑 (#5621) 
+ 不知道为什么波登可被标记为关键干员，导致出现 #5379 #4675 提到的问题
+ MAA 现在还不会用罗比菈塔的召唤物，于是先 ban 了
+ 根据 #5607 的建议，焰苇打法优先抓泡普卡
 2023-07-26 01:58:07 +08:00
AnnAngela
4db54a10d4 ci: macos-runtime-universal.zip 生成过程自适应版本号 2023-07-25 16:42:17 +08:00
AnnAngela
63d711e1a9 ci: 改进 macos-runtime-universal.zip 生成 2023-07-25 08:08:00 +00:00
_ChingC
364f04517a ci: 添加macos-runtime的resource文件夹和dylib的symlink 2023-07-25 14:20:24 +08:00
Wallsman
bcf559de9b JP : add Operators 登臨意 
OCR be OK ? 
リン / リィン / リー
 2023-07-25 15:17:34 +09:00
MistEO
8d39f95919 fix: gui.log 在自重启后有几率无法正常写入 (#5624) 2023-07-25 02:15:22 +08:00
SherkeyXD
b3967331b2 feat: 选择刷源石锭策略时强制启用投资选项 2023-07-24 16:19:16 +08:00
TiSpH
f405f6f22c fix: gui.log 在自重启后有几率无法正常写入 2023-07-24 01:27:07 -05:00
Alisa
5a60cb1e89 i18n: Translations update from MAA Weblate (#5620) 
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-07-24 12:58:54 +08:00
Weblate
449d7ccce8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.0% (530 of 535 strings)

Translated using Weblate (Korean)

Currently translated at 99.0% (530 of 535 strings)

Translated using Weblate (Japanese)

Currently translated at 99.0% (530 of 535 strings)

Translated using Weblate (English (United States))

Currently translated at 99.0% (530 of 535 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (535 of 535 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/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-07-24 11:24:56 +08:00
David
7d266e8c4e Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-23 23:18:39 +02:00
David
ba7573635a fix: Manual stage navigation for EN (fix #4874) 
I have no clue why having the StartButton1 in the two files
(official and YostarEN) does not work.
I've tried everything from Ascii, fullMatch, copying the entire task,
but nothing worked.
This was the only solution I found.
Also inverting "Start" with "开始行动"
won't make it work in one of the two servers.
I've tested in both and it seems to work properly.
 2023-07-23 23:18:35 +02:00
David
160305728c chore: better StartButton1.png 
Without sanity logo and with higher clarity
 2023-07-23 22:14:13 +02:00
MistEO
09ae8fb76c Release v4.20.0 (#5605) v4.20.0 2023-07-23 16:04:31 +08:00
github-actions[bot]
30128df17d docs: Auto Update Changelogs of v4.20.0 (#5606) 
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-07-23 16:02:10 +08:00
AnnAngela
dc6f1e33f2 ci: 修复路径错误 2023-07-23 15:18:24 +08:00
David
574d7380cf fix: OperBox not retrieving Oper Class bar in EN 2023-07-22 22:50:30 +02:00
lhhxxxxx
ed6000a17b perf: 优化了互斥规划问题的 dlx 算法实现在一定情况下的速度 2023-07-23 04:36:56 +08:00
MistEO
f27a203690 chore: 更新deps下载脚本，使用固定版本的deps v4.20.0-rc.1 2023-07-23 02:40:57 +08:00
MistEO
bd728000fa Release v4.20.0-rc.1 (#5581) 2023-07-22 21:32:59 +08:00
github-actions[bot]
11c1d3de48 docs: Auto Update Changelogs of v4.20.0-rc.1 (#5589) 
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-07-22 21:32:48 +08:00
zewoosJ
be70cfb07d docs: add tutorial docs for kr (#5590) 
Co-authored-by: Clock <snoo91919@gmail.com>
 2023-07-22 21:26:51 +08:00
AnnAngela
6677fe7969 ci: 打包 macos dylib 2023-07-22 08:37:35 +00:00
Yumi0606
af6f08c396 优化水月部分地图部署逻辑 (#5576) 
互助 饥渴 铳与秩序 射手部队 征兆 漩涡 溟痕乐园 狩猎场
 2023-07-22 02:24:38 +08:00
MistEO
1264862024 fix: 0时的定时任务无法提前重启 (#5571) 2023-07-21 22:23:29 +08:00
MistEO
1f1924a9e7 Update tasks.json (#5580) 2023-07-21 15:29:12 +08:00
Arcelibs
3eeea3f0ae Update tasks.json 
台版 凱爾希 42 銀灰 辨識修正
抄作業時看LOG發現的
 2023-07-21 14:14:25 +08:00
Sherkey
ef1b170530 修改第一层提丰放置顺序以及站位 (#5567) 
1、将第一层除兽群外所有关卡的提丰首下
2、修改”死囚之夜“提丰位置为[ 7, 4 ]
3、修改”度假村冤魂”提丰位置为[ 1, 2 ]
4、修改“苔手”提丰位置为[ 2, 2 ]
 2023-07-21 11:14:35 +08:00
TiSpH
cb1de611c4 chore: 调整窗口标题 2023-07-20 20:54:00 -05:00
樹冠
90c229a150 Merge branch 'MaaAssistantArknights:dev' into dev 2023-07-20 20:47:54 -05:00
uye
fc91de1e6b feat: 全局配置不存在时会优先使用当前配置的字段，并赋值给全局配置 2023-07-21 08:54:39 +08:00
David
ffbdef1637 feat: added missing strings form missing_translate-YostarEN 2023-07-20 23:00:17 +02:00
TiSpH
069c1e9dbb fix: 0时的定时任务无法提前重启 2023-07-20 14:03:45 -05:00
MistEO
6125f5d912 chore: Auto Update Game Resources - 2023-07-20 alpha/v4.20.0-beta.3.d019.g6125f5d91 2023-07-20 17:08:01 +00:00
David
6436df1860 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-20 19:00:29 +02:00
David
9ec20fda64 feat: FC event stages implementation for KR 2023-07-20 19:00:24 +02:00
David
446cbd3fda feat: FC event stages implementation for JP 2023-07-20 18:59:15 +02:00
David
0a58bc16dd feat: FC event stages implementation for EN 2023-07-20 18:58:16 +02:00
MistEO
4441c32b16 fix: 修复初次使用多出来一个Global配置的问题 2023-07-20 23:35:54 +08:00
David
9171bee9e6 docs: added new ignored Sami IS4 images 2023-07-20 17:33:36 +02:00
David
1c6ae6e3e9 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-07-20 17:09:25 +02:00
David
9f2c7488b3 fix: Workaround for EN infrastracture oper regex (#5549) 2023-07-20 17:08:58 +02:00
uye
f7a10e6b5f feat: 未配置全局变量时也进行储存 2023-07-20 23:06:04 +08:00