fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 18:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,261 Commits 61 Branches 1,839 Tags
eca2e41c993f8be3bd4e7e48be696896b79c19a6
Commit Graph

69 Commits

Author SHA1 Message Date
status102
eca2e41c99 feat: 自动战斗费用击杀数缓存, 减少性能消耗 (#12879) 
测试条件：待部署1，无技能检测，单个部署等击杀数，不开GPU加速

一场`1-7`的score情况：
- 击杀数未变化
  - 1.0 (1128: 30.87%)
  - 0.99 (2519: 68.94%)
  - 0.98 (5: 0.14%)
  - 0.97 (2: 0.055%)
  - 0.95~0.96 未出现
- 击杀变化
  - 0.94 (1)
  - 0.93 (2)
  - 0.92 (1)
  - 0.86 (1)
  - ...
[asst.log](https://github.com/user-attachments/files/20582872/asst.log)

有缓存：CPU 15~17%

![image](https://github.com/user-attachments/assets/0aa62313-4418-4837-ba0d-c3768aeab04a)


无缓存：CPU 48~52%

![image](https://github.com/user-attachments/assets/b71b838d-089d-4aa0-9e78-23c7d65c52cf)
 2025-06-04 22:05:30 +08:00
晓丶梦丶仁
a0ef939648 fix: RA2 swipe save 2025-06-04 16:30:31 +08:00
status102
9c79a8d09c feat: 自动战斗费用击杀数缓存, 减少性能消耗 2025-06-04 09:56:49 +08:00
status102
f72b834d12 fix: 绿票商店跳过赤金及家具灵茧 
fix #12872
 2025-06-03 20:23:17 +08:00
晓丶梦丶仁
d25ac0990f feat: RA store (#12833) 
* feat: RA store

* feat: 生息演算商店接入刷点数

* fix: 停止方式
 2025-05-31 18:13:14 +08:00
uye
4bac9f6c71 Revert "chore: 还原 RA/Fire.json" 
This reverts commit 38b0742a4a.
 2025-05-28 23:39:07 +08:00
uye
38b0742a4a chore: 还原 RA/Fire.json 2025-05-28 22:35:50 +08:00
Sherkey Asher
515f8b2c5f feat: 模板图允许从子文件夹加载 (#12717) 
* rft: 重构模板图位置

* rft: remove all Fire@Reclamation files

* feat: 支持从子文件夹加载模板

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

* docs: 更新模板加载逻辑文档

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-05-24 23:00:18 +08:00
status102
6a697a7142 perf: Sync OperBoxNameOCR roi to EN 2025-05-23 18:18:11 +08:00
status102
c921eafe48 Revert "fix: OperBox Roi for EN" 
This reverts commit 4abecee9c7.
 2025-05-23 18:18:10 +08:00
status102
4abecee9c7 fix: OperBox Roi for EN 2025-05-23 16:15:08 +08:00
status102
efe817d45a fix: OperBox ROI 更正 
fix #12770
 2025-05-23 15:26:15 +08:00
status102
1679cea5c5 refactor: 干员名识别封装 2025-05-23 15:17:55 +08:00
status102
75012b2252 feat: 自动战斗费用识别缓存, 减少性能消耗 (#12765) 
* feat: 自动战斗费用识别缓存

* refactor: 返回值格式

* chore: 改个名字

* chore: rename

* fix: 改名改着改着改错了

* fix: var init

* perf: 简化返回值

* fix: template

* fix: platform
 2025-05-23 09:02:00 +08:00
status102
aa0eaea4dd fix: 自动编队干员Ocr左侧内缩过度 2025-05-21 11:08:49 +08:00
status102
f6c6fca5ca chore: 修复roi超限 
@Lemon-miaow
 2025-05-21 09:42:32 +08:00
status102
49d4dc78b1 perf: 自动战斗编队优化干员识别, 修复roi未包含完整干员名 (#12740) 
* perf: 自动战斗编队优化干员识别

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

* perf: task

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-05-20 14:31:35 +08:00
status102
21086dcf68 fix: 部分情况下刷理智连战使用AUTO模式时, 吃理智药溢出理智 2025-05-18 19:56:03 +08:00
晓丶梦丶仁
743c51a4b5 fix: 开始行动 点击过快 2025-05-18 18:58:14 +08:00
晓丶梦丶仁
f6788e6029 fix: 开始行动 ocr replace 2025-05-18 18:42:09 +08:00
萨拉托加
66ef1f0836 fix: ocr fix (#12736) 
* fix: ocr fix

* fix: 还原
 2025-05-18 15:24:21 +08:00
github-actions[bot]
0ca0de9663 chore: Auto Update Game Resources - 2025-05-17 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/15085694756

[skip changelog]
 2025-05-17 13:31:06 +00:00
status102
c69ce8ca7a perf: 黄票绿票商店使用特征匹配 2025-05-17 21:21:40 +08:00
status102
9bccb24654 chore: 黄绿票商店任务整理 2025-05-17 21:11:25 +08:00
晓丶梦丶仁
b13e4d022b Revert "perf: 黄票绿票商店使用特征匹配 (#12718)" 
This reverts commit 57888f783e.
 2025-05-17 18:54:29 +08:00
status102
57888f783e perf: 黄票绿票商店使用特征匹配 (#12718) 
* perf: 黄票绿票商店使用特征匹配

* fix: task
 2025-05-16 23:52:45 +08:00
uye
989ba7ee52 chore: 矢量突破开始行动 2025-05-16 01:45:09 +08:00
uye
6104d0602b refactor: 重构干员识别 
fix #12703
 2025-05-15 14:17:53 +08:00
uye
7e7beabb35 chore: 添加几个专精 ocrReplace 2025-05-14 23:39:13 +08:00
晓丶梦丶仁
cd723f2210 perf: store loading 2025-05-14 11:29:21 +08:00
晓丶梦丶仁
93ab1cc811 fix: yellow ticket items 2025-05-14 10:25:51 +08:00
status102
7e3e43e81a fix: ocrTask text 2025-05-13 21:43:07 +08:00
status102
5aa1d74b96 chore: NumberReplace 2025-05-13 19:56:44 +08:00
晓丶梦丶仁
81504417c7 fix: Store@UnderfundedOCR 2025-05-13 11:37:09 +08:00
晓丶梦丶仁
771c3e53b7 i18n: 绿票、黄票、活动商店 (#12674) 
* i18n: en

* i18n: temp

* i18n: jp

* chore: YostarJP buy items

* fix: template task

* fix: en

* i18n: kr

* i18n: tw

---------

Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
 2025-05-13 11:35:54 +08:00
晓丶梦丶仁
5cc7861d5c fix: store underfunded ocr full match 2025-05-13 00:46:51 +08:00
github-actions[bot]
8da46bf991 chore: Auto Update Game Resources - 2025-05-12 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/14973978510

[skip changelog]
 2025-05-12 13:49:04 +00:00
晓丶梦丶仁
26f421418e feat: 绿票、黄票、活动商店 (#12586) 
* feat: 绿票、黄票商店

* i18n: EN fix

* feat: 活动商店

* perf: baseTask

* perf: 非代币关联性模板

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

* perf: baseTask

* chore: sub

* chore: 修改截图

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

* fix: 第一页买完之后无法进行活动商店购买

* fix: 买完皮肤、干员之后的 swipe

* chore: 修改描述

* perf: 购买商品确认next优化

* perf: 模板图复用

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

* perf: 合并部分task

* fix: 代币不足

* fix: 代币不足 ocr

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-05-12 21:45:19 +08:00
status102
25903aba2d fix: 修复外服基建干员选择列表无法重置 (#12652) 
fix #12649
 2025-05-11 18:06:32 +08:00
晓丶梦丶仁
ed2c55e81c fix: 切换账号失败 2025-05-09 15:43:22 +08:00
status102
4a836290b9 perf: 关卡理智识别流程通用化 2025-05-09 10:45:41 +08:00
uye
5cda61f8a6 style: typo 
[skip changelog]
 2025-05-08 17:29:06 +08:00
uye
b37afbaec1 fix: 无法进入活动 2025-05-08 17:28:39 +08:00
status102
966ded3836 fix: 关闭连战列表点击 2025-05-08 10:07:01 +08:00
status102
f184093732 fix: 关闭连战列表 2025-05-08 09:52:25 +08:00
uye
ef844da918 fix: 刷理智结束后卡在“理智药选择”界面 
fix #12601
 2025-05-08 09:40:20 +08:00
status102
29b25079b8 feat(breaking change): 指定次数联动连战, 修复连战导致指定次数失效 (#12592) 
* feat: 指定次数联动连战

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

* perf: 适配指定次数

* fix: 移除不再使用的插件

* perf: 优化回调, 解耦

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

* chore: 剩余理智使用 auto 连战

* fix: 最后一轮

* perf: 移除多余的理智识别

* chore(tools): ignore template

* perf: reduceTimes

* fix: 无药可用时, 升级恢复理智后不选择最高

* perf: 移除不再使用的task

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2025-05-07 23:43:02 +08:00
Yoake
979f6699cc Reapply "feat:实现自适应调整连战次数 (#12555)" 
This reverts commit 7359653317.

移除不相关的文件修改

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-05-06 16:57:04 +08:00
status102
7359653317 Revert "feat:实现自适应调整连战次数 (#12555)" 
This reverts commit 254db83bf6.

Revert "chore: 新增 AUTO 选项"

This reverts commit 722302bc28.

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

This reverts commit 22f88ef718.

Revert "chore: 连战新增 -1 表示禁用切换"

This reverts commit 4debf210bd.
 2025-05-06 16:55:26 +08:00
Yoake
254db83bf6 feat:实现自适应调整连战次数 (#12555) 
* feat:实现自适应调整连战次数

* fix: redundant operation

* fix: 掉落物回报、理智回报失效

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

* fix: typo

* feat: 添加无理智药时的识别

* chore: 删除无用 include

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

* chore: 异常时返回 -1

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-05-05 15:07:38 +08:00