fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,012 Commits 61 Branches 1,839 Tags
94a8b7dcb10d13ef35331e1d04ba824d52a86df4
Commit Graph

5401 Commits

Author SHA1 Message Date
status102
6c65842a9c refactor: 调整init 
[skip changelog]
 2024-03-03 14:02:15 +08:00
status102
c5370d1f1c fix: 已勾选理智药时再勾选碎石，无法自动9999 
[skip changelog]
 2024-03-03 11:47:54 +08:00
status102
2c72213108 fix: 修复取消勾选理智药时错误调整至9999 2024-03-03 10:44:42 +08:00
uye
12d1cf2ea6 perf: 抽卡风险提示默认选择取消 2024-03-03 03:05:35 +08:00
Lancarus
e61783dfec fix: 助战勾选框不出现bug (#8459) 2024-03-03 01:42:11 +08:00
status102
88c9054a91 fix: revert some change 
[skip changelog]
 2024-03-02 19:51:46 +08:00
Constrat
e8b1a4a65a style: tweaked comment description 
[skip ci] [skip changelog]
 2024-03-02 12:00:37 +01:00
Constrat
035ff6c926 style(i18n): spacing for reconnection gui log 
[skip ci][skip changelog]
 2024-03-02 11:08:08 +01:00
status102
e6367fd2a7 perf(WpfGui): 碎石时锁定理智药使用量为9999 (#8415) 
perf(WpfGui): 碎石时锁定理智药使用量为9999
 2024-03-02 13:50:05 +08:00
Lancarus
f725860acf fix: 修复肉鸽重复部署一个干员后不会开启技能 (#8447) 2024-03-02 13:27:03 +08:00
status102
858de4ef40 perf: reduce warning 
[skip changelog]
 2024-03-02 09:13:36 +08:00
status102
6bcb238f9a perf(WpfGui): 运行期允许滚动战斗列表 
fix #8421
 2024-03-02 08:43:19 +08:00
FreeSky-X
7df2060c3c perf: 优化仓库识别速度 (#8113) 
* perf:仓库识别

* perf:仓储识别

* fix:depot遗漏材料

* fix:ci集成

* fix:定位得分低

* feat: update analyze_all_items, format code

---------

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2024-03-01 21:29:41 +08:00
Manicsteiner
8157dedc22 i18n: update ja-jp.xaml for sami (#8435) 2024-02-29 20:45:49 +01:00
HX3N
8f4e63d633 i18n: updated ko-kr.xaml for 探索者的银凇止境 (#8433) 
i18n: some change
 2024-02-29 20:45:40 +01:00
Manicsteiner
531c65ed7c perf: 肉鸽开局干员 隐藏未实装干员 (#8436) 2024-02-29 20:42:50 +01:00
Lancarus
999f9087b5 feat: 刷开局模式增加萨米肉鸽生活队凹密文板 (#8408) 
* feat: 增加萨米肉鸽凹密文板UI，优化肉鸽部分UI的显示

* feat: 凹开局板子相关逻辑

* perf: 优化相关逻辑

* perf: 传参使用array代替string

* style: format

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-02-28 13:01:15 +08:00
Constrat
129cff1ac2 i18n: EN tweak raid -> challenge 
[skip ci] [skip changelog]
 2024-02-27 19:25:23 +01:00
status102
3c7f0d8e00 perf: 减少部分传参 
[skip changelog]
 2024-02-27 20:00:29 +08:00
uye
d0392b70c7 chore: await Async 2024-02-27 11:19:44 +08:00
status102
5581776313 perf(WpfGui): 碎石时锁定理智药使用量为9999 2024-02-27 11:09:01 +08:00
uye
1ec93236f6 docs: 更新&重构文档 (#8316) 
~~怎么就发版了~~
把除了jp以外所有的`<br>`全都改成了双空格或者回车 jp在另一个专门写jp的pr ~~md就好好去用md的换行啊kora！~~
更新所有的一图流链接 ~~甚至改了个maacore注释结果一直触发action对不起github~~
添加win7用net8的缓解措施
添加手机助手会占用adb
改了一些小东西 大概 具体看comment
加回了mumu6的文档 但是标记停更
同步zh的readme和根目录下的的readme
修改了一些文风 大概更贴近“官方文档”这种？ 哪里不对劲可以说说(
 2024-02-27 10:33:27 +08:00
status102
436eabcb76 perf: 识别不到干员的重试次数下调为1 2024-02-26 19:38:20 +08:00
status102
4ec8c32a9d fix: 回调自动编队时识别不到干员的重试次数 
[skip changelog]
 2024-02-26 19:17:41 +08:00
status102
55345e6efa fix: 修复使用干员组切换技能用法失效 (#8410) 
fix: 修复使用干员组切换技能用法失效
 2024-02-26 08:05:13 +08:00
status102
61fbb12099 perf(MaaCore): 移除自动战斗设置参数时不必要的警告输出 2024-02-25 22:45:11 +08:00
SmilingPie
1079844c22 perf: 优化自动编队逻辑 (#8393) 
现在当识别到缺失的干员时会记录并继续编队，全部编队完成后一并报告并退出
并将自动编队重试次数调为0（不重试）
TODO：当仅缺失一个干员时自动借助战
 2024-02-25 21:50:55 +08:00
status102
931b11339c fix: 修复使用干员组切换技能用法失效 2024-02-25 20:58:51 +08:00
status102
6f29561f57 perf: 调整基建专精输出文本 2024-02-25 20:10:44 +08:00
status102
172dfa62a4 perf: 移除肉鸽投资相关的无用代码 2024-02-25 18:28:38 +08:00
status102
cf15e7d65b perf: 优化自动战斗-干员追加处理正则及jarry初始化 
[skip changelog]
 2024-02-25 16:48:39 +08:00
status102
0ee6079edc perf(WpfGui): 肉鸽高级设置-只凹精二，不可用时隐藏 2024-02-25 16:12:59 +08:00
status102
50f6813de8 perf: asst.log中的输出使用相对路径取代绝对路径 (#8385) 
* perf: AbstractConfig::Load改为输出相对路径

* perf: 输出相对路径
 2024-02-24 22:31:19 +08:00
MistEO
c8cc39515a fix: build error from meojson updates 2024-02-24 22:25:19 +08:00
status102
53b644b688 fix: 修复肉鸽切换模式时，投资可能在禁用的情况下显示已启用 
fix #8396
 2024-02-24 12:14:06 +08:00
status102
1f2a6ca7eb perf: 结束后动作仅一次在执行后不恢复为无动作，而是上一次的选择项 (#8387) 
perf: 结束后动作`仅一次`在执行后不恢复为`无动作`，而是上一次的选择项
 2024-02-24 10:57:46 +08:00
status102
762e433036 perf: 将肉鸽开局干员组和开局干员移动至常规设置，未勾选使用助战时隐藏可选非好友助战 (#8389) 2024-02-24 01:16:50 +08:00
status102
3d85b7a351 perf(WpfGui): 当自动战斗选择不支持的关卡时，输出作业中的关卡名 2024-02-23 17:41:55 +08:00
status102
b40a5ec180 perf: 结束后动作仅一次在执行后不恢复为无动作，而是上一次的选择项 2024-02-23 10:58:41 +08:00
Constrat
f92f2f729f fix: b1d62d4d29 2024-02-22 17:46:50 +01:00
Constrat
b1d62d4d29 i18n: ContinueTraining EN translation 
[skip changelog]
 2024-02-22 16:20:54 +01:00
uye
ac3dcd9175 chore: 删除continue 2024-02-22 20:30:15 +08:00
uye
7fe35dfa24 fix: 肉鸽闪退 2024-02-22 20:26:11 +08:00
uye
7e97aadb5f feat: 支持肉鸽事件choice_require解析 (#7904) 
- fix #5442 
- fix #7789 
- fix #7800 
- fix #7900 
- fix #7938
- fix #7943
 2024-02-22 14:35:06 +08:00
Horror Proton
078feead6f fix: fix oper rect in InfrastOperImageAnalyzer 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8377
 2024-02-21 18:23:28 +08:00
Horror Proton
18f572e0e3 fix: fix oper rect in InfrastOperImageAnalyzer 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8362
 2024-02-20 17:13:52 +08:00
Alisa
15b537b0e2 i18n: Translations update from MAA Weblate (#8339) 
* Translated using Weblate (Japanese)

Currently translated at 99.4% (680 of 684 strings)

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translated using Weblate (Chinese (Traditional))

Currently translated at 99.6% (659 of 661 strings)

Translated using Weblate (Japanese)

Currently translated at 99.3% (657 of 661 strings)

Translated using Weblate (English (United States))

Currently translated at 99.3% (657 of 661 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 98.1% (649 of 661 strings)

Co-authored-by: Manicsteiner <manicsteiner@outlook.com>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: drunkenQCat <songjh123123@outlook.com>
Co-authored-by: uye <2396806385@qq.com>
Translate-URL: https://weblate.maa-org.net/projects/maa-assistant-arknights/maa-wpf-gui/
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

* i18n: en typos

* style: format

---------

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Manicsteiner <manicsteiner@outlook.com>
Co-authored-by: drunkenQCat <songjh123123@outlook.com>
Co-authored-by: uye <2396806385@qq.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-02-20 11:19:57 +08:00
status102
ed7da40e60 perf: 版本字符串中文资源优化对齐 2024-02-19 15:48:51 +08:00
status102
e6bf3c4605 chore: 待部署区识别debug时m_image_draw增加冷却中文本 2024-02-18 22:44:31 +08:00
status102
4f55990e8f fix: typo 2024-02-18 12:01:27 +08:00