fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,594 Commits 61 Branches 1,839 Tags
07caee7d42f894d7e855c2c8a8d276f0be12e1ee
Commit Graph

302 Commits

Author SHA1 Message Date
MistEO
07caee7d42 chore: 移除“中坚信物” 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/4210
 2023-04-07 23:50:34 +08:00
MistEO
9cdcfcd344 fix: 修复掉落识别-关卡难度识别 2023-04-06 22:20:14 +08:00
MistEO
fe73546128 chore: 更新游戏数据 2023/4/6 2023-04-06 19:27:53 +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
LingXii
f8c4063310 Merge branch 'MaaAssistantArknights:dev' into dev 2023-04-02 11:04:04 +08:00
MistEO
ca93e55cdd chore: 更新游戏资源 2023/04/01 2023-04-01 20:12:42 +08:00
DuKong
4a3814cdd4 feat: 优化招募与战斗逻辑框架 2023-04-01 19:19:55 +08:00
uye
fc7fafcc33 fix: CE-6 代理识别错误 2023-03-21 20:49:35 +08:00
MistEO
9c0e5df5ab chore: 更新游戏资源（不包含危机合约地图） 2023-03-21 19:30:48 +08:00
uye
77431aaee4 chore: 调整Level6资源关卡代理判断延迟，替换识别图片 2023-03-19 23:55:14 +08:00
uye
4f18a5509c fix: 尝试修复CE-5导航问题 2023-03-19 20:14:05 +08:00
MistEO
a12d55cb8c feat: 新增支持 CF 关卡掉落识别 (#3961) 2023-03-12 01:41:58 +08:00
MistEO
ef1c522584 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
MistEO
8c790e4925 chore: 更新资源 2023/3/7 2023-03-07 10:52:01 +08:00
LambdaLe
6f4fc8fa91 fix: 修复 肉鸽助战 刷新按钮ocr不能部分匹配及刷新时间识别错误问题 2023-03-03 13:39:10 +08:00
zzyyyl
a1237c1b34 feat: 重命名 Loading、 Loading2 相关任务 
将 Loading 任务重命名为 LoadingText，Loading2 任务重命名为 LoadingIcon 方便区分
 2023-02-23 08:18:16 +08:00
MistEO
8ed735619d Merge branch 'stable' into dev 2023-02-14 16:21:07 +08:00
MistEO
cb23ff17da chore: 更新游戏数据 2023/2/14 2023-02-14 16:13:11 +08:00
LambdaLe
37dcb6fb12 feat: 生息演算 MAACore添加刷粗制赤金参数 
生息演算集成文档

修复mainModel变量名更改导致的编译错误
 2023-02-12 20:36:49 +08:00
LambdaLe
bd07609888 refactor: 重构生息演算，增强拓展性 
生息演算 修复若干bug
 2023-02-12 20:20:57 +08:00
wangli
af7477ca5e feat: 生息演算 添加回调log 2023-02-04 13:27:07 +08:00
wangli
c9160218ac fix: 修复 生息演算 初始无干员卡住的问题，添加集成文档 2023-02-03 09:22:04 +08:00
wangli
c999cc4146 fix：修复循环点击退出关卡按钮导致的卡死问题 
纠正错别字

更改while循环条件: true->!need_exit()
 2023-02-01 18:19:18 +08:00
wangli
c00c948633 feat: 生息演算 添加关卡导航并大幅增加操作冗余 
feat: 生息演算 支持断线重连、中断继续与错误后重新执行
 2023-02-01 15:54:02 +08:00
wangli
b0aec70895 fix：生息演算 修复跨域通信II解锁后无法放弃演算的问题 
fix: 生息演算 修复演算结束界面无奖励时不继续的问题

fix: 生息演算 部分修复开始行动黑屏时不断截屏报错的问题

fix: 生息演算 修复部分低性能重复点击误触问题

（加入task.json但未实装） 生息演算 结束前使用掉所有材料，提高刷取效率
 2023-01-31 18:14:31 +08:00
wangli
61cb431823 feat: 五天流生息演算 2023-01-30 15:07:45 +08:00
MistEO
dc80f552c3 fix: 修复保全中场掉落偶尔卡住的问题 2023-01-18 23:46:30 +08:00
uye
1c175a7238 feat: 支持「登临意」活动导航 2023-01-17 16:22:22 +08:00
MistEO
0b742b7f4b chore: 更新gamedata 2023-01-17 15:24:46 +08:00
MistEO
08c38f5181 fix: 修复保全一系列的问题（我忘了具体有哪些了.jpg） 2023-01-17 02:49:54 +08:00
MistEO
1c917b5e53 feat: 更新保全协议，整合drops字段，并支持战斗中获取战利品action 2023-01-14 23:48:11 +08:00
MistEO
f1154eac4d fix: 修复保全CheckIfStartOver卡住问题 2023-01-13 16:07:16 +08:00
MistEO
11c53cea3c fix: 修复部分模板加载时的warning 2023-01-11 20:21:39 +08:00
MistEO
8f95298f7a fix: 修复 引航者试炼 - 恢弘试炼 不开始的问题 2023-01-11 10:36:21 +08:00
MistEO
e967d98fbe chore: 更新资源 20230110 2023-01-10 22:37:55 +08:00
MistEO
1314ec2eb2 temp 2023-01-10 21:45:21 +08:00
MistEO
9c772655c4 feat: 完成保全的掉落干员选择等一些逻辑 2023-01-09 00:20:27 +08:00
MistEO
7353abd4e2 feat: 简单支持了下保全开局跳过换人 2023-01-08 22:07:04 +08:00
MistEO
f3714a000f feat: 初步完成保全部署策略 2023-01-08 21:17:12 +08:00
MistEO
e3899c7208 feat: 初步完成保全json解析及进入作战前部分操作 2023-01-08 21:17:07 +08:00
MistEO
ef646ff0bb perf: update resource for drops_v2 2023-01-07 23:28:59 +08:00
MistEO
542596a6d6 chore: 更新资源: 2023/1/1 2023-01-01 15:43:20 +08:00
MistEO
d1fb03e8ad chore: 更新活动关卡数据 2022-12-22 16:07:09 +08:00
wangli
32d4779a40 feat: MaaCore添加肉鸽助战支持 2022-12-19 20:45:59 +08:00
MistEO
d7af9ecd95 chore: 更新2022/12/15游戏数据（不包括关卡掉落信息） 2022-12-15 14:07:52 +08:00
uye
f6a82decd2 feat: 添加活动导航 2022-12-14 14:59:14 +08:00
MistEO
4951110bd9 merge: dev 2022-12-13 17:44:06 +08:00
Hydrogina
4235ce9358 fix: 修复借助战刷信用无法进图 #2947 
fix: 修复OF-1未开启情况下信用任务卡住&功能说明不明确 #2949
 2022-11-30 13:03:00 +08:00
uye
4b7ac76144 feat: SideStory「风雪过境」复刻活动关卡导航 2022-11-26 16:58:09 +08:00
Horror Proton
1e694868f5 feat: update skill ready icon matching 2022-11-26 10:29:42 +08:00