fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,069 Commits 61 Branches 1,840 Tags
241894ebaafaa6b3e8995913ec7ae2c699e92f21
Commit Graph

3238 Commits

Author SHA1 Message Date
MistEO
b1e65bac67 Merge pull request #3812 from MaaAssistantArknights/feat/rogue_recruit 
feat: 加速肉鸽招募时滑动
 2023-02-25 15:53:25 +08:00
MistEO
a63f3e891d Merge pull request #3795 from MaaAssistantArknights/feat/ocr_eq_class 
feat: OCR字符等价类支持
 2023-02-25 15:53:07 +08:00
MistEO
e1d3881c2a Update src/MaaCore/Vision/OcrImageAnalyzer.cpp 2023-02-25 15:52:59 +08:00
MistEO
c7ff711d2b Update src/MaaCore/Vision/OcrImageAnalyzer.cpp 2023-02-25 15:52:19 +08:00
uye
78be146f72 Merge pull request #3817 from MaaAssistantArknights/killEmulator 
chore: 优化退出模拟器操作，添加超时时间
 2023-02-25 14:14:35 +08:00
Yifan Liu
fbff53d219 refactor: directly call get_instance instead of using static OcrData 2023-02-24 16:33:37 -06:00
zzyyyl
546ce041f7 Merge pull request #3773 from MaaAssistantArknights/clickcorner 
fix: 修复一些关卡结算界面的问题

fix #3758
fix #3803
 2023-02-24 20:21:47 +08:00
zzyyyl
5b5a64043b style: 换个好函数名；代码格式化 2023-02-24 20:13:33 +08:00
uye
303b1cc75f chore: 优化退出模拟器操作，添加超时时间 2023-02-24 20:04:45 +08:00
zzyyyl
a7dbb8a323 fix: 对使用 adb 的情况特殊处理 2023-02-24 08:33:55 +08:00
zzyyyl
3e585d1563 fix: 修复一些小问题 2023-02-23 23:04:58 +08:00
zzyyyl
0e0b6847df feat: 加速肉鸽招募时滑动 2023-02-23 22:42:23 +08:00
zzyyyl
c60028d84d fix: 修复一些修改任务名引起的问题 2023-02-23 19:10:00 +08:00
uye
ecb9820bf5 fix: 韩服资源文件typo 2023-02-23 17:09:14 +08:00
uye
db93609961 fix: 日服语言资源错误/Japanese client language file error 2023-02-23 17:04:48 +08:00
uye
6896a03c0d refactor: 优化代码 2023-02-23 17:04:48 +08:00
MistEO
84faa6fa21 Merge pull request #3799 from WLLEGit/dev 
feat: Python添加Hyperv蓝叠的端口获取与模拟器启动函数
 2023-02-23 11:24:43 +08:00
zzyyyl
4d61950d7e 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
a1234136b1 Merge pull request #3800 from MaaAssistantArknights/feat/updateStage 
feat: 添加4点检查web是否更新关卡
 2023-02-23 00:41:41 +08:00
MistEO
7f14ca02c0 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
b8dc684f28 feat: 添加4点检查web是否更新关卡 2023-02-22 23:01:14 +08:00
LambdaLe
b73fc2c159 feat: Python添加Hyperv蓝叠的端口获取与模拟器启动函数 2023-02-22 20:45:40 +08:00
Horror Proton
06d04f57f1 perf: read tile data concurrently 2023-02-22 10:54:04 +00:00
Yifan Liu
b71edb9477 feat: OCR equivalence class 2023-02-22 00:48:11 -06:00
Horror Proton
094f40d9b8 feat: 实验性增加 OCR 字符等价类支持 2023-02-22 00:04:49 -06:00
zzyyyl
44053ee182 feat: 增加一些空白符 2023-02-22 13:10:18 +08:00
zzyyyl
3101bc39ad feat: 对 # 运算的逻辑稍作调整 
允许 A#(next+sub), 表示 (A#next + A#sub)
 2023-02-22 12:01:14 +08:00
zzyyyl
6f9a0ec5a4 feat: 对 @ 运算的逻辑稍作调整 
调整前: (...)@#none=#none, #none@(...)=#none
调整后: (...)@#none=(...), #none@(...)=(...)
 2023-02-22 11:57:04 +08:00
zzyyyl
700f77212c perf: 结构优化 2023-02-22 11:01:53 +08:00
zzyyyl
5c3efb719e feat: 增加一个虚任务 #none 
例：
```
"A": { "next": [ "#none+B" ] }
```
这个任务在增加前缀（如 `"D@A"`）时 next 不变。
 2023-02-22 11:01:53 +08:00
zzyyyl
fd36da1611 feat: 简易的任务表达式运算 2023-02-22 11:01:53 +08:00
uye
71d5b9b3fa feat: 支持吾导先路活动导航 2023-02-21 17:03:31 +08:00
Wallsman
7ee96cfc6e Merge pull request #3774 from wallsman/dev 
doc : Config JP text translate
 2023-02-21 04:28:35 +09:00
uye
65201b6625 fix: 修复获取指定语言文字时不支持转义的问题 2023-02-20 18:15:49 +08:00
Wallsman
caad190900 Update ja-jp.xaml 
miss fix.
 2023-02-20 06:07:58 +09:00
Wallsman
21631e180e Update ja-jp.xaml 
Typo Miss
 2023-02-20 02:56:42 +09:00
uye
3009f2b127 Merge pull request #3760 from MaaAssistantArknights/feat/realtime_binding_combat_parameters 
feat: 实时更新战斗设置
 2023-02-20 00:37:57 +08:00
uye
135cb7221f chore: 不在判断剩余理智是否开放 
否则在不开放的时候显示可能为当前/上次，而第二天变成了之前的关卡，可能会带来一些问题
 2023-02-20 00:36:04 +08:00
Wallsman
919d8e93e5 Update ja-jp.xaml 2023-02-19 23:54:38 +09:00
Wallsman
163c78abd3 doc : Config JP text translate 
いくらか抜けていた部分や翻訳抜けを修正。
Some omissions and missing translations were corrected.
 2023-02-19 23:49:11 +09:00
Hao Guan
d6f5792220 fix: Mac GUI 修复编队错误 2023-02-19 12:51:20 +10:00
uye
9a980200a8 fix: 修复部分情况下隐藏到托盘功能不生效的问题 2023-02-18 20:18:03 +08:00
uye
90347ebb3f chore: 通过TryParse判断数量而不是字符串 2023-02-18 17:22:28 +08:00
uye
7d4cf37d21 fix: 修复关卡选择输入空字符串变为0的问题 2023-02-18 17:05:04 +08:00
uye
964c155cce feat: 实时绑定战斗设置 2023-02-18 16:42:26 +08:00
xjdx
e769b27c98 fix: 修复"复核干员选择"的一些bug 2023-02-18 04:26:44 +08:00
uye
9cad7890cf chore: 添加剩余理智的悬浮提示 
fix #3376
 2023-02-17 18:47:03 +08:00
MistEO
b0fd12903c fix: 调整一下日志等级 2023-02-17 17:37:20 +08:00
MistEO
12d51d48a9 fix: 为战斗干员头像识别，召唤物使用单独的阈值 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3735
 2023-02-17 17:37:10 +08:00
uye
c9182e2379 Merge pull request #3743 from sakuraxp/dev 
chore: 修改信用商店购物黑名单
 2023-02-17 16:49:13 +08:00