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
17,020 Commits 61 Branches 1,838 Tags
1a8d7e5a3fef1d2daba87e1e37ef31bbaf4c3659
Commit Graph

345 Commits

Author SHA1 Message Date
MistEO
640eed10e2 refactor: use MaaUtils instead of Utils (#14579) 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-11-02 23:19:38 +08:00
Weiyou Wang
bd983a0048 feat: 界园肉鸽不期而遇实现选项识别 (#14540) 
* feat: RoguelikeEncounterOptionAnalyzer

* feat: 界园肉鸽实验性功能 -- 识别选项数量后调整选项

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

* refactor: 跳过不可用选项

* refactor: 设置初次滑动

* refactor: 给 save_img 日志加点描述

* feat: 加个 get_img 接口，以便于获得合成图

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

* fix: 不是你怎么没有 formatter 啊？

* refactor: 把分析数据存储在插件成员变量内，为未来重构打基础

* refactor: 把不期而遇选项识别结果输出移到插件中，加入 callback

* feat: 无法识别选项文字时保存图片

* refactor: 给 save_img 日志加点描述

* refactor: int -> size_t

* refactor: choose -> select

* refactor: sort functions

refacor: sort functions

* refactor: 用 option_analyzed 来判断是否已经识别过不期而遇选项

* fix: 去掉不必要的参数 theme

* refactor: 给 OCR 配置任务加点东西（大概率没什么用吧）

* refactor: 去掉内部接口中的冗余 sanity check

* feat: 加入 view 控制

* fix: 忘了 callback 不能用 const

* feat: 处理一下 edge case

* feat: 来点 WpfGui Log

* fix: typo

* fix: 一些漏网之鱼

* fix: 再调整下滑动距离

* fix: 什么乱七八糟的

* fix: 什么乱七八糟的

* fix: 方向错了，加点 Log

* fix: 修正长图识别 roi

* fix: 再调整一下 roi

* fix: 所以说不建议再睡眠不好的时候糊屎

* fix: 对不可选选项的模版进行二值化后再 OCR

* fix: 好像得考虑一下通道

* fix: 删掉无用参数

* refactor: 再整理一下代码，减少冗余

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

* fix: 再缩小点 roi

* fix: 加点延迟

* fix: clang-tidy 说这样写

* feat: 把 debug 截图加回来，收工

* docs: 给任务链加点注释

* docs: 给 RoguelikeEncounterOptionAnalyzer 加点注释

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-10-28 20:46:06 +08:00
uye
ed122d8100 feat: 增加纯数色匹配 (#14536) 
* feat: 增加纯数色匹配

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

* chore: 更新 schema

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-10-28 01:41:25 +08:00
Weiyou Wang
795efbcd23 refactor: 将 Copilot ActionType::ResetTimer 更改为更适合的 ResetStopwatch (#14507) 
* refactor: 为 ActionType::ResetTimer 加入中文变种

* refactor: Timer -> Stopwatch
 2025-10-22 22:20:50 +11:00
Weiyou Wang
2c619493f6 feat: 跳过使用未准备好的技能 && 全局计时器 (#13913) 
* feat: skip_if_not_ready

* feat: elapsed_time

* feat: WpfGui log 输出计时器信息

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

* feat: 不默认启用全局计时器

* refactor: 支持 ResetTimer 拼写变种

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-10-20 01:35:37 +11:00
Weiyou Wang
d2587626e0 refactor: 拆出界园岁兽残识地图导航 (#14432) 
* refactor: 舍弃 AbstractRoguelikeMap，拆到 RoguelikeMapConfig 与 RoguelikeBoskyPassageMap

* refactor: 拆出界园岁兽残识地图导航
 2025-10-18 20:15:36 +11:00
travellerse
88713293c2 feat: 添加刷常乐节点策略 (#13868) 
* feat: 支持识别常乐节点的子类型

* perf: 将树洞节点优先级拆到配置里

* refactor: 将界园树洞策略从通用Routing策略中分离出来

* feat: 初步实现刷常乐节点

* feat: 为刷常乐节点功能添加UI

* refactor: 重命名节点类型获取函数

* perf: 优化节点类型的日志输出

* feat: 添加发现目标常乐节点后退出

* i18n: CN常乐节点显示文本

* fix: 修复type2name映射初始化潜在问题

* perf: 添加目标子类型的设置和获取方法

* refactor: 优化优先级节点类型解析逻辑

* feat: 刷常乐节点策略下保存路上的招募券

* i18n: 为其它语言提供占位

* perf: 将新增的本地化键值放到一起

* chore: 调整日志输出中的空格

* perf: 仅在非开局招募时保存招募券

* perf: 保留招募券到达上限时正常招募

* fix: 修复gui日志输出没有使用本地化

* fix: 给界园树洞节点点击加上200ms的前置延时

* perf: 在 RoguelikeRoutingTaskPlugin 中添加运行模式以区分普通地图与界园树洞

* refactor: 优化RoguelikeBoskyPassageMap的单例使用

* feat: 添加界园树洞节点类型wpf输出及其颜色配置

* fix: 不在每次开始肉鸽重置m_target_subtype
 2025-10-17 16:54:30 +11:00
MistEO
6c13efe7e0 feat: use coreml OCR for apple (#14108) 2025-09-16 18:20:10 +08:00
MistEO
216da4bd7c fix: build error of ASST_DEBUG 2025-09-08 21:32:11 +08:00
MistEO
5c0445d3ab refactor: 依赖大更新 (#13908) 
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>
 2025-09-08 21:17:47 +08:00
uye
5d1f054e5b chore: core 删除 cpr 2025-08-28 17:35:23 +08:00
Status102
eeaffe368f feat: 支持一键悖论模拟 (#13893) 
* feat: 支持一键悖论模拟 (#13885)

* feat: 支持一键悖论模拟

* chore: OperParadoxBegin EN

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

* feat: 支持一键悖论模拟

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

* feat: 支持一键悖论模拟

* fix: 更新悖论模拟按钮位置

* feat: 悖论模拟UI资源添加

* fix: 删除xml中被误添加的文件

* feat: 根据关卡类型显示选项

* i18n: 标签翻译

* feat: 修改小提示

* i18n: EN

* chore: zh-tw

* i18n: KR

* i18n: KR 2

Long text breaks the UI :(

* i18n: SSS -> SSS

* feat: 多行 TabControl

* chore: 调整布局

* i18n: JP

* perf: 优化返回流程

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

* chore: 删掉 core 的联网功能

---------

Co-authored-by: 翔宇 战 <1361227324@qq.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: _Burnside <33724737+Burnside999@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>

* fix: 新战斗导航下的悖论模拟

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: 翔宇 战 <1361227324@qq.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: _Burnside <33724737+Burnside999@users.noreply.github.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
 2025-08-28 17:32:32 +08:00
travellerse
58e50c1af9 feat: 适配界园树洞节点 (#13552) 
* feat: 适配界园树洞节点 拾遗 传说

* fix: 修复卡在传说`应“蕴”而生`投钱

* fix: 将"_defaultBoskyPassage"改为"_boskyPassageDefault"  避免被识别为"_default"

* fix: 修复拾遗获得通宝卡住

* fix: 修复树洞内遇到集印概率卡住

* feat: 初步适配`易与`

* fix: 尝试替换一个更清晰的`易与`模板图

* feat: 添加`祸乱`识别，暂时不进入策略

* feat: 添加`故肆` `筹谋`占位

* feat: 添加`常乐`占位及相关事件选项

* feat: 添加`杂疑`和`筹谋`相关事件

* feat: 添加`杂疑`识别

* fix: 替换 `易与` `常乐` 模板图

* feat: 添加 `故肆` `筹谋` `常乐` `杂疑` 到策略

* fix: 将存在遮挡的 `故肆` `筹谋` `常乐` 识别阈值暂时调到0.65

* feat: 适配传说版`传讯`

* fix: 修复 掷地有声 概率识别错误

* fix: 替换 `故肆` 模板图

* fix: 修复传说版 `同心` 选择导致崩溃

* feat: 初步构建界园树洞地图

* fix: 优化 BoskyPassage 配置加载和节点处理逻辑

* fix: 删除passed属性，优化节点获取和日志输出

* fix: 修复因内存错误导致启动自动肉鸽时闪退

* feat: 支持按类型过滤获取节点

* fix: 移除重置函数中的中心节点创建逻辑

* fix: 优化树洞地图参数传递

* fix: 添加缺失的Grey模板图

* fix: 补上遗漏的NodeAnalyze

* fix: 清理没有使用到的树洞节点Task

* fix: 删除界园树洞多余的地图参数和adjacent函数

* fix: 重构pixel_to_grid_coords为成员函数

* fix: 删除多余的RoguelikeBoskyRoutingTaskPlugin.h引用
 2025-08-16 19:43:13 +08:00
Status102
24a92b4a01 refactor: 合并ocrBinThreshold (#13635) 2025-08-11 12:12:41 +02:00
uye
dd6c35fd92 rft: 增加企鹅物流 .cn 备用域名，迁移上报逻辑到 UI 层 (#13602) 
* chore: 企鹅物流上报添加 .cn 域名

* rft: 将企鹅物流的上报交给 ui 处理

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

* chore: 上报移除 cpr version

* docs: 添加对应文档

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

* chore: 获取新 id

* chore: 提取链接

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-08-09 22:48:38 +08:00
pre-commit-ci[bot]
4cf1d3c9fa chore: Auto update by pre-commit hooks [skip changelog] 2025-08-01 13:05:14 +00:00
uye
92bd4690cd feat: PipelineAnalyzer 支持使用灰度图匹配文字 2025-08-01 21:02:19 +08:00
uye
a1c491cf37 feat: ocr 任务暴露灰度阈值接口 2025-07-27 01:01:39 +08:00
uye
438304a7e4 feat: 添加选项 fallback 2025-07-27 01:01:39 +08:00
Weiyou Wang
c9f5cb6eff feat: node templates 2025-07-27 01:01:39 +08:00
status102
76921e4134 fix: wpf TaskApi加载cache时缓存文件不存在 2025-07-21 00:15:05 +08:00
uye
e7d02e4969 feat: 肉鸽支持多级事件选择 2025-07-17 20:00:27 +08:00
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
travellerse
d39167007b feat: 支持编队添加干员时选择模组 (#12811) 
* feat: 支持编队添加干员时选择模组

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

* feat: 更新模组编号和本地化字符串以支持新模组

* fix: 统一使用激活时的模组字符图像,将识别阈值下降至0.8以识别未激活时的模组字符

* perf: 省略不必要的参数

* perf: 修改模组默认值为`-1: 不修改`

* fix: 修复不使用模组时的点击区域, 使用模板图替换

* fix: roi

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

* perf: 优化部分文本

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

* fix: 选择模组失败时反选干员

* fix: 选择模组失败时继续检查同组其他干员

* perf: 过个Rgb

Co-authored-by: status102<102887808+status102@users.noreply.github.com>

* chore: 不过灰度

* fix: 添加模板图片以匹配y模组字母的两种形式

---------

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>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2025-07-11 23:56:37 +08:00
uye
c0efe8891a fix: 高分辨率下无法进入特定关卡（虽然修了但还是不建议用 2k 4k 2025-06-09 15:44:42 +08:00
status102
964c64576d perf: 自动战斗编队固定优先编入所有干员, 且按照作业顺序 2025-06-06 13:24:55 +08:00
status102
597b8fd818 revert 8fb4b9951f 2025-06-06 13:13:45 +08:00
status102
8fb4b9951f fix: 漏了.jpg 
[skip changelog]
 2025-06-06 13:02:20 +08:00
status102
b6363a7c27 feat: template重复检查 2025-05-28 23:41:51 +08:00
HX3N
804efe51af fix: global templates are not loaded (#12787) 2025-05-25 15:49:31 +08:00
Sherkey Asher
4dac7a3309 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
4ed3946cab fix: FeatureMatch任务无法读取roi 2025-05-16 13:37:40 +08:00
status102
53c2deaf07 feat: ProcessTask支持特征匹配 (#12701) 
* feat: ProcessTask支持特征匹配

* chore: test

* fix: test

* docs: task文档
 2025-05-16 13:13:48 +08: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
status102
1f694ce2c2 perf: move 
[skip changelog]
 2025-04-27 23:42:47 +08:00
status102
d044e79ebc perf: Task加载检查前重复任务 2025-04-27 23:36:55 +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
Constrat
ce07e061e9 style: precommit clang? 2025-04-20 11:26:52 +02:00
Constrat
995af0fcda ci: bump oxi, clang, prettier, markdownlint (#12388) 
* ci: bump oxi, clang, prettier, markdownlint

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

* chore: 移除不再使用clang-format的JSON文件

* chore: clang-format disable

* chore: clang版本更新

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

* chore: ver注释

* docs: Modify the clang-format version restriction in the documentation to match the current changes

@zzyyyl

---------

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>
 2025-04-20 09:42:41 +08:00
uye
869816af70 feat: LoadResourceAndCheckRet 额外读取对应文件名_custom.json (#12382) 
* feat: LoadResourceAndCheckRet 额外读取对应文件名_custom.json

* chore: 添加日志，问题反馈打包带上custom文件
 2025-04-19 12:16:05 +08:00
Aliothmoon
76e41e30e2 feat: 调整按钮阴影 (#12398) 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-04-19 00:14:23 +08:00
Constrat
f33fcc4ce5 style: clang mass formatting 2025-04-17 09:32:58 +02:00
status102
b9f663180f perf(core): 自动战斗开始前仅移除相似的召唤物头像缓存 2025-03-14 15:05:40 +08:00
status102
a3c68c74e9 chore: TaskData增加OcrTask的ocrReplace合法性检查 (#11878) 
* chore: TaskData增加OcrTask的ocrReplace合法性检查

* docs: 加点注释
 2025-02-17 09:25:44 +08:00
status102
76bb116e5d rft: 使用RecruitData代替ocrReplace的外服适配 (#11879) 
* rft: use RecruitData instead of ocrReplace

* chore: tasks.json

* docs: 注释

* i18n: txwy tweak

* perf: 加载资源时缓存客户端对应语言的招募tag集

---------

Co-authored-by: momomochi987 <as99us301@gmail.com>
 2025-02-17 09:14:27 +08:00
status102
7ef60642c7 revert: 4481710605 2025-02-14 09:49:41 +08:00