fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,613 Commits 60 Branches 1,840 Tags
ad3bd0c0b44e0eeee7a77cccef0d684dee5e5e25
Commit Graph

782 Commits

Author SHA1 Message Date
zzyyyl
b4ec798353 Revert "feat: 萨米肉鸽使用密文板 (#6949)" 
This reverts commit f1b4d55e3b.
 2023-10-24 00:24:26 +08:00
zzyyyl
2bdbdefa14 fix: update MaaCore.vcxproj.filters 2023-10-23 22:40:27 +08:00
youqii
dd82e0aa5e feat: GUI新增选项 2023-10-23 17:27:08 +08:00
youqii
2053c5bf6e pref: 将代码段拆进函数 2023-10-23 16:12:20 +08:00
youqii
a66a6bce42 feat: 公招出高星干员时选中多个tag 2023-10-23 16:12:19 +08:00
zzyyyl
25b70e3777 feat: 多文件任务中直接声明 baseTask 的任务不继承同名任务参数而是直接覆盖 2023-10-20 19:06:09 +08:00
Horror Proton
d38f5b2d6b chore: fix typos [skip changelog] 2023-10-20 11:36:22 +08:00
zzyyyl
af9ff4c0bb style: format [skip changelog] 
python tools\ClangFormatter\clang-formatter.py --input=src\MaaCore --ignore="[\"src/MaaCore/x64\"]"
python tools\ClangFormatter\clang-formatter.py --input=resource\ --ignore="[\"resource/Arknights-Tile-Pos\", \"resource/infrast.json\"]"
 2023-10-19 14:35:06 +08:00
Lancarus
f1b4d55e3b feat: 萨米肉鸽使用密文板 (#6949) 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-10-19 10:57:33 +08:00
zzyyyl
d094616037 perf: TaskData 优化 (#6844) 
1. 调整 TaskData 的部分内部函数，增加注释
2. 从 TaskData 中拆出 JsonMisc
3. 增加一个任务 MainThemes，表示任务链入口
 2023-10-18 23:48:03 +08:00
zzyyyl
4c2067b942 rft: 从 TaskData 中拆出 JsonMisc 2023-10-18 20:57:19 +08:00
zzyyyl
a304c4e665 rft: 调整 TaskData 的部分内部函数，增加注释 2023-10-18 20:57:07 +08:00
zzyyyl
0d141a9fc9 feat: 给肉鸽任务增加截图插件 2023-10-18 20:12:39 +08:00
zzyyyl
07ea3a8d4f feat: 增加任务截图插件 2023-10-18 20:12:31 +08:00
zzyyyl
dbfd86e9d3 perf: m_plugins 使用 vector 而非 set 2023-10-18 17:56:12 +08:00
MistEO
6a06ff0fba fix: 修复干员头像保存错误 (#6967) 2023-10-17 22:48:27 +08:00
zzyyyl
27343d7182 perf: 优化部分基建日志输出 2023-10-16 21:16:24 +08:00
Lancarus
dd1b501d0d feat: 肉鸽适配新干员默认技能 (#6948) 2023-10-16 18:17:26 +08:00
MistEO
ccf91ccbaa fix: 修复账号切换时可能卡在选择账号之后的错误 (#6933) 2023-10-16 18:15:23 +08:00
zzyyyl
6b797ad8f8 feat: 投资不进入第二层则不买东西 2023-10-15 23:28:43 +08:00
status102
6fa0ce0f38 fix: 移除无用变量 2023-10-15 12:40:21 +08:00
status102
5866a7c502 fix: 账号切换时登录按钮调整为允许重试识别 2023-10-15 11:53:51 +08:00
zzyyyl
7bd2bc8e9b feat: 减少肉鸽单次操作截图次数 2023-10-14 22:56:22 +08:00
uye
b1c9070df7 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-10-14 22:31:28 +08:00
uye
213e901928 feat: 支持13章关卡导航 
fix #6927
 2023-10-14 22:30:20 +08:00
zzyyyl
f2a0894bee feat: 延长 StartUp 失败判定时长 
close #6854
 2023-10-14 22:24:35 +08:00
MistEO
7e8975caf2 feat: support GPU OCR (#6872) 2023-10-13 22:16:52 +08:00
MistEO
cd9c775386 chore: 改改log 2023-10-13 20:50:08 +08:00
MistEO
c8ed85b7ae fix: 当minitouch断开时自动重连 2023-10-13 20:48:42 +08:00
MistEO
b396fa1cae chore: 调整日志 2023-10-13 20:38:26 +08:00
zzyyyl
c3055210a4 perf: 重写理智识别 (#6885) 2023-10-12 20:53:02 +08:00
zzyyyl
6e855542c9 fix: 修复因 ocr_replace 与 m_eq_classes 冲突导致的 ocr 识别失效的问题 (#6867) 
fix #6629
 2023-10-12 19:59:44 +08:00
zzyyyl
58cffb8c3b perf: 重写理智识别 2023-10-12 15:27:04 +08:00
zzyyyl
7ca08cd71d feat: 在 StringMisc 中增加 chars_to_number 2023-10-12 15:19:50 +08:00
zzyyyl
91d0f550b9 perf: 优化 OperBox 相关代码 2023-10-12 15:19:41 +08:00
zzyyyl
9746efe0c3 style: format 2023-10-12 13:25:53 +08:00
zzyyyl
7019b21c5d fix: 修复肉鸽烧到水不停的问题 
link to 5e582cf1e1
fix #6876
 2023-10-12 00:14:03 +08:00
zzyyyl
3ec6d02986 fix: Allow BattleQuickFormation to retry 3 times 
link to #6584
 2023-10-11 23:52:12 +08:00
zzyyyl
ed6e899452 debug: save_img 默认使用缓存的图片 2023-10-11 23:21:56 +08:00
zzyyyl
4f9b7884a9 debug: 增加一些非法情况的截图 2023-10-11 19:02:57 +08:00
zzyyyl
093ef47b38 fix: 修复因 ocr_replace 与 m_eq_classes 冲突导致的 ocr 识别失效的问题 2023-10-11 18:10:41 +08:00
MistEO
4f1bf344c4 feat: support GPU OCR 2023-10-11 17:44:18 +08:00
Horror Proton
1f1a3a3d51 perf: update action on recruit confirm failure 2023-10-10 11:32:05 +08:00
status102
f1de5ca004 perf: 调整部分log输出为仅供ASST_DEBUG (#6824) 2023-10-09 22:44:20 +08:00
zzyyyl
d5866e0b13 fix: BlackReturn -> ReturnButton [skip ci] (#6806) 
fix #6795
 2023-10-09 12:33:21 +08:00
David
8c72af9a04 feat: operbox operator names localization (#6726) 
fix #6664
 2023-10-08 11:17:59 +02:00
zzyyyl
5a5073d48f rft: 优化 TaskData 的 json 解析 (#6739) 2023-10-08 15:38:58 +08:00
MistEO
71f08de9f0 perf: 优化StartUp速度，首页展开理智窗口时StartUp会关上 (#6730) 2023-10-08 15:16:12 +08:00
MistEO
63fdda068f feat: 抄作业自动跳过战斗中剧情 (#6721) 2023-10-08 15:14:23 +08:00
MistEO
d2042adf2b Apply suggestions from code review 2023-10-08 15:14:05 +08:00