fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,543 Commits 61 Branches 1,838 Tags
bc7e2d187d02712cac9f8fcff30b693492225d86
Commit Graph

60 Commits

Author SHA1 Message Date
DavidWang19
bc7e2d187d feat: 初步适配界园肉鸽并初步实现存钱 (#13183) 
* feat: 初步适配界园肉鸽并初步实现存钱

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: 不留 <weinibuliu@outlook.com>
Co-authored-by: HYY <95246895+HYY1116@users.noreply.github.com>
Co-authored-by: 萨拉托加 <151550168+Saratoga-Official@users.noreply.github.com>
 2025-07-16 03:20:33 +01:00
status102
29acc13b3f chore: 提示补全 2025-05-13 19:56:45 +08:00
status102
b5d825845b fix: 再铲一屎 2025-05-13 00:03:02 +08:00
status102
c872400eed fix: 铲屎 2025-05-12 18:44:47 +08:00
uye
276dc5aa66 fix: 修复了屎遇上手动覆盖文件的大聪明爆炸的问题 2025-05-12 18:40:51 +08:00
uye
328153c11b fix: 无法热更 2025-04-27 03:17:01 +08:00
Constrat
3e8eddb081 rft: tasks (#12448) 
* rft: tasks

* chore: remove older tasks.json

* rft: move some stages

* chore: Auto update by pre-commit hooks [skip changelog]

* rft: rename

---------

Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-04-25 18:31:37 +08:00
uye
869816af70 feat: LoadResourceAndCheckRet 额外读取对应文件名_custom.json (#12382) 
* feat: LoadResourceAndCheckRet 额外读取对应文件名_custom.json

* chore: 添加日志，问题反馈打包带上custom文件
 2025-04-19 12:16:05 +08:00
晓丶梦丶仁
35fbb806bb perf: 萨卡兹肉鸽不期而遇统一使用默认策略 (#11512) 2025-01-26 20:20:36 +08:00
pre-commit-ci[bot]
ce02c80498 chore: Auto update by pre-commit hooks [skip changelog] 2024-10-22 08:40:28 +00:00
Weiyou Wang
74da94d446 feat: 加入肉鸽节点地图识别功能，并应用于萨卡兹肉鸽蓝图快速过图 (#9812) 
* feat: 添加 RoguelikeMode::FastPass，负责用蓝图分队快速过图

* chore: update templates for RoguelikeMap and RoguelikeRouting

* feat: RoguelikeMap

* feat: RoguelikeMapConfig

* feat: BrightPointAnalyzer

* feat: RoguelikeRouting

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 修复会卡在商店门口的bug

* fix: adapt new plugin-registration signature

* chore: try fix submodule

* perf: 复用task

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 为函数申明补上定义

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-09 22:54:19 +10:00
DavidWang19
07487cd476 feat: 适配萨卡兹肉鸽 (#9677) 
* feat: 适配萨卡兹肉鸽

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: Lemon-miaow <61692393+Lemon-miaow@users.noreply.github.com>
Co-authored-by: Weiyou Wang <blspgzs@gmail.com>
 2024-07-17 15:56:16 +01:00
Weiyou Wang
aed0872dc1 refactor: 萨米肉鸽配置文件/插件单独文件夹 (#9651) 
* refactor: sami roguelike plugins
 2024-07-16 00:32:58 +01:00
SherkeyXD
b26ea061a1 refactor: 重构肉鸽不期而遇策略的目录格式 2024-07-08 03:30:24 +08:00
Weiyou Wang
540103cef1 feat: 初步实现肉鸽模式5：刷隐藏坍缩 2024-06-07 12:00:35 +10:00
MistEO
bafc8c3f71 feat: mumu extras (#8939) 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-05-03 22:05:37 +08:00
zzyyyl
b1600f7ace style: format 2023-10-28 14:24:32 +08:00
Lancarus
2dfcaa9f98 perf： 将CiphertextBoard更换为foldartal 2023-10-27 13:32:43 +08:00
zzyyyl
c04f27c8ee revert: 恢复萨米肉鸽使用密文板 
Revert "Revert "feat: 萨米肉鸽使用密文板 (#6949)" (#7054)"

This reverts commit c109acd709.
 2023-10-25 14:41:22 +08:00
MistEO
9736b57ed4 chore: 改改注释 2023-10-06 17:56:01 +08:00
status102
caa353cc53 fix: 修复无法对后续加载的图片资源进行存在检测的错误，跳过宿舍技能检查 2023-10-05 09:20:58 +08:00
MistEO
19b6b8cce6 fix: 简单修复一下异步Load导致的错误 
fix #6250
 2023-09-10 12:43:32 +08:00
MistEO
cadd429b24 fix: 规避crt死锁问题 
fix #6188
 2023-09-02 13:43:29 +08:00
MistEO
ac148c1339 fix: 尝试修复LoadResource卡死的问题 2023-09-02 01:18:38 +08:00
MistEO
8bcf30a0c3 fix: build error on ubuntu 2023-08-28 23:37:00 +08:00
MistEO
05e4301691 fix: 不再对资源进行并行加载 2023-08-28 23:00:00 +08:00
MistEO
5931229e46 fix: try to fix #6006 2023-08-28 20:05:44 +08:00
lassnuttun
c64ed151d1 chore: 修改了刷源石锭的不期而遇逻辑的变量名、文件名 2023-08-19 15:22:03 +08:00
lassnuttun
491c7e97c6 feat: 优化刷源石锭模式的逻辑，保留原先不期而遇选择方案的同时增加了针对刷钱的不期而遇选择方案，根据肉鸽模式使用不同方案 2023-08-19 12:13:24 +08:00
MistEO
9f9000157c refactor: 拆分所有肉鸽资源文件 (#5856) 2023-08-06 20:07:41 +08:00
Horror Proton
0d78f38edc 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
7259a58037 fix: 为Resource loader 添加重入锁 2023-05-16 00:54:35 +08:00
Shawn Sun
9a87930970 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
daffa98f90 fix: 修复单例错误引发的资源加载错误 2023-05-02 16:55:30 +08:00
MistEO
7dc0fd348d perf: 修改异步加载资源的方式 2023-05-02 15:16:07 +08:00
MistEO
6bbf2f0bf9 fix: build error 2023-04-29 02:06:56 +08:00
MistEO
b16a14a262 fix: 修复资源加载失败 2023-04-29 02:01:48 +08:00
MistEO
b0844c85a5 fix: 修复资源读取错误，改一点日志 2023-04-29 01:19:33 +08:00
MistEO
3a1ddf14e3 perf: debug模式下检查所有资源加载返回值 2023-04-29 00:25:21 +08:00
MistEO
2246d799f8 perf: 更快的加载！ 2023-04-29 00:13:40 +08:00
MistEO
c63008bb7e perf: 更多的惰性加载！ 2023-04-28 18:45:22 +08:00
MistEO
b3e2c5fe65 feat: OCR 惰性加载 2023-04-28 00:41:32 +08:00
MistEO
5898dfdb9d fix: 资源文件夹不存在时的接口返回值 2023-04-22 05:02:43 +08:00
LingXii
5c8f1b1484 Feat: 新增不期而遇插件，优化招募与战斗策略 (#4241) 
feat: 新增不期而遇插件，优化招募与作战策略
 2023-04-09 20:28:15 +08:00
MistEO
582c05cf4e perf: 尝试优化ocr模型加载过程 2023-04-08 04:07:42 +08:00
MistEO
fcfb05feb0 refactor: 重构地图加载逻辑，改为惰性加载 2023-04-08 01:58:09 +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
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
Yifan Liu
b71edb9477 feat: OCR equivalence class 2023-02-22 00:48:11 -06:00
MistEO
d74c6a8306 fix: 修复头像缓存路径错误 2023-01-13 16:21:36 +08:00