fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,427 Commits 61 Branches 1,838 Tags
d64e829ac33dac64669c7c2a2500d13e872fa8b7
Commit Graph

190 Commits

Author SHA1 Message Date
MistEO
d64e829ac3 styles: format all cpp 2023-03-27 18:19:48 +08:00
shxyke
d730634081 refactor: 重构 Controller 架构 2023-03-24 01:30:22 +00:00
MistEO
a810841e49 fix: build error 2023-03-23 21:24:06 +08:00
MistEO
f9ea34d1ab fix: 关闭基建宿舍复查功能 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4035
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4053
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4011
 2023-03-23 21:16:36 +08:00
Hao Guan
ffdb9b1123 chore: 修复Clang/GCC编译警告 2023-03-20 20:42:21 +10:00
MistEO
b3306d2a4d chore: format and add filters 2023-03-11 19:19:08 +08:00
MistEO
e9f9f37a00 fix: 修复自动作战，部分地图中干员技能无法开启的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3931
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3551
 2023-03-11 13:59:05 +08:00
yuanyan3060
ae7875ba72 增加一个task，可以执行tasks.json内任意一个task (#3930) 2023-03-10 01:04:41 +08:00
yuanyan3060
03f65c154e 增加一个task，可以执行tasks.json内任意一个task 2023-03-10 00:45:07 +08:00
MistEO
16cf3e26db chore: 更新测试代码 2023-03-09 21:07:03 +08:00
MistEO
54732036d8 perf: 优化战斗中技能识别，改用深度学习模型 (#3918) 
* feat: 战斗中技能使用ort识别

* fix: 修正技能识别的错误

* feat: 当技能识别置信度过低时，保存debug图片

* fix: build error for onnx runtime

* fix: build error on linux

* perf: onnx path

* fix: build error

* fix: onnx build error
 2023-03-08 21:55:57 +08:00
dantmnf
447b9d86e7 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into arm64 2023-03-04 16:51:33 +08:00
Yifan Liu
c921534eb9 Merge branch 'dev' into feat/ocr_replace_all 2023-02-28 22:47:40 -06:00
Yifan Liu
2948936cb5 fix: fix build error 2023-02-28 12:25:15 -06:00
Yifan Liu
34742a9e3d fix: fix replace_full not acting correctly on chars_name 2023-02-28 12:05:44 -06:00
xjdx
1d065bb281 fix: #3816 2023-02-28 04:52:39 +00:00
MistEO
b1e65bac67 Merge pull request #3812 from MaaAssistantArknights/feat/rogue_recruit 
feat: 加速肉鸽招募时滑动
 2023-02-25 15:53:25 +08: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
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
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
xjdx
e769b27c98 fix: 修复"复核干员选择"的一些bug 2023-02-18 04:26:44 +08:00
Horror Proton
3f6a17d7ea fix: resolve rebase conflict, fix compile errors 2023-02-17 20:25:16 +08:00
dantmnf
7f8e84d3de chore: move controller to subdirectory 2023-02-17 19:40:15 +08:00
MistEO
12d51d48a9 fix: 为战斗干员头像识别，召唤物使用单独的阈值 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3735
 2023-02-17 17:37:10 +08:00
MistEO
bc7aafa548 fix: 修复自定义基建不使用无人机的问题 2023-02-16 12:37:15 +08:00
MistEO
d702bf848e fix: 修复自动换班排序错误导致的干员冲突问题 
fix #3721
 2023-02-16 00:59:34 +08:00
MistEO
927591e1d7 Merge branch 'dev' into xjdx 2023-02-15 21:42:55 +08:00
uye
ebf3bb6f34 Merge pull request #3684 from bigqiao/dev 
支持设置无限使用48小时内理智药
 2023-02-15 16:37:15 +08:00
LambdaLe
5b4a8a5484 feat: 生息演算 MAACore添加刷粗制赤金参数 
生息演算集成文档

修复mainModel变量名更改导致的编译错误
 2023-02-12 20:36:49 +08:00
LambdaLe
c6da3d9e14 refactor: 重构生息演算，增强拓展性 
生息演算 修复若干bug
 2023-02-12 20:20:57 +08:00
wangli
8793b2ffab 生息演算 添加黑市npc对话支持 2023-02-12 20:20:12 +08:00
bigqiao
47a1581c38 合并改动 2023-02-12 09:14:50 +08:00
bigqiao
b523830517 MaaCore支持使用48小时内理智药 2023-02-11 14:28:45 +08:00
MistEO
78e1a28edc Merge pull request #3652 from HerrCai0907/fix/Analyzer-set-roi-without-image 
fix: `Analyzer` should constructor with image and then set task info
 2023-02-11 04:55:24 +08:00
Congcong Cai
9d61061032 use Point instead PointRef 2023-02-11 04:33:55 +08:00
Congcong Cai
1b77da1906 fix: all_melee_retreat 在使用迭代器遍历的同时删除元素导致SEGV 2023-02-11 00:26:04 +08:00
Congcong Cai
3e7901a6dc fix: Analyzer should constructor with image and then set task info 2023-02-10 01:18:36 +08:00
MistEO
fce2ce8593 feat: 保全core上满了就不再上工具人了 2023-02-09 20:58:25 +08:00
MistEO
04f0846d4e Merge branch 'dev' into xjdx 2023-02-09 19:35:55 +08:00
xjdx
594ec82141 feat: 复核干员选择是否符合期望 2023-02-08 18:04:37 +08:00
Congcong Cai
3f58e1a5ba fix: check_and_use_skill logic bug 2023-02-08 08:05:27 +08:00
uye
cf01adf8bb Merge pull request #3587 from WLLEGit/ReclamationAlgorithm 
feat: 生息演算 添加回调Log
 2023-02-04 15:33:19 +08:00
wangli
2daa758545 fix: 生息演算 去除任务结算多余的延迟 2023-02-04 13:43:10 +08:00
wangli
bdcee1a9c1 feat: 生息演算 添加回调log 2023-02-04 13:27:07 +08:00
MistEO
d83a0bc967 Merge pull request #3568 from WLLEGit/ReclamationAlgorithm 
fix: 修复 生息演算 初始无干员卡住的问题，添加集成文档
 2023-02-03 23:35:12 +08:00
wangli
41e17cba26 fix: 生息演算 优化网络不佳时退出行动慢的问题 2023-02-03 15:55:25 +08:00