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
8,356 Commits 61 Branches 1,840 Tags
e71924317fdaa2f46600cd985bca89f459dfca15
Commit Graph

8356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David
e71924317f fix: Mizuki IS DropBox recog. and Shopping regex 2023-08-19 10:55:24 +02:00
uye
ec5241ddb6 feat: 添加刷理智任务报错提示 2023-08-19 16:33:33 +08:00
uye
af5ec664ab feat: 肉鸽开局干员支持点选 is_start 中的干员 2023-08-19 15:24:32 +08:00
Lancarus
e2fd92394d 优化了萨米肉鸽第三层的部分关卡打法,更新了肉鸽文档 (#5986) 2023-08-19 13:33:21 +08:00
Lancarus
c00c29f025 Update 3.5-肉鸽辅助协议.md 2023-08-19 12:07:05 +08:00
Lancarus
f11f8c1c9a Update 3.5-肉鸽辅助协议.md 2023-08-19 11:57:10 +08:00
Lancarus
28e089d51f feat:优化第三层作战逻辑 2023-08-19 03:41:19 +08:00
Lancarus
b45139735f feat:优化第三层作战逻辑 2023-08-19 03:33:23 +08:00
David
c34a580b98 fix: SL event navigation 
fix: #5982
 2023-08-18 18:16:39 +02:00
Lancarus
7307e50f33 feat:优化萨米肉鸽招募逻辑，优化前两层作战逻辑 (#5966) 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-08-18 22:12:10 +08:00
Lancarus
bab54b3f01 Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-18 22:05:41 +08:00
Lancarus
67ef7943dd 更新第二层 2023-08-18 22:05:29 +08:00
uye
32f1a88d73 refactor: 重构 VersionUpdateViewModel.cs (#5981) 2023-08-18 21:02:57 +08:00
Lancarus
7a534c9127 删掉多余文件 2023-08-18 20:49:18 +08:00
Lancarus
b1d85d6305 Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-18 20:46:26 +08:00
Lancarus
3d03f10edf 优化萨米肉鸽部分关卡作战逻辑 2023-08-18 20:46:16 +08:00
uye
b8487e4a42 feat: 增加关卡数据获取成功提示 2023-08-18 18:43:29 +08:00
Clock
7aa94c1b37 chore: Update operators.md 2023-08-18 19:35:47 +09:00
Wallsman
65a0360fe7 Update operators.md 
fix
 2023-08-18 13:26:59 +09:00
Wallsman
5c86517bfd Update operators.md 2023-08-18 13:22:07 +09:00
uye
683afbbce4 chore: Put local function 'CheckUpdateInner' after 'return' 2023-08-18 11:22:49 +08:00
uye
8c8e88e9f6 style: Property 'OsArchitecture' can be made private && Put local function 'CheckUpdateInner' after 'return' 2023-08-18 11:04:11 +08:00
uye
60d5a5a96b fix: 文件带相对路径时的转移问题 2023-08-18 10:59:35 +08:00
uye
076d6e7c79 refactor: 重构 VersionUpdateViewModel.cs 2023-08-18 10:48:48 +08:00
uye
0e529ac88b style: 格式化 RunningState，添加注释 2023-08-18 10:45:41 +08:00
uye
a911eec7f1 style: 格式化代码 2023-08-18 10:10:50 +08:00
uye
09c2a1bdf8 fix: 定时执行逻辑错误 
fix #5971
 2023-08-18 09:40:29 +08:00
David
4b7b2e1db2 fix: add ocr replace for YostarJP (#5977) 
OCR 识别错误导致进不了商店
 2023-08-17 19:26:39 +02:00
David
b3d8f58cb9 fix: "Gummy" with skin undetected with new ROI 
asst::WordOcr [{ Gummy OCUCK: [ 0, 0, 293, 35 ], score: 0.631317 }] 
asst::WordOcr [{ Gumm: [ 6, 2, 62, 28 ], score: 0.995575 }] by OCR 
name is empty
 2023-08-17 19:25:22 +02:00
David
5bd6e2e2ea fix: increased ROI in fight task 
fix #5745
 2023-08-17 18:45:38 +02:00
Jie Lu
5075fbfb67 fix: add ocr replace for YostarJP 2023-08-17 23:52:18 +09:00
David
1cd79a0adc fix: changed award ROI and template EN 2023-08-17 15:18:46 +02:00
David
311548f362 refactory: typo 2023-08-17 14:17:03 +02:00
cenfusheng
a62acb2caa fix: 修复关卡“干酪封锁”与装置““甜蜜狂搅””的识别 (#5975) 2023-08-17 16:12:19 +08:00
cenfusheng
b7fe5f202c fix: 修复关卡“干酪封锁”与装置““甜蜜狂搅””的识别 2023-08-17 16:11:51 +08:00
Lancarus
1686f0e36b Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-17 04:09:23 +08:00
Lancarus
e9d77f1013 Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-17 04:08:16 +08:00
Lancarus
7dad9da114 优化招募逻辑 2023-08-17 04:08:02 +08:00
Lancarus
cd0eead4b8 Merge branch 'dev' of https://github.com/Lancarus/MaaAssistantArknights into dev 2023-08-17 03:48:58 +08:00
Lancarus
b4cc09d75a 优化萨米肉鸽逻辑 2023-08-17 03:48:41 +08:00
David
38d65c76f0 perf: optimized ROI for EPISODE navigation 2023-08-16 18:40:04 +02:00
David
c0b3012d60 chore: PRTS3 and LevelOFDifficulty i18n EN 2023-08-16 17:41:58 +02:00
David
24cb6f7494 tools: global content update 2023-08-16 17:04:44 +02:00
David
5207430fa3 chore: ormatting + output log cleanup / clearup 2023-08-16 09:55:18 +02:00
MistEO
1a76808b16 fix: link in mac-runtime release (#5954) 
在macOS上`ln`产生的符号链接会直接沿用输入的路径，而不会进行变换，因此在现在的情况下产生的符号链接是这样的：
```
libonnxruntime.1.14.1.dylib
libMaaDerpLearning.dylib
libMaaCore.dylib
libopencv_world4.407.dylib
libonnxruntime.dylib@ -> macos-runtime-temp/libonnxruntime.1.14.1.dylib
libopencv_world4.dylib@ -> macos-runtime-temp/libopencv_world4.407.dylib
```
为了生成正确的符号符号链接，我们需要输入的是目标相对链接文件的路径，由于目标和符号链接位于同一文件夹，所以应该是目标的文件名：
```bash
bash-3.2$ libonnxruntime_file=$(basename macos-runtime-temp/libonnxruntime*.dylib)
bash-3.2$ ln -vs $libonnxruntime_file macos-runtime-temp/libonnxruntime.dylib
macos-runtime-temp/libonnxruntime.dylib -> libonnxruntime.1.14.1.dylib
bash-3.2$ libopencv_world_file=$(basename macos-runtime-temp/libopencv_world*.dylib)
bash-3.2$ ln -vs $libopencv_world_file macos-runtime-temp/libopencv_world4.dylib
macos-runtime-temp/libopencv_world4.dylib -> libopencv_world4.407.dylib
```
这样才可以产生正常的符号链接：
```
libMaaCore.dylib
libMaaDerpLearning.dylib
libonnxruntime.1.14.1.dylib
libonnxruntime.dylib -> libonnxruntime.1.14.1.dylib
libopencv_world4.407.dylib
libopencv_world4.dylib -> libopencv_world4.407.dylib
```
 2023-08-16 11:02:19 +08:00
MistEO
70ec77fe38 chore: Auto Update Game Resources - 2023-08-15 2023-08-15 18:07:55 +00:00
David
ab5bbbdf09 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-08-15 19:57:07 +02:00
David
e5dc2011c5 Feat: Auto Update now orders Global tasks.json like Official 
Tasks_Sorter.py now orders the Global servers tasks with the same order of the official server

For EN: removed Award task + I.S. trader shopping regex
For KR: removed deprecated I.S. tasks

Co-authored-by: 178619 <snoo91919@gmail.com>
 2023-08-15 19:53:44 +02:00
David
2272b6821c Feat: Auto Update now orders Global tasks.json like Official 
Tasks_Sorter.py now orders the Global servers tasks with the same order of the official server

For EN: removed Award task + I.S. trader shopping regex
For KR: removed deprecated I.S. tasks


Co-authored-by: 178619 snoo91919@gmail.com
 2023-08-15 19:50:41 +02:00
Clock
aeebb7cb24 chore: localization update 2023-08-16 01:05:30 +09:00