fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 01:59:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,490 Commits 61 Branches 1,838 Tags
9e56a8bd29b1fbcf6d3901a9779d3c94dea1631f
Commit Graph

9490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzyyyl
9e56a8bd29 fix: 修复战斗中费用识别错误的问题 
fix #4291
 2023-10-14 22:04:43 +08:00
zzyyyl
68a4a4041f fix: 修复日服肉鸽部分不期而遇的识别 
fix #6742
 2023-10-14 21:55:36 +08:00
zzyyyl
09728df29f feat: 修改日文 OCR 等价集 2023-10-14 21:54:14 +08:00
zzyyyl
19fd7c3023 fix: 修复日服傀影肉鸽部分不期而遇的识别 
fix #6905
 2023-10-14 21:29:23 +08:00
MistEO
d7b4a65a22 docs: Fix README.md (#6928) 2023-10-14 21:01:47 +08:00
Yizhen Wang
8218492af7 Fix README.md 
fix #6925
 2023-10-14 12:54:15 +01:00
zzyyyl
0237af9b06 feat: 修复日服傀影肉鸽卡在不期而遇 「血には血を」（以血还血）的问题 
fix #6369
 2023-10-14 19:22:01 +08:00
zzyyyl
bd40f03422 feat: 删除无用的 Roguelike@Continue 相关任务 2023-10-14 18:43:05 +08:00
zzyyyl
c2ce9e1a69 fix: 修复肉鸽卡在招募券界面的问题 
link to #6602
fix #6907
 2023-10-14 18:42:54 +08:00
uye
a0a55e4eb5 fix: 台服无法识别缄默德克萨斯 
fix #6916
 2023-10-14 14:40:51 +08:00
uye
b64142496c chore: 优化资源更新相关代码 2023-10-14 02:46:04 +08:00
MistEO
b5588d57b3 perf: 进一步优化资源更新逻辑，修复一些问题 2023-10-14 01:58:44 +08:00
MistEO
1a65210e89 chore: Auto Update Game Resources - 2023-10-13 2023-10-13 14:30:37 +00:00
MistEO
f49c5e963e feat: support GPU OCR (#6872) alpha/v4.25.1-alpha.1.d068.gf49c5e963 2023-10-13 22:16:52 +08:00
MistEO
209abd8911 feat: Only check version.json for Resource OTA (#6901) 2023-10-13 22:15:20 +08:00
MistEO
5111343ecb fix: 在CharsNameOcrReplace添加一条规则，将“^一”替换为空 (#6908) 2023-10-13 22:14:43 +08:00
lanhao34
8ce8e5414f fix: 只匹配开头的字符串“^一” 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-10-13 09:57:22 -04:00
MistEO
0cde898a26 fix: 回滚资源更新多文件逻辑 2023-10-13 21:18:08 +08:00
Songyang.Huo
7cd13475f9 fix: 注释掉一行代码，消除一个Warning (#6904) 2023-10-13 20:55:53 +08:00
MistEO
7588492891 chore: 改改log 2023-10-13 20:50:08 +08:00
MistEO
a2a50c9f48 fix: 当minitouch断开时自动重连 2023-10-13 20:48:42 +08:00
MistEO
32e78ae359 chore: 调整日志 2023-10-13 20:38:26 +08:00
筱竹聽雨
edc872aba0 feat: 更新内置243一天四换极限效率 (#6883) 2023-10-13 20:20:59 +08:00
MistEO
7f08865a6a Merge branch 'dev' into perf/resource_ota 2023-10-13 20:20:14 +08:00
lanhao34
0efd44da9b fix: 在CharsNameOcrReplace添加一条规则，将“^一”替换为空 
煌和陈在OCR识别中有时候前面会多识别出两个字符“^一”，替换为空即可解决。
 2023-10-13 19:42:15 +08:00
zzyyyl
e03fee55f5 perf: 使用多模板重写 StartButton2；优化 PRTS#next 
btw, 代码里只有 StartButton2 的次数限制，没有 StartButton2Adverse 的次数限制（
 2023-10-13 18:29:20 +08:00
zzyyyl
c0e5aa674f fix: 修复理智不足时反复点击开始行动而不吃药的问题 
fix #6902
 2023-10-13 18:29:12 +08:00
uye
36270f0c2f Revert "ci: Update smoke-testing.yml -> .NET8" 
This reverts commit d8a4d9b762.
 2023-10-13 18:00:46 +08:00
MistEO
5c7db8b71f rft: 重构 ResourceUpdater (#6884) 2023-10-13 17:44:15 +08:00
uye
084a5c7750 chore: Merge into pattern 2023-10-13 16:54:28 +08:00
uye
e033e220b6 chore: 添加枚举注释 2023-10-13 16:50:57 +08:00
uye
69b93fbeee Merge remote-tracking branch 'origin/perf/resource_ota' into rft/ResourceUpdater 
# Conflicts:
#	src/MaaWpfGui/Models/ResourceUpdater.cs
#	src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
 2023-10-13 16:47:32 +08:00
uye
d8a4d9b762 ci: Update smoke-testing.yml -> .NET8 2023-10-13 16:25:06 +08:00
MistEO
709534a7f6 fix: 修复资源更新返回值 2023-10-13 16:13:22 +08:00
MistEO
bed32f6b51 feat: 用于快速适配新页面主题的小工具 (#6846) 2023-10-13 16:10:26 +08:00
MistEO
999061bbf1 feat: Only check version.json for Resource OTA 
close #6881
 2023-10-13 15:59:49 +08:00
MistEO
51e25eb78b fix: 修复WpfGui肉鸽 等待&停止 重复调用AsstStop的错误 (#6878) 2023-10-13 15:26:30 +08:00
MistEO
243e8cb708 feat: WpfGui 刷理智开始行动输出新增 每次开始行动时输出理智药和碎石次数（不记录临期药品使用次数） (#6857) 2023-10-13 15:26:18 +08:00
MistEO
f1720c99ec feat: 远程控制更多功能 (#6896) 2023-10-13 15:10:12 +08:00
Songyang.Huo
631957f522 Merge branch 'MaaAssistantArknights:dev' into dev 2023-10-13 08:11:53 +08:00
Songyang.Huo
ae974561de 提交新的改动 2023-10-13 08:11:16 +08:00
MistEO
c8510a9a07 chore: Auto Update Game Resources - 2023-10-12 2023-10-12 23:28:29 +00:00
David
abddc02fb2 tools: overseas duplicates + new themes 2023-10-12 19:58:19 +02:00
David
77bc815bcc fix: EN InfrastDormDoubleConfirmButton not recognized 
[no ci]
 2023-10-12 19:46:32 +02:00
zzyyyl
e4507d7d6f perf: 重写理智识别 (#6885) 2023-10-12 20:53:02 +08:00
zzyyyl
3e9713767d fix: 修复因 ocr_replace 与 m_eq_classes 冲突导致的 ocr 识别失效的问题 (#6867) 
fix #6629
 2023-10-12 19:59:44 +08:00
zzyyyl
cd7bf16f26 fix: 修复部分模板图片名错误的问题；删除多余模板图 2023-10-12 16:59:58 +08:00
zzyyyl
8e0ac02cb9 fix: 修复台服获取信用及购物出错的问题 
fix #6865
 2023-10-12 15:37:55 +08:00
zzyyyl
d52ade109e perf: 重写理智识别 2023-10-12 15:27:04 +08:00
zzyyyl
2e841c782e feat: 在 StringMisc 中增加 chars_to_number 2023-10-12 15:19:50 +08:00