fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,395 Commits 61 Branches 1,839 Tags
1abd99fe3cb2f84cd5f1fa9eefef0f7310c2b17f
Commit Graph

8395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wallsman
1abd99fe3c Update operators.md 
fix
 2023-08-18 13:26:59 +09:00
Wallsman
21797c494b Update operators.md 2023-08-18 13:22:07 +09:00
uye
12ee590bd5 style: 格式化 RunningState，添加注释 2023-08-18 10:45:41 +08:00
uye
185f29293b style: 格式化代码 2023-08-18 10:10:50 +08:00
uye
bc32eb6a98 fix: 定时执行逻辑错误 
fix #5971
alpha/v4.22.0-beta.1.d099.gbc32eb6a9 		2023-08-18 09:40:29 +08:00
David
de55d911e1 fix: add ocr replace for YostarJP (#5977) 
OCR 识别错误导致进不了商店
alpha/v4.22.0-beta.1.d098.gde55d911e 		2023-08-17 19:26:39 +02:00
David
a1639bde8f 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
67dc46444d fix: increased ROI in fight task 
fix #5745
 2023-08-17 18:45:38 +02:00
Jie Lu
19067f21a9 fix: add ocr replace for YostarJP 2023-08-17 23:52:18 +09:00
David
7689895468 fix: changed award ROI and template EN 2023-08-17 15:18:46 +02:00
David
c4a1fda99c refactory: typo 2023-08-17 14:17:03 +02:00
cenfusheng
8e5aa434f6 fix: 修复关卡“干酪封锁”与装置““甜蜜狂搅””的识别 (#5975) 2023-08-17 16:12:19 +08:00
cenfusheng
87f1700104 fix: 修复关卡“干酪封锁”与装置““甜蜜狂搅””的识别 2023-08-17 16:11:51 +08:00
David
d4776da391 perf: optimized ROI for EPISODE navigation 2023-08-16 18:40:04 +02:00
David
1ca477b8e3 chore: PRTS3 and LevelOFDifficulty i18n EN 2023-08-16 17:41:58 +02:00
David
a729d0d35d tools: global content update 2023-08-16 17:04:44 +02:00
David
830ccf28e7 chore: ormatting + output log cleanup / clearup 2023-08-16 09:55:18 +02:00
MistEO
681704032b 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
a9a631fd8f chore: Auto Update Game Resources - 2023-08-15 alpha/v4.22.0-beta.1.d084.ga9a631fd8 2023-08-15 18:07:55 +00:00
David
bc6d689339 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-08-15 19:57:07 +02:00
David
d7c17fa693 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
4e3f48c4a1 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
471ee56187 chore: localization update 2023-08-16 01:05:30 +09:00
Loong
bea8b11c6b fix: link in mac-runtime release 2023-08-15 17:59:37 +08:00
Lancarus
6932303311 fix:肉鸽在招募逻辑内可以将同一干员纳入多个群组,修复由于拆分文件造成的bug (#5946) 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-08-15 17:44:11 +08:00
Yumi0606
fd9a269dba fix: 新版萨米肉鸽商店文件&水月肉鸽商店文件提交 (#5936) 
录入商品效果信息，增加所有商品，小调了商品优先级

---------

Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-08-15 17:43:27 +08:00
MistEO
f241b30f30 chore: Auto Update Game Resources - 2023-08-15 alpha/v4.22.0-beta.1.d077.gf241b30f3 2023-08-15 09:06:20 +00:00
MistEO
1ab27717ae feat: merge and re-structure stage.json (#5944) 
fix #5881
 2023-08-14 18:20:41 +08:00
MistEO
8ff71bfac7 feat: add config CompatPOSIXShell (#5945) 
在POSIX shell标准中，双引号内的`$`内的内容将被提前展开，这将导致`CloseDown`任务失效。大多数*nix
shell的实现都遵守这一标准，所以这里添加了一个配置`CompatPOSIXShell`，将`Stop`字段相应的双引号换成单引号，以防止CloseDown在使用符合上述标准shell的系统上失效。

另见： #5920，因为那个PR已经合并了，所以我新提了一个PR。
 2023-08-14 15:56:38 +08:00
MistEO
aff90a749a feat: merge and re-structure stage.json 
fix #5881
 2023-08-14 15:21:00 +08:00
Long Wang
054f5a6ee5 feat: add config CompatPOSIXShell 2023-08-14 15:18:11 +08:00
uye
8079ca2bf6 fix: 错误的类型转换 
fix #5940
alpha/v4.22.0-beta.1.d072.g8079ca2bf 		2023-08-13 22:44:42 +08:00
Clock
13822618b4 fix: make the option to not recruit selectable in SSS for YoStarKR 2023-08-13 23:25:03 +09:00
uye
fcc8f84290 fix: 修复模拟器关闭逻辑错误，增加模拟器退出错误日志 2023-08-13 22:13:07 +08:00
Clock
b832d3f1a7 feat: SSS copilot support for YostarKR 2023-08-13 22:34:46 +09:00
David
2882878392 fix: Infrast Task stuck Max Trust notification EN 2023-08-13 13:25:00 +02:00
uye
72bc76aa24 chore: 调整肉鸽商品识别roi范围 2023-08-13 19:11:47 +08:00
David
7a9ec26241 fix: #5931 2023-08-13 11:18:39 +02:00
MistEO
0fc5374c3d chore: Auto Update Game Resources - 2023-08-13 alpha/v4.22.0-beta.1.d065.g0fc5374c3 2023-08-13 08:07:35 +00:00
MistEO
4586e536c3 Revert "添加繁中服对于鸿雪的OCR等价规则 #5931" (#5935) 2023-08-13 15:57:35 +08:00
MistEO
0b6a07bdfa fix: CloseDown not works on macOS (#5920) 2023-08-13 15:54:15 +08:00
uye
9032220b10 fix: 关闭模拟器时索引超出了数组界限 
fix #5930
 2023-08-13 15:50:14 +08:00
David
404ac43cc5 fix: 添加繁中服对于鸿雪的OCR等价规则 #5931 #5933 2023-08-13 09:50:04 +02:00
MistEO
3e1a7a17a5 Revert "添加繁中服对于鸿雪的OCR等价规则 #5931" 2023-08-13 15:41:19 +08:00
uye
c75de28019 fix: 肉鸽打折商品识别错误 
fix #5919
 2023-08-13 15:29:32 +08:00
David
8cc9bc6ab9 添加繁中服对于鸿雪的OCR等价规则 #5931 (#5933) 2023-08-13 08:52:44 +02:00
David
1ac79248df Revert "Useless png in roguelike JP" 
This reverts commit 8b08e10aa3.

My bad, I've removed the wrong image.
 2023-08-13 08:45:20 +02:00
Roland125
4336c1b789 添加繁中服对于鸿雪的OCR等价规则 #5931 2023-08-13 13:30:48 +08:00
David
37e26c6ea3 Removed useless .png from JP I.S. 2023-08-13 00:09:06 +02:00
David
8b08e10aa3 Useless png in roguelike JP 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/4921#issuecomment-1562944784
 2023-08-13 00:00:16 +02:00