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
7,109 Commits 61 Branches 1,838 Tags
cbfeebf9b97e07e748920d9eae4e69a24dbd2ed0
Commit Graph

328 Commits

Author SHA1 Message Date
MistEO
899bfd96d5 chore: Auto Update Game Resources - 2023-05-01 2023-05-01 08:27:40 +00:00
MistEO
30808da54d fix: 抽卡卡在十连结束界面的问题 2023-04-30 14:06:45 +08:00
MistEO
13dff17cc3 feat: 牛牛抽卡 2023-04-30 01:23:28 +08:00
MistEO
e3500529b7 chore: 干员识别潜能改成1-6 2023-04-29 21:33:48 +08:00
MistEO
2b29dc7fa3 perf: 优化干员识别 flag 检测 2023-04-29 21:24:36 +08:00
MistEO
b9893483df feat: 新增支持肉鸽刷指路鳞 
fix #4238 #4144 #3044 #2997 #2503
 2023-04-29 03:56:28 +08:00
GD-GK
037ee70e64 feat: 干员识别增加等级和精英度 (#4438) 
* core返回json object

* fix:冲突

* 等级ok

* 等级和精英度

* core:等级，精英度识别

* 优化识别方式

* fix:ci

* 添加潜能模板，fix ci

* 潜能识别

* clang

* fix:直接使用stoi

* 修改识别完成条件

* 修复等级判断条件

* fix

* 修改类继承,使用char_model,函数拆分

* 缩小名字识别框,添加替换字符。权宜之计 （

* 纠错，优化代码
 2023-04-25 20:08:48 +08:00
DuKong
0804eed360 feat: 支持识别并选择临时招募干员 2023-04-22 17:19:47 +08:00
罗家欣
4b2557782e 更名operBox 2023-04-20 10:56:29 +08:00
罗家欣
e6827c3690 Merge branch 'dev' of https://github.com/GD-GK/MaaAssistantArknights into dev 2023-04-19 16:40:02 +08:00
罗家欣
9b4ae5e810 修复未识别完错误 2023-04-19 16:22:48 +08:00
GD-GK
42b699ce26 Merge branch 'dev' into dev 2023-04-19 13:36:05 +08:00
罗家欣
464629e1f2 优化逻辑,debug存图 2023-04-19 13:19:29 +08:00
MistEO
96bceda1c9 feat: 根据自定义配置修改订单/产物种类 (#4293) 
1、新增根据自定义配置改变贸易站订单/制造站产物的函数
2、新增两个相关的GUILog字符串信息，用于检测产物报错后/切换产物后发送GUI Log信息
3、新增Tasks任务和任务所需要的资源，在新增的函数中调用
 2023-04-18 20:00:11 +08:00
罗家欣
0d50f9ab8c 干员识别,fix 2023-04-18 15:32:19 +08:00
罗家欣
6293ac572c 干员识别 2023-04-17 15:54:10 +08:00
MistEO
964dc770df fix: 修复抄作业水陈关不掉技能的问题 2023-04-16 23:05:52 +08:00
uye
bbc5e5fdb8 feat: 添加房贷还款 2023-04-16 01:46:44 +08:00
Roland
6c39d76f0b Merge branch 'dev' of github.com:Roland125/MaaAssistantArknights into dev 2023-04-13 16:35:33 +08:00
Roland
5529e5921f 将Tasks中CheckConnect检测项目改为OcrDetect 
删除原来的模板图片
 2023-04-13 16:26:53 +08:00
Roland125
5f4edf8b58 Merge branch 'dev' into dev 2023-04-13 14:26:16 +08:00
Roland
64151b4b78 增加一个网络状况检测的Tasks和Tasks所需的图片 2023-04-13 14:14:26 +08:00
Roland
6ecca25626 根据自定义配置修改订单/产物种类 
1、新增根据自定义配置改变贸易站订单/制造站产物的函数
2、新增两个相关的GUILog字符串信息，用于检测产物报错后/切换产物后发送GUI Log信息
3、新增Tasks任务和任务所需要的资源，在1的函数中调用
 2023-04-12 11:35:31 +08:00
uye
1a268bf082 fix: 尝试修复资源本6识别无代理 #4278 2023-04-11 13:02:50 +08:00
MistEO
8ecddf7f0b fix: 尝试修复傀影肉鸽不期而遇死循环的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4220
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4189
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3335
 2023-04-09 17:45:41 +08:00
uye
276d5fe5bf chore: 替换三星判断条件 2023-04-08 15:13:58 +08:00
MistEO
fa1b52afb9 chore: 移除“中坚信物” 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/4210
 2023-04-07 23:50:34 +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
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
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
uye
a983f6ee21 fix: CE-6 代理识别错误 2023-03-21 20:49:35 +08:00
MistEO
7246e66e22 chore: 更新游戏资源（不包含危机合约地图） 2023-03-21 19:30:48 +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
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
9a364834c7 chore: 更新资源 2023/3/7 2023-03-07 10:52:01 +08:00
LambdaLe
a13a1c8bb0 fix: 修复 肉鸽助战 刷新按钮ocr不能部分匹配及刷新时间识别错误问题 2023-03-03 13:39:10 +08:00
zzyyyl
8f51145d81 feat: 重命名 Loading、 Loading2 相关任务 
将 Loading 任务重命名为 LoadingText，Loading2 任务重命名为 LoadingIcon 方便区分
 2023-02-23 08:18:16 +08:00
MistEO
0e5eae1060 Merge branch 'stable' into dev 2023-02-14 16:21:07 +08:00
MistEO
dcde2e5125 chore: 更新游戏数据 2023/2/14 2023-02-14 16:13:11 +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
bdcee1a9c1 feat: 生息演算 添加回调log 2023-02-04 13:27:07 +08:00
wangli
533fa3dc3c fix: 修复 生息演算 初始无干员卡住的问题，添加集成文档 2023-02-03 09:22:04 +08:00
wangli
1e9b7287ba fix：修复循环点击退出关卡按钮导致的卡死问题 
纠正错别字

更改while循环条件: true->!need_exit()
 2023-02-01 18:19:18 +08:00
wangli
15a313804f feat: 生息演算 添加关卡导航并大幅增加操作冗余 
feat: 生息演算 支持断线重连、中断继续与错误后重新执行
 2023-02-01 15:54:02 +08:00