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
10,895 Commits 61 Branches 1,840 Tags
ad4f8dfd0be955234d640e9536e533d69a0b07c9
Commit Graph

5379 Commits

Author SHA1 Message Date
status102
ad4f8dfd0b perf(WpfGui): 碎石时锁定理智药使用量为9999 2024-02-27 11:09:01 +08:00
uye
e77f92e58c 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
04c60c1ecd perf: 识别不到干员的重试次数下调为1 2024-02-26 19:38:20 +08:00
status102
b8431cc0f9 fix: 回调自动编队时识别不到干员的重试次数 
[skip changelog]
 2024-02-26 19:17:41 +08:00
status102
339682c2e4 fix: 修复使用干员组切换技能用法失效 (#8410) 
fix: 修复使用干员组切换技能用法失效
 2024-02-26 08:05:13 +08:00
status102
23eec6d25b perf(MaaCore): 移除自动战斗设置参数时不必要的警告输出 2024-02-25 22:45:11 +08:00
SmilingPie
288e1851a8 perf: 优化自动编队逻辑 (#8393) 
现在当识别到缺失的干员时会记录并继续编队，全部编队完成后一并报告并退出
并将自动编队重试次数调为0（不重试）
TODO：当仅缺失一个干员时自动借助战
 2024-02-25 21:50:55 +08:00
status102
ece27dbf89 fix: 修复使用干员组切换技能用法失效 2024-02-25 20:58:51 +08:00
status102
436769e32f perf: 调整基建专精输出文本 2024-02-25 20:10:44 +08:00
status102
1479a4ff8c perf: 移除肉鸽投资相关的无用代码 2024-02-25 18:28:38 +08:00
status102
53ecc83a5a perf: 优化自动战斗-干员追加处理正则及jarry初始化 
[skip changelog]
 2024-02-25 16:48:39 +08:00
status102
1b954d3b6b perf(WpfGui): 肉鸽高级设置-只凹精二，不可用时隐藏 2024-02-25 16:12:59 +08:00
status102
098c0a1fa4 perf: asst.log中的输出使用相对路径取代绝对路径 (#8385) 
* perf: AbstractConfig::Load改为输出相对路径

* perf: 输出相对路径
 2024-02-24 22:31:19 +08:00
MistEO
8fc10b3a8a fix: build error from meojson updates 2024-02-24 22:25:19 +08:00
status102
4081a9dc7d fix: 修复肉鸽切换模式时，投资可能在禁用的情况下显示已启用 
fix #8396
 2024-02-24 12:14:06 +08:00
status102
a833548cc5 perf: 结束后动作仅一次在执行后不恢复为无动作，而是上一次的选择项 (#8387) 
perf: 结束后动作`仅一次`在执行后不恢复为`无动作`，而是上一次的选择项
 2024-02-24 10:57:46 +08:00
status102
480f6aa8ba perf: 将肉鸽开局干员组和开局干员移动至常规设置，未勾选使用助战时隐藏可选非好友助战 (#8389) 2024-02-24 01:16:50 +08:00
status102
89ca7ec026 perf(WpfGui): 当自动战斗选择不支持的关卡时，输出作业中的关卡名 2024-02-23 17:41:55 +08:00
status102
a3f8958f39 perf: 结束后动作仅一次在执行后不恢复为无动作，而是上一次的选择项 2024-02-23 10:58:41 +08:00
Constrat
26d850a8ee fix: 72e1ba9e1e 2024-02-22 17:46:50 +01:00
Constrat
72e1ba9e1e i18n: ContinueTraining EN translation 
[skip changelog]
 2024-02-22 16:20:54 +01:00
uye
94fddb6d6e chore: 删除continue 2024-02-22 20:30:15 +08:00
uye
6cdea3ccf5 fix: 肉鸽闪退 2024-02-22 20:26:11 +08:00
uye
227f8744cb 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
6e949fb47d fix: fix oper rect in InfrastOperImageAnalyzer 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8377
 2024-02-21 18:23:28 +08:00
Horror Proton
2ed991dc2f fix: fix oper rect in InfrastOperImageAnalyzer 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/8362
 2024-02-20 17:13:52 +08:00
Alisa
28d9ea0a2a 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
90902a3116 perf: 版本字符串中文资源优化对齐 2024-02-19 15:48:51 +08:00
status102
a5a5cb4209 chore: 待部署区识别debug时m_image_draw增加冷却中文本 2024-02-18 22:44:31 +08:00
status102
608f2434b1 fix: typo 2024-02-18 12:01:27 +08:00
status102
4a63d32682 perf: fix some info from visual studio 2024-02-18 09:48:34 +08:00
status102
da23acb6bf fix: 战斗列表突袭标志点击后暂时不可见 2024-02-18 09:13:10 +08:00
status102
caa6cab82f fix: 自动战斗-战斗列表的突袭关描述从Adverse修正为Raid (#8082) 
* fix: 修复WpfGui中对突袭关的错误描述
 2024-02-17 19:28:31 +08:00
status102
cdc61fe1a6 perf: 如果待部署区未识别干员全部为冷却中，则跳过暂停识别 (#8337) 
perf: 如果待部署区未识别干员全部为冷却中，则跳过暂停识别
 2024-02-16 17:21:12 +08:00
status102
f6d571e036 perf: 如果待部署区未识别干员全部为冷却中，则跳过暂停识别 2024-02-15 16:15:54 +08:00
Rbqwow
f6e9a5761d docs: 修复所有的一图流失效链接&同步两个readme 2024-02-14 21:43:00 +08:00
status102
4c269d7f86 fix: 修复投资系统出错时，余额ocr可能出错 2024-02-13 19:41:32 +08:00
status102
ddfdae469a perf(WpfGui): 设置肉鸽投资上限为999 2024-02-13 19:25:57 +08:00
youqii
83d73c685e perf: 优化基建领取专精 (#8207) 
* fix: 将输出训练进度改为剩余时间

* fix: 删除重复代码

* fix: 修改任务roi
 2024-02-12 20:22:01 +08:00
uye
e29085f3e5 fix: gui.log 无法显示完整版本号 2024-02-10 23:32:16 +08:00
status102
7bf76068eb perf(MaaCore): ScreenCost截图失败次数为0时，不返回fault_times字段 2024-02-08 17:04:13 +08:00
status102
8a4ecb7569 fix: 修复自动检测失败时可能导致WpfGui崩溃 (#8288) 
fix #8287
 2024-02-08 16:21:13 +08:00
status102
0aa3149fe8 perf: 缓存待部署区识别，减少CPU占用 (#8275) 
perf: 优化待部署区识别，减少CPU占用
 2024-02-08 15:57:23 +08:00
uye
ff57d52f2a style: 格式化代码 2024-02-08 11:53:35 +08:00
SmilingPie
a4be895588 feat: stop and log when missing operators during formarion (#8051) 
* feat: stop and log when missing operators during formarion

* format: update format

* style: remove tab
 2024-02-08 11:50:20 +08:00
枫雨
ee18c6b44b feat: 强制定时启动添加提示对话框并可选是否显示窗口 (#8062) 
* feat: 强制定时启动添加提示对话框

* feat: 强制定时启动前显示窗口
 2024-02-08 11:44:26 +08:00
Horror Proton
baa1a66e01 feat: 运行 ReclamationAlgorithm 时默认运行 Reclamation2 而不是旧演算 (#8229) 
* feat: run `Reclamation2` from `ReclamationTask`

* feat: add param to choose Reclamation theme

* chore: c# 生息演算2入口改为ReclamationAlgorithm

* chore: UI生息演算添加"theme"参数

* chore: 漏掉的参数

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-02-08 11:26:15 +08:00
Rbqwow
b81bb094d1 chore: 移除mumu6 (#8284) 2024-02-08 03:17:06 +08:00
status102
c8dda4cc6e perf(MaaCore): ScreencapCost输出失败次数 2024-02-07 19:54:29 +08:00
Horror Proton
644d820315 fix: fix typo and undefined behavior of minmax 2024-02-07 19:09:56 +08:00