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
8,168 Commits 60 Branches 1,840 Tags
0b1bb2f6c7a7605416013d544d50ab4591340ccd
Commit Graph

133 Commits

Author SHA1 Message Date
uye
0b1bb2f6c7 feat: 主目录存在 DEBUG.txt 时每次开始任务都重新解析tasks.json 2023-07-31 11:32:30 +08:00
DavidWang19
2b4e100f1d feat: 适配萨米肉鸽 2023-07-14 09:29:17 +01:00
BladeHiker
dab8b61506 fix: 去掉异步执行，添加可配置项 2023-07-07 22:31:17 +08:00
MistEO
0453f31709 fix: 将 OCR replace 改为有序 2023-06-29 10:11:26 +08:00
Horror Proton
ee8204c51a fix: workaround for destruction order issue 
which creates empty files with random name on Linux

fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/5255
 2023-06-26 23:49:32 +08:00
MistEO
2d668b8066 fix: 修复切换日服后再切回后OCR配置不清空的问题 
fix #4955
 2023-05-28 15:44:22 +08:00
MistEO
91fc2297ae feat: update meojson to v3.0.0-beta.1 (#4789) 
https://github.com/MistEO/meojson/releases/tag/v3.0.0-beta.1
 2023-05-24 15:58:29 +08:00
MistEO
744d082db8 chore: 添加一些adbSwipeXDistanceMultiplier的注释 2023-05-21 09:48:18 +08:00
MistEO
3fa6fd6340 fix: 全局减小adb滑动距离 
糊屎！
 2023-05-21 01:19:15 +08:00
MistEO
cecea231d7 feat: 提前为更新json库做好准备（） 2023-05-17 00:46:44 +08:00
MistEO
cedc07962f fix: 为Resource loader 添加重入锁 2023-05-16 00:54:35 +08:00
Shawn Sun
cdc6c080b7 fix(avatarcachemanager): avatar saved at wrong path in set_avatar() 
m_save_path is empty & ::load() never called when cache folder does not exist.
 2023-05-11 03:05:59 +08:00
MistEO
3e4c15f1ff fix: 修复单例错误引发的资源加载错误 2023-05-02 16:55:30 +08:00
MistEO
3d7172a3d2 perf: 修改异步加载资源的方式 2023-05-02 15:16:07 +08:00
MistEO
8bd75c87a0 fix: build error 2023-05-02 14:33:06 +08:00
MistEO
78069c3f82 chore: ResourceLoader 添加一些日志 2023-05-02 14:22:49 +08:00
MistEO
059cf8dbf6 fix: 修复中文目录的crash问题 
fix #4585
fix #4574
 2023-05-02 00:17:55 +08:00
MistEO
d594c5a590 fix: build error 2023-04-29 02:06:56 +08:00
MistEO
e045d990e9 fix: 修复资源加载失败 2023-04-29 02:01:48 +08:00
MistEO
e2554f3bcf fix: 修复资源读取错误，改一点日志 2023-04-29 01:19:33 +08:00
MistEO
2b4c23e994 fix: build error 2023-04-29 00:27:55 +08:00
MistEO
2f5cbe0a78 perf: debug模式下检查所有资源加载返回值 2023-04-29 00:25:21 +08:00
MistEO
3f8daec8c1 perf: 更快的加载！ 2023-04-29 00:13:40 +08:00
MistEO
83b0254641 perf: 优化干员头像加载 2023-04-28 23:02:02 +08:00
MistEO
3b299caf8c perf: 更多的惰性加载！ 2023-04-28 18:45:22 +08:00
MistEO
cc58d3f80d perf: 优化惰性加载逻辑 2023-04-28 17:20:05 +08:00
MistEO
f7b2588bcf chore: 改一些日志 2023-04-28 15:14:34 +08:00
MistEO
0f46eb0af0 feat: OCR 惰性加载 2023-04-28 00:41:32 +08:00
MistEO
c2e327275d refactor: Vision 超级大重构 Phase 1 2023-04-27 22:42:56 +08:00
MistEO
8006c75428 feat: 支持识别并选择临时招募干员 (#4433) 
1. 新增特性：支持在肉鸽招募时优先选择临时招募干员；
2. 调整了部分干员的招募优先级，增加了更多可选干员；
3. 优先了新关卡的部署逻辑。
 2023-04-22 19:16:36 +08:00
DuKong
6dfdca05c1 feat: 支持识别并选择临时招募干员 2023-04-22 17:25:02 +08:00
DuKong
fe49fb6c51 feat: 支持识别并选择临时招募干员 2023-04-22 17:19:47 +08:00
MistEO
2dcc599f4e fix: 调整部分滑动延迟，放到配置文件中 2023-04-22 14:31:54 +08:00
MistEO
499ee8293c fix: 资源文件夹不存在时的接口返回值 2023-04-22 05:02:43 +08:00
MistEO
764cced0d2 feat: 干员识别 (#4368) 
干员图鉴文字版，返回未拥有干员名
 2023-04-21 19:59:02 +08:00
zzyyyl
db19f0e076 perf: TaskData 小优化 2023-04-20 19:50:01 +08:00
zzyyyl
9ff4c30b08 fix: 打开 debug 模式下的任务 JustReturn 检查 
JustReturn 检查: 任务的 next 系列属性中，JustReturn 类的任务只能作为列表最后一个出现（否则后面的任务运行不到）
 2023-04-20 19:49:52 +08:00
罗家欣
05ddb26e8d 修复未识别完错误 2023-04-19 16:22:48 +08:00
罗家欣
87b63c95a8 优化逻辑,debug存图 2023-04-19 13:19:29 +08:00
罗家欣
dbd0f4ffc1 干员识别,fix 2023-04-18 15:32:19 +08:00
罗家欣
358ed2ddf5 干员识别 2023-04-17 15:54:10 +08:00
shxyke
94c39bfd31 feat: 为 MaaCore 添加神秘代码支持 2023-04-13 09:26:37 +00:00
MistEO
a34cc80d48 fix: 修复模板不存在时的崩溃问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4298
 2023-04-13 00:09:51 +08:00
LingXii
57b0654872 Feat: 新增不期而遇插件，优化招募与战斗策略 (#4241) 
feat: 新增不期而遇插件，优化招募与作战策略
 2023-04-09 20:28:15 +08:00
MistEO
494c3e9d4d perf: 尝试优化ocr模型加载过程 2023-04-08 04:07:42 +08:00
MistEO
5dfe3556ec refactor: 重构地图加载逻辑，改为惰性加载 2023-04-08 01:58:09 +08:00
MistEO
2132d097d3 feat: 模板图片惰性读取，优化onnx读取 2023-04-07 23:14:17 +08:00
MistEO
da0b860f4a feat: 惰性加载onnx模型 2023-04-07 22:44:19 +08:00
MistEO
82091b578d feat: 攻略视频导出作业 JSON (#4030) 
* feat: 作业视频识别，基本功能完成

Squashed commit of the following:

commit 3488507ebfb291b21ce9dae2d77536c39fc74840
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 19:05:19 2023 +0800

    chore: rename

commit ad3446fd823db3ea5cd657cf216fcfdd7063ce0b
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 19:02:34 2023 +0800

    perf: 优化视频识别结构

commit 5e5553e3720aa7c8c81d1667af96ffdc192d4281
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 18:53:13 2023 +0800

    fix: build error

commit ffe850ea49008e2c7cef281159ef673ffae735f2
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 18:40:46 2023 +0800

    perf: 识别识别不需要连接模拟器

commit 56711ea3ded5b8832b9399591cb93064740ba23c
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 18:40:20 2023 +0800

    perf: 优化视频读取性能

commit 1ce5ea3a61a6f270d834d1f2346832debd83f70f
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 16:19:08 2023 +0800

    feat: WPF UI 初步集成视频识别

commit d741d0fbef48829e502d9b641d918969c94a7352
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 15:18:58 2023 +0800

    chore: 一些重命名

commit a14652773989c35788dff0262c70cbc4c8c0cd0d
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 14:35:48 2023 +0800

    chore: rename and fix build error

commit 5ea7d52fab67d7085aceb3147b6940781f5e4b93
Merge: 89db75e0 4c4f8f4d
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 14:25:15 2023 +0800

    Merge branch 'dev' into feat/video_to_json

commit 89db75e05cea969417462dfcffb8e0b68233a199
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 03:49:41 2023 +0800

    chore: 导出json文件名

commit 6e1804b1dd49781dfeffc4a846321f8ebfff8b8c
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 03:47:38 2023 +0800

    fix: 修复关卡识别错误

commit cc0dab1c1b0e2ff4ce2d62e3996516b13039be2b
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 03:31:39 2023 +0800

    feat: 完成关卡名识别、重命名一些变量

commit bf1ab83bcfdeb64dad06c2cc3ac649c77baf317e
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 02:23:24 2023 +0800

    feat: 第一份作业导出

commit 76ae6262b64f7e7365cd1e7783b2cd4db61600ca
Author: MistEO <mistereo@hotmail.com>
Date:   Fri Mar 31 21:43:00 2023 +0800

    chore: rename

commit 493cb9c3ab4718f15316c357080fec6930c89a97
Author: MistEO <mistereo@hotmail.com>
Date:   Fri Mar 31 20:13:45 2023 +0800

    perf: 更新战斗识别相关模型

commit 623c80c76792a24c37d7dad5addb8c00341a5688
Author: MistEO <mistereo@hotmail.com>
Date:   Thu Mar 30 00:02:47 2023 +0800

    refactor: 完成视频切片重构

commit 73bbf7c8727d911effa298ccff0a4ae29376baed
Author: MistEO <mistereo@hotmail.com>
Date:   Tue Mar 28 23:54:39 2023 +0800

    perf: 优化tensor转换

commit 13ba7a01e1c46ee1f0b6bea55ffaaf30fcf552c3
Merge: 48a4d765 61577dc9
Author: MistEO <mistereo@hotmail.com>
Date:   Tue Mar 28 22:28:33 2023 +0800

    Merge branch 'dev' into feat/video_to_json

commit 48a4d765e2a1f1240e8f31352c21f58b565752d2
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Mar 25 23:22:35 2023 +0800

    fix: build error

commit 02c80f4442e520998aff3b14fa4decbbc421b6c0
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Mar 25 04:03:54 2023 +0800

    perf: 优化技能ready识别模型

commit 7c15b54bd4a7c97772f27ac8bebaec97dd59f19c
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Mar 25 03:15:46 2023 +0800

    perf: 重新训练干员方向检测模型

commit 450eea50a0601676e731411188a74cfc38f21a42
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Mar 25 01:39:23 2023 +0800

    feat: 画了一堆图

commit bf2bc66c6d52ecdc9f7ce0e7fc3a4891bbe59f7c
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 23:33:33 2023 +0800

    feat: 完成干员部署方向识别

commit f3a0b4aee8e910d5ebc8e42486c5194bd6ffe51e
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 22:43:01 2023 +0800

    feat: 输出draw，增加一些回调，修复干员位置检测

commit 772fd2dbeaef59812b563aef36808e15f8d33e08
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 18:16:26 2023 +0800

    feat: 初步识别上场干员

commit 4fda687bdcbc598c80576f741b518fae8fc87566
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 17:29:57 2023 +0800

    perf: 优化一些细节

commit c72a1d7c8a13c1d22d5e2598ae0db87e74d32c26
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 01:10:29 2023 +0800

    fix: 修复偶现误识别问题

commit 3021a7372dbad1f920aad346b49f115d4d2e073c
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 01:01:21 2023 +0800

    feat: 完成干员检测

commit e74072fbbeffd4c0cd7a4d67208a67797341f1fa
Author: MistEO <mistereo@hotmail.com>
Date:   Tue Mar 21 01:34:20 2023 +0800

    feat: 完成yolo干员检测模型集成

commit 27a10f0bd0529c71d09aa2434a1ef1fd0cac2449
Author: MistEO <mistereo@hotmail.com>
Date:   Mon Mar 20 20:39:44 2023 +0800

    chore: rename

commit 277a620819c1f368392c10f8d74a7b3e9f633a58
Author: MistEO <mistereo@hotmail.com>
Date:   Sun Mar 19 23:59:12 2023 +0800

    feat: 完成编队->部署区识别

commit 9cfda5d295c34f37b592125898ec70105de77f7c
Author: MistEO <mistereo@hotmail.com>
Date:   Sun Mar 19 02:02:11 2023 +0800

    feat: 完成编队识别

    MaaDeps 需要给 opencv features 加上 ffmpeg

* fix: 调整部分参数适应硬解带来的颜色变化问题

* chore: 删除部分日志

* fix: build error

* fix: 修复编队识别错误

* fix: 修复部署区识别错误（阈值问题

* fix: 修复初始部署区识别错误

* fix: 修复切片错误，修复部署区识别

* fix: 修了一些bug又制造了一些bug

* fix: 修了一些bug又制造了一些bug

* fix: typo

* fix: 关键帧错误

* fix: 修复部署区偶现识别错误

* fix: 修复暂停按钮偶现识别错误

* feat: 新增技能识别，修复一些bug

* fix: 修复变化判断错误

* chore: draw窗口优化
 2023-04-05 15:17:09 +08:00
MistEO
8d6ffde579 fix: 修复肉鸽崩溃问题 
fix #4160 #4163
 2023-04-03 19:09:34 +08:00