fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 10:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,688 Commits 61 Branches 1,838 Tags
400ecd5c8a06ad4e4e03432a4876ad65b04faae8
Commit Graph

1049 Commits

Author SHA1 Message Date
GD-GK
400ecd5c8a Merge branch 'dev' into dev 2023-04-18 15:46:41 +08:00
罗家欣
0d50f9ab8c 干员识别,fix 2023-04-18 15:32:19 +08:00
MistEO
2afeaedfc8 fix: 修复肉鸽关卡名识别错误 
#4370
 2023-04-18 00:58:33 +08:00
罗家欣
6293ac572c 干员识别 2023-04-17 15:54:10 +08:00
uye
bbc5e5fdb8 feat: 添加房贷还款 2023-04-16 01:46:44 +08:00
uye
0f066efc32 fix: 修复主播u识别错误 2023-04-15 11:54:12 +08:00
uye
5f815ea83c fix: 修复 U-Official 识别错误 
fix #4327
 2023-04-15 09:33:29 +08:00
uye
22e71d926a fix: 点两次开始行动导致取消吃理智药 
fix #4326
 2023-04-15 09:20:48 +08:00
uye
87bb7a2805 chore: StartButton1TryAgain添加baseTask 2023-04-13 14:08:14 +08:00
uye
a479beea05 fix: 修复12章活动期间需要确认两次 & StartButton2偶尔点不上 2023-04-13 13:30:48 +08:00
uye
d70667b8d4 feat: 增加开始行动前置延迟 2023-04-12 16:19:15 +08:00
uye
ea2e0d4ee1 fix: 日服关卡导航问题 #4289 2023-04-12 15:01:06 +08:00
uye
1a268bf082 fix: 尝试修复资源本6识别无代理 #4278 2023-04-11 13:02:50 +08:00
LingXii
5c8f1b1484 Feat: 新增不期而遇插件，优化招募与战斗策略 (#4241) 
feat: 新增不期而遇插件，优化招募与作战策略
 2023-04-09 20:28:15 +08:00
MistEO
8e44ad5569 perf: 简化肉鸽编队界面的选中识别 (#4246) 2023-04-09 19:04:59 +08:00
MistEO
2cbe1088d7 fix: 修复部署战斗中部署区识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4197
 2023-04-09 19:03:39 +08:00
Horror Proton
af4850bc87 perf: simplify RoguelikeFormation selected_analyze 2023-04-09 18:50:41 +08:00
MistEO
56ca2ce531 fix: 修复视频识别职业识别错误，并添加一个兜底措施 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4222
 2023-04-09 17:25:57 +08:00
MistEO
2f19f2f162 fix: 修复会客室偶现送完线索卡住的问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4232
 2023-04-09 16:57:10 +08:00
MistEO
e8687792c4 fix: 规避第十二章三倍掉落被上传的可能性 2023-04-09 16:16:36 +08:00
MistEO
3e6a8344ef revert: 回滚战斗干员标记 模板阈值 2023-04-09 15:19:48 +08:00
MistEO
3fe24d5a0b Revert "fix: 尝试修复mac上肉鸽编队选中状态识别错误的问题" 
This reverts commit dcdb0f0bcd.
 2023-04-08 22:35:44 +08:00
MistEO
dcdb0f0bcd fix: 尝试修复mac上肉鸽编队选中状态识别错误的问题 2023-04-08 22:23:33 +08:00
uye
d8cf4318cb chore: 扩大识别区域 2023-04-08 15:16:07 +08:00
uye
07a372af90 fix: 修复多余替换 2023-04-08 13:53:21 +08:00
uye
41c9433cc2 chore: 修改 EpisodeOcrReplace 替换内容 2023-04-08 13:42:45 +08:00
uye
0c1ce42ba9 chore: 添加标注 2023-04-08 13:31:27 +08:00
uye
d4e10e6423 fix: 修复美服主线导航问题 #4226 2023-04-08 13:21:30 +08:00
uye
f714e39f42 fix: 修改主线导航替换文本 #4226 2023-04-08 11:47:57 +08:00
Hao Guan
341c54d885 fix: 修复iOS识别不到战斗干员 2023-04-08 04:38:30 +10:00
uye
923a15f37e fix: 美服主线关卡识别问题 
fix #4216
 2023-04-08 00:10:38 +08:00
zzyyyl
2237c0c46a feat: 添加主线第十二章导航 
close https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4208
 2023-04-07 17:09:56 +08:00
MistEO
e818de5154 fix: 修复掉落识别-关卡难度识别 2023-04-06 22:20:14 +08:00
MistEO
db8a2493f4 fix: 尝试修复干员撤退不掉的问题 2023-04-05 20:30:09 +08:00
uye
c26b360637 fix: 修复采购中心识别问题 
fix #4177
 2023-04-05 17:31:08 +08:00
MistEO
39d323562a 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 b8bb725e
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 a0964485
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
DuKong
b5f4a237ae fix: 修复收藏品二选一卡死问题 2023-04-02 22:35:39 +08:00
LingXii
a192bea9ba Merge branch 'MaaAssistantArknights:dev' into dev 2023-04-02 11:04:04 +08:00
DuKong
6f76bff572 feat: 优化招募与战斗逻辑框架 2023-04-01 19:19:55 +08:00
uye
072117ab3a fix: 危机合约版本更新无法刷钱本等物质搜寻关 #4051 
fix #4051
 2023-03-21 23:02:50 +08:00
uye
a983f6ee21 fix: CE-6 代理识别错误 2023-03-21 20:49:35 +08:00
uye
91349fbf9a chore: 调整Level6资源关卡代理判断延迟，替换识别图片 2023-03-19 23:55:14 +08:00
uye
5a83a14bf2 fix: 尝试修复CE-5导航问题 2023-03-19 20:14:05 +08:00
MistEO
f88bd6dbd8 chore: 更新子模块 2023-03-19 01:19:16 +08:00
uye
9cce373740 fix: 主线关卡导航问题 
#4029
 2023-03-19 01:03:29 +08:00
cenfusheng
4da0e0058f Create tasks.json 
修复可能识别不到第一个字的问题。保留原本X与S的识别修正。就成了：.*麟.*夜刀$  
修修补补又一年（
 2023-03-14 14:09:24 +08:00
MistEO
df5dbebf5d fix: 修复CF关卡“用餐加成“识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3981
 2023-03-13 14:04:37 +08:00
MistEO
368bfd8fd3 feat: 新增支持 CF 关卡掉落识别 (#3961) 2023-03-12 01:41:58 +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
MistEO
87be04a4fa fix: 修复泰拉大陆调查团 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3927
 2023-03-10 11:10:24 +08:00