fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,453 Commits 62 Branches 1,839 Tags
69b93fbeee5d2acb2f2e2452584a0260d4e5890d
Commit Graph

9453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MistEO
709534a7f6 fix: 修复资源更新返回值 2023-10-13 16:13:22 +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
zzyyyl
9eda4d9e68 perf: 优化 OperBox 相关代码 2023-10-12 15:19:41 +08:00
uye
cc68694daf chore: 消除警告 2023-10-12 15:09:09 +08:00
uye
712539b041 fix: 修改错误的返回值 2023-10-12 15:05:05 +08:00
uye
8e16230944 rft: 重构 ResourceUpdater 2023-10-12 14:54:56 +08:00
zzyyyl
43c308350d style: format 2023-10-12 13:25:53 +08:00
uye
b05360b8c5 fix: zh-tw 变量名错误 (#6882) 
又锅了 QAQ
改了但没完全改
@ABA2396
 2023-10-12 11:34:47 +08:00
youqii
51da33ae29 fix: zh-tw 变量名错误 2023-10-12 11:08:40 +08:00
uye
66c482da90 chore: 修改 Stop 返回值，增加文档注释 2023-10-12 10:13:53 +08:00
uye
f18cbd6b39 style: 更正变量名 (#6880) 2023-10-12 09:45:00 +08:00
youqii
ccde2d0c7a style: 更正变量名 2023-10-12 09:25:48 +08:00
zzyyyl
8ce5529bee fix: 修复傀影肉鸽卡在战斗失败界面的问题 
这都快两年了，怎么 roi 还有问题的（是不是外服界面跟国服不太一样啊
link to ae94759d78

fix #6835
 2023-10-12 00:46:19 +08:00
zzyyyl
c64e161df3 fix: 修复肉鸽烧到水不停的问题 
link to 8c64dc58f2
fix #6876
alpha/v4.25.1-alpha.1.d012.gc64e161df 		2023-10-12 00:14:03 +08:00
zzyyyl
734cb199eb fix: Allow BattleQuickFormation to retry 3 times 
link to #6584
 2023-10-11 23:52:12 +08:00
zzyyyl
3674f0cf77 debug: save_img 默认使用缓存的图片 2023-10-11 23:21:56 +08:00
status102
2e71598bc8 fix: 修复肉鸽等待&停止重复调用AsstStop的错误 
fix #6870
 2023-10-11 21:08:57 +08:00
zzyyyl
a3f04669db debug: 增加一些非法情况的截图 alpha/v4.25.1-alpha.1.d009.ga3f04669d 2023-10-11 19:02:57 +08:00
zzyyyl
b1ee495101 fix: 修复因 ocr_replace 与 m_eq_classes 冲突导致的 ocr 识别失效的问题 2023-10-11 18:10:41 +08:00
uye
504475cd85 feat: 点击版本号后复制到剪贴板 
fix #6659
 2023-10-11 17:28:18 +08:00
uye
fa5930a443 fix: 定时执行强制启动无法切换基建计划 
fix #6757
 2023-10-11 16:28:11 +08:00
uye
c011dbe075 feat: 自动战斗地图链接指向PRTS.Map对应的地图 
close #6227
 2023-10-11 11:09:12 +08:00
status102
447942811c fix: qodana 2023-10-11 07:53:11 +08:00
David
cfa9975baa fix: changed EN OCR formation parameter 
[skip ci]
 2023-10-10 22:28:24 +02:00
status102
b6f11efda7 feat: 刷理智开始行动输出新增 每次开始行动时输出理智药和碎石次数（不记录临期药品使用次数） 2023-10-10 23:45:30 +08:00
zzyyyl
15536b40ec perf: 优化 AllTasksCompleted 相关 WPF 代码 (#6845) 2023-10-10 18:46:36 +08:00
MistEO
860b9788a5 feat: 适配"迷城"界面主题 (#6847) 2023-10-10 18:18:51 +08:00
SherkeyXD
b61fd65ba5 feat: 适配"迷城"界面主题 2023-10-10 17:18:59 +08:00
zzyyyl
4d200bdcc9 perf: 优化 AllTasksCompleted 相关 WPF 代码 2023-10-10 16:37:20 +08:00
MistEO
13464db189 Release v4.25.0 (#6840) v4.25.0 2023-10-10 15:13:09 +08:00
MistEO
e5c8787535 docs: Update CHANGELOG.md 2023-10-10 13:18:17 +08:00
github-actions[bot]
a8cf0e617d docs: Auto Update Changelogs of v4.25.0 (#6841) 
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-10-10 13:16:15 +08:00
MistEO
44d0800fbf docs: 优化文档视觉效果，防止出现横向显示不全的情况 (#6839) 2023-10-10 13:09:34 +08:00
SherkeyXD
6edf93324c docs: 优化文档视觉效果，防止出现横向显示不全的情况 2023-10-10 13:06:09 +08:00
Horror Proton
bc2bf38118 perf: update action on recruit confirm failure 2023-10-10 11:32:05 +08:00