fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,813 Commits 61 Branches 1,840 Tags
c71a2fca1f519a1e12e1294de133c33a4f4ffebc
Commit Graph

1912 Commits

Author SHA1 Message Date
MistEO
33b242e0ef feat: 新增一个选择第二分辨率的连接选项 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4173
 2023-04-06 22:50:04 +08:00
MistEO
e818de5154 fix: 修复掉落识别-关卡难度识别 2023-04-06 22:20:14 +08:00
MistEO
13a2420a04 chore: 更新游戏数据 2023/4/6 2023-04-06 19:27:53 +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
DuKong
2264f57af9 Merge branch 'dev' of https://github.com/LingXii/MaaAssistantArknights into dev 2023-04-02 21:34:24 +08:00
LingXii
a192bea9ba Merge branch 'MaaAssistantArknights:dev' into dev 2023-04-02 11:04:04 +08:00
MistEO
ee55e10272 chore: 更新游戏资源 2023/04/01 2023-04-01 20:12:42 +08:00
DuKong
6f76bff572 feat: 优化招募与战斗逻辑框架 2023-04-01 19:19:55 +08:00
vonnoq
27c3fcbb43 修改活動導航入口 
今天更新已無法再從左下角識別文字
沿用原本識別attention的活動圖片即可
 2023-03-29 22:20:46 +08:00
vonnoq
55ea2212ee 繁中服 塵影餘音活動入口 角色識別 2023-03-29 01:20:57 +08:00
vonnoq
5a39ee1f50 繁中服 塵影餘音 任務道具 2023-03-29 01:19:15 +08:00
MistEO
0e51252685 refactor: 从curl迁移到libcpr (#4088) 2023-03-28 19:20:16 +08:00
MistEO
0ccc9dc860 perf: 优化请求结构 2023-03-28 18:05:59 +08:00
eundong
4e100eb2de fix: clientKR Roguelike@Dropsflag update 
This flag was changed in a recent patch, as the result, the post-battle reward screen was not properly reconized
 2023-03-27 12:51:34 -07:00
shxyke
24898ebdcf refactor: use libcpr instead of curl 2023-03-27 14:22:32 +00:00
uye
072117ab3a fix: 危机合约版本更新无法刷钱本等物质搜寻关 #4051 
fix #4051
 2023-03-21 23:02:50 +08:00
uye
eba980a961 增加海外悠星服务器153基建的作业（截止至玛恩纳） (#4050) 
Add 153 base max layout for JP, EN, KR server, operators are used until
一份是16+4+4的三班，菲亚007二人：巫恋和龙舌兰
另一份是8+8+4+4的四班，菲亚007三人：巫恋，龙舌兰，和玛恩纳（第三位就根据个人喜好007了） the other is 4
 2023-03-21 21:00:09 +08:00
uye
a983f6ee21 fix: CE-6 代理识别错误 2023-03-21 20:49:35 +08:00
MistEO
2f06b33737 chore: 新增危机合约地图 2023-03-21 19:39:11 +08:00
MistEO
7246e66e22 chore: 更新游戏资源（不包含危机合约地图） 2023-03-21 19:30:48 +08:00
BlackNorton
97a856cc3b 增加海外悠星服务器153基建的作业（截止至玛恩纳） 
Add 153 base max layout for JP, EN, KR server, operators are used until Mlynar banner.
第一次交pr，不是很懂 
一份是16+4+4的三班，菲亚007二人：巫恋和龙舌兰
a 3 shifts 153 layout, Fiammetta recharge Shamare and Tequilla
另一份是8+8+4+4的四班，菲亚007三人：巫恋，龙舌兰，和玛恩纳（第三位就根据个人喜好007了）
the other is 4 shifts/day, Fiammetta recharge Shamare, Tequilla, and a third operator (currently set to Mlynar, change it for personal preference)
换班时间已填写 shift schedule is set
 2023-03-20 23:20:52 -07:00
Snowdash
6b070df8c7 将海蒂加入作业黑名单 
一技能一开全漏了
 2023-03-20 21:47:01 +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
74315df4aa fix: 承曦グレイ 識別（YoStarJP） 
修复承曦グレイ识别为承【汉字】グレイ的问题
 2023-03-16 14:24:41 +08:00
cenfusheng
cb6b685640 fix: 修復砾的文字識別問題（txwy） 
修复砾识别为礫樂的问题（txwy）
 2023-03-16 14:23:27 +08:00
Yifan Liu
a1d0cb7ef0 style: sort overseas clients' json 2023-03-14 14:59:20 -05:00
Yifan Liu
a1c124c807 feat: JP OF-1 credit support 2023-03-14 12:48:14 -05:00
MistEO
350a9744e4 chore: 更新游戏资源，更新外服资源 2023/3/14 2023-03-14 22:26:31 +08:00
cenfusheng
8c505bcaff feat: 增加CF-EX与CF-S的地图 
不知道有没有PR过，那我也PR一下。
 2023-03-14 22:11:01 +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
qaz1qazlol2
7ec3890fda 添加一些EN服务器翻译 (#3964) 
* Translate Something

* Update tasks.json
 2023-03-12 14:54:21 +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
yuanyan3060
67311bbf6c chore: Update act24side_09-activities-act24side-level_act24side_09.json (#3919) 
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-03-09 01:08:39 +08:00
MistEO
a02342a3b4 fix: 修复 CF-9 地图格子错误 2023-03-09 00:36:52 +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
uye
e91f7fe9b1 feat: 添加活动导航 2023-03-07 21:16:41 +08:00
MistEO
9a364834c7 chore: 更新资源 2023/3/7 2023-03-07 10:52:01 +08:00
LambdaLe
81f650f40f fix: 修复 肉鸽助战 招募后卡在干员立绘界面的问题 2023-03-06 18:15:32 +08:00
Yifan Liu
d2235dc51d Merge branch 'dev' into feat/activity_ota 2023-03-05 21:52:02 -06:00
MistEO
807ff9c9c0 chore: 更新剿灭资源；更新ResourceUpdater依赖 2023-03-05 20:13:46 +08:00
Yifan Liu
521dbb8078 fix: JP 48h medicine recognition issue 2023-03-04 16:51:44 -06:00