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
6,157 Commits 60 Branches 1,840 Tags
0850043642d2f2af9cbd17fac60c11ddc748e771
Commit Graph

3259 Commits

Author SHA1 Message Date
Yifan Liu
0850043642 feat: JP Rogue friend support update (template & code) and various ignorelist update 2023-03-01 21:50:52 -06:00
uye
359a03e408 chore: 删除多余操作 2023-03-01 14:55:09 +08:00
uye
4e0a0ebd0c fix: 修复Application.Current.Shutdown方法关闭时不保存窗口位置 2023-03-01 14:49:27 +08:00
uye
f85a09175e fix: 修复重启不保存窗口位置 
~糊屎~
 2023-03-01 14:38:30 +08:00
uye
b39600bc06 fix: 修复窗口最小化时不能通过托盘修改语言的问题 2023-03-01 14:38:30 +08:00
Yifan Liu
4b5dc1aa95 Merge branch 'dev' into feat/ocr_replace_all 2023-02-28 22:47:40 -06:00
MistEO
bed6b5d56a Merge pull request #3844 from fearlessxjdx/dev 
fix: #3816
 2023-03-01 10:31:58 +08:00
Yifan Liu
cfa5f65509 fix: fix build error 2023-02-28 12:25:15 -06:00
Yifan Liu
11d1060cad fix: fix replace_full not acting correctly on chars_name 2023-02-28 12:05:44 -06:00
uye
cb47a1bf31 chore: 修改资源文件中换行的写法 2023-02-28 21:35:24 +08:00
xjdx
f400656af7 fix: #3816 2023-02-28 04:52:39 +00:00
Yifan Liu
ca306666ae fix: ocr equivalence class will not replace dst string 2023-02-26 21:57:53 -06:00
MistEO
7825c468de chore: 更新抄作业界面小提示 2023-02-26 19:45:35 +08:00
Yifan Liu
28bb886766 Merge branch 'dev' into feat/ocr_replace_all 2023-02-25 21:46:54 -06:00
uye
068ef06d5d Merge pull request #3820 from MaaAssistantArknights/feat/i18n 
feat: localization of VersionUpdateView
 2023-02-25 23:03:59 +08:00
uye
5f678d8e95 docs: 更新常见问题链接 2023-02-25 18:20:31 +08:00
MistEO
f4118a62b6 Merge pull request #3812 from MaaAssistantArknights/feat/rogue_recruit 
feat: 加速肉鸽招募时滑动
 2023-02-25 15:53:25 +08:00
MistEO
a2e673fdff Merge pull request #3795 from MaaAssistantArknights/feat/ocr_eq_class 
feat: OCR字符等价类支持
 2023-02-25 15:53:07 +08:00
MistEO
78fbe3aab0 Update src/MaaCore/Vision/OcrImageAnalyzer.cpp 2023-02-25 15:52:59 +08:00
MistEO
d9dee76080 Update src/MaaCore/Vision/OcrImageAnalyzer.cpp 2023-02-25 15:52:19 +08:00
Yifan Liu
88fad38460 feat: localization of VersionUpdateView 2023-02-25 01:50:30 -06:00
uye
b8b679b423 Merge pull request #3817 from MaaAssistantArknights/killEmulator 
chore: 优化退出模拟器操作，添加超时时间
 2023-02-25 14:14:35 +08:00
Yifan Liu
9f3c611e4a refactor: directly call get_instance instead of using static OcrData 2023-02-24 16:33:37 -06:00
Yifan Liu
c11f78bf81 feat: change replace_full so it's set in tasks 
previously in set_replace
 2023-02-24 15:34:59 -06:00
Yifan Liu
e6fb13a8bb feat: add task replace_full 2023-02-24 15:34:38 -06:00
zzyyyl
0f52f73a11 Merge pull request #3773 from MaaAssistantArknights/clickcorner 
fix: 修复一些关卡结算界面的问题

fix #3758
fix #3803
 2023-02-24 20:21:47 +08:00
zzyyyl
5340114a73 style: 换个好函数名；代码格式化 2023-02-24 20:13:33 +08:00
uye
85cf9d052f chore: 优化退出模拟器操作，添加超时时间 2023-02-24 20:04:45 +08:00
zzyyyl
ee4740e6ed fix: 对使用 adb 的情况特殊处理 2023-02-24 08:33:55 +08:00
zzyyyl
3b2abc65b6 fix: 修复一些小问题 2023-02-23 23:04:58 +08:00
zzyyyl
8576b524a3 feat: 加速肉鸽招募时滑动 2023-02-23 22:42:23 +08:00
zzyyyl
04d9699fb4 fix: 修复一些修改任务名引起的问题 2023-02-23 19:10:00 +08:00
uye
9ed6b35c6d fix: 韩服资源文件typo 2023-02-23 17:09:14 +08:00
uye
86d2a91d48 fix: 日服语言资源错误/Japanese client language file error 2023-02-23 17:04:48 +08:00
uye
4012725c72 refactor: 优化代码 2023-02-23 17:04:48 +08:00
MistEO
51b74b4db1 Merge pull request #3799 from WLLEGit/dev 
feat: Python添加Hyperv蓝叠的端口获取与模拟器启动函数
 2023-02-23 11:24:43 +08:00
zzyyyl
3f0636ac61 style: format 
请各位开发者统一代码风格！
```
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\MaaCore
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\resource
```
参考 https://maa.plus/docs/2.2-%E5%BC%80%E5%8F%91%E7%9B%B8%E5%85%B3.html#%E5%9C%A8-visual-studio-%E4%B8%AD%E5%90%AF%E7%94%A8-clang-format
 2023-02-23 10:00:51 +08:00
MistEO
ebc4117d22 Merge pull request #3800 from MaaAssistantArknights/feat/updateStage 
feat: 添加4点检查web是否更新关卡
 2023-02-23 00:41:41 +08:00
MistEO
31facbf47f Merge pull request #3762 from horror-proton/perf/tile_pack_parse 
perf: read tile data concurrently
 2023-02-23 00:39:49 +08:00
uye
a0c5a5e06d feat: 添加4点检查web是否更新关卡 2023-02-22 23:01:14 +08:00
LambdaLe
93c62df489 feat: Python添加Hyperv蓝叠的端口获取与模拟器启动函数 2023-02-22 20:45:40 +08:00
Horror Proton
19a3b57623 perf: read tile data concurrently 2023-02-22 10:54:04 +00:00
Yifan Liu
0ce25cac57 feat: OCR equivalence class 2023-02-22 00:48:11 -06:00
Horror Proton
c06edb25de feat: 实验性增加 OCR 字符等价类支持 2023-02-22 00:04:49 -06:00
zzyyyl
9cb07172b9 feat: 增加一些空白符 2023-02-22 13:10:18 +08:00
zzyyyl
cdd32b4dee feat: 对 # 运算的逻辑稍作调整 
允许 A#(next+sub), 表示 (A#next + A#sub)
 2023-02-22 12:01:14 +08:00
zzyyyl
472a8b2b5f feat: 对 @ 运算的逻辑稍作调整 
调整前: (...)@#none=#none, #none@(...)=#none
调整后: (...)@#none=(...), #none@(...)=(...)
 2023-02-22 11:57:04 +08:00
zzyyyl
e6dbaa955c perf: 结构优化 2023-02-22 11:01:53 +08:00
zzyyyl
2478aef083 feat: 增加一个虚任务 #none 
例：
```
"A": { "next": [ "#none+B" ] }
```
这个任务在增加前缀（如 `"D@A"`）时 next 不变。
 2023-02-22 11:01:53 +08:00
zzyyyl
d681bafeee feat: 简易的任务表达式运算 2023-02-22 11:01:53 +08:00