fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,457 Commits 60 Branches 1,840 Tags
fa04e9033d84a065519e3a773ea335eff13391c7
Commit Graph

9457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loong
fa04e9033d ci: use submodule for maa-cli and build it from source 2023-10-16 18:36:58 +08:00
MistEO
c112f41f16 feat: update meojson to v3.1.1 (#6956) 2023-10-16 18:20:49 +08:00
MistEO
e358b95472 feat: 使用MdXaml来提升Markdown渲染表现 (#6828) 2023-10-16 18:20:29 +08:00
status102
e26d1c39f3 feat: 新增 WpfGui选项-自动战斗-战斗列表-批量导入 (#6917) 2023-10-16 18:18:12 +08:00
status102
48d90e18c5 fix: 修复自动战斗-保全ver在开始行动时第二次点击可能过早导致无法正常开始的bug (#6934) 2023-10-16 18:17:56 +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
d1397453dc feat: 肉鸽投资不进入第二层则不买东西 (#6946) 2023-10-16 10:07:44 +08:00
zzyyyl
848f4818df fix: 日服水月Rogue选择难度功能 (#6950) 
添加文字OCR所需任务，并初步测试能够正常选择“风平浪静”难度。
 2023-10-16 10:04:10 +08:00
ManicSteiner
ea08ee668e fix: 日服水月Rogue选择难度功能 2023-10-16 09:32:51 +08:00
zzyyyl
2d0c70bd86 fix: 修正日服“选择难度”按钮图片 
link to #6889

修正“选择难度”按钮图片ChooseDifficulty.png，添加ChooseDifficulty0.png
 2023-10-15 23:43:25 +08:00
ManicSteiner
983a355963 fix: issues #6889 JP part 2023-10-15 23:35:37 +08:00
zzyyyl
2e4e02e9b8 perf: 删除用不到的配置 2023-10-15 23:29:20 +08:00
zzyyyl
6b797ad8f8 feat: 投资不进入第二层则不买东西 2023-10-15 23:28:43 +08:00
uye
ee408fc254 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-10-15 21:35:13 +08:00
uye
911f603664 chore: 更新延迟延长到60分钟 2023-10-15 21:34:42 +08:00
MistEO
206d2d05bb ci: 使用 token 下载 CLI (#6941) 2023-10-15 20:05:06 +08:00
uye
2a69df7210 fix: 修改错误的绑定逻辑 && 格式化代码 2023-10-15 19:30:38 +08:00
zzyyyl
344d672aee fix: 修复干员 Lancet-2 的识别问题 
fix #6936
 2023-10-15 18:53:11 +08:00
David
5704d86849 chore: removed UnexpectedType error 2023-10-15 11:56:39 +02:00
Loong
960a5e4668 ci: trigger CI on changes to the CI workflow 2023-10-15 17:12:00 +08:00
Loong
9ad3896470 ci: download CLI with token 2023-10-15 16:38:20 +08:00
uye
67894d86fc chore: 删除多余检查 2023-10-15 15:20:27 +08:00
uye
ad9b3b9805 Merge remote-tracking branch 'origin/dev' into dev 2023-10-15 15:19:04 +08:00
uye
ae78c3f61c style: 减少点rider的报错 2023-10-15 14:58:25 +08:00
zzyyyl
3eb09badfb fix: 修复美服肉鸽卡在放弃行动弹窗界面的问题 
fix #6931
 2023-10-15 12:50:42 +08:00
status102
6fa0ce0f38 fix: 移除无用变量 2023-10-15 12:40:21 +08:00
MistEO
ff24ade09c chore: Auto Update Game Resources - 2023-10-15 2023-10-15 04:30:19 +00:00
MistEO
7077fcc8ed chore: Auto Update Game Resources - 2023-10-15 2023-10-15 04:07:09 +00:00
status102
4b507cc827 fix: 补充丢失的任务 2023-10-15 11:53:51 +08:00
status102
5866a7c502 fix: 账号切换时登录按钮调整为允许重试识别 2023-10-15 11:53:51 +08:00
MistEO
a31063f6cd chore: Auto Update Game Resources - 2023-10-15 2023-10-15 03:47:03 +00:00
Rbqwow
af4675fcab doc: 添加 Google Play 游戏 支持说明 (#6920) 2023-10-15 03:41:20 +08:00
MistEO
12e8969ef7 chore: fix c# warnings 2023-10-14 23:13:35 +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
uye
44bbc66617 wpfGui: Taggify Version (#6894) 2023-10-14 22:16:39 +08:00
zzyyyl
a1ce9266c9 fix: 修复手滑导致的日服资源加载失败的问题 2023-10-14 22:06:21 +08:00
zzyyyl
58453f734f fix: 修复战斗中费用识别错误的问题 
fix #4291
 2023-10-14 22:04:43 +08:00
zzyyyl
54bdee273e fix: 修复日服肉鸽部分不期而遇的识别 
fix #6742
 2023-10-14 21:55:36 +08:00
zzyyyl
b936ab6b27 feat: 修改日文 OCR 等价集 2023-10-14 21:54:14 +08:00
zzyyyl
8173d709d1 fix: 修复日服傀影肉鸽部分不期而遇的识别 
fix #6905
 2023-10-14 21:29:23 +08:00
MistEO
ee4b4237f3 docs: Fix README.md (#6928) 2023-10-14 21:01:47 +08:00
Yizhen Wang
77331d03bc Fix README.md 
fix #6925
 2023-10-14 12:54:15 +01:00
zzyyyl
37834dfffa feat: 修复日服傀影肉鸽卡在不期而遇 「血には血を」（以血还血）的问题 
fix #6369
 2023-10-14 19:22:01 +08:00
zzyyyl
c4dc4135e0 feat: 删除无用的 Roguelike@Continue 相关任务 2023-10-14 18:43:05 +08:00
zzyyyl
914274f589 fix: 修复肉鸽卡在招募券界面的问题 
link to #6602
fix #6907
 2023-10-14 18:42:54 +08:00
uye
5a991de5eb fix: 台服无法识别缄默德克萨斯 
fix #6916
 2023-10-14 14:40:51 +08:00