fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,189 Commits 60 Branches 1,840 Tags
8bc6dc9bb96a00a4b8fcec0a6a8abfc9f11d23bb
Commit Graph

593 Commits

Author SHA1 Message Date
uye
dee8df8f78 feat: b服支持多分辨率多 dpi 登录 (#10817) 
* feat: b服支持多分辨率多 dpi 登录

* chore: 调整 b 服 AccountCurrentOCRBili 识别范围

* chore: 删除 UI 多余显示

* chore: 删除多余图片
 2024-10-17 13:52:30 +08:00
github-actions[bot]
7c617ec62c chore: Auto Update Game Resources - 2024-10-16 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11362411676/job/update-game-resources

[skip changelog]
 2024-10-16 09:06:11 +00:00
github-actions[bot]
f445e26b73 chore: Auto Update Game Resources - 2024-10-09 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11247083202

[skip changelog]
 2024-10-09 02:27:12 +00:00
github-actions[bot]
df21dcb201 chore: Auto Templates Optimization 
[skip changelog]
 2024-10-02 06:29:42 +00:00
uye
73bf9f4e21 chore: 优化编队模板图片，识别不到对应职业图标时在 全部 中寻找 2024-10-02 14:29:13 +08:00
github-actions[bot]
e6102b579e chore: Auto Templates Optimization 
[skip changelog]
 2024-09-29 09:01:38 +00:00
uye
2d214bb3ea fix: 自动编队偶现无法匹配职业图标 2024-09-29 17:01:11 +08:00
github-actions[bot]
3fcff1f09d chore: Auto Templates Optimization 
[skip changelog]
 2024-09-28 16:42:38 +00:00
Weiyou Wang
7ab323d3dd feat: 为战斗界面识别模块添加部署费用左侧图标的识别 (#10702) 
* feat: 为战斗界面识别模块添加部署费用左侧图标的识别

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-09-29 00:42:19 +08:00
github-actions[bot]
30310ca40a chore: Auto Templates Optimization 
[skip changelog]
 2024-09-27 10:11:53 +00:00
pre-commit-ci[bot]
b5a93c5f9f chore: Auto update by pre-commit hooks [skip changelog] 2024-09-27 12:11:31 +02:00
github-actions[bot]
90f9ba7e9e chore: Auto Update Game Resources - 2024-09-27 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/11067735736

[skip changelog]
 2024-09-27 09:03:55 +00:00
uye
ebe7c808d5 chore: ss-open 使用 StageSideStory.png 2024-09-20 19:09:58 +08:00
uye
07129479a8 perf: 公招识别得分较低 
fix #10513
 2024-09-09 20:40:18 +08:00
github-actions[bot]
b1c607518c chore: Auto Update Game Resources - 2024-09-09 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10770032581

[skip changelog]
 2024-09-09 09:08:15 +00:00
github-actions[bot]
927ab19e3e chore: Auto Templates Optimization 
[skip changelog]
 2024-09-08 09:56:45 +00:00
Weiyou Wang
79b024ecfb fix: 修复生息演算任务中的若干问题 (#10464) 
* fix: 修复生息演算无存档刷点模式下队伍中有 1-6 名干员时卡住的 bug

* fix: 添加 <等待直到识别到左下角驻扎地图标> 的任务以增加容错率

* fix: 之前做的 <确认地图视图已重置到原始位置> 的机制没起效

* fix: 防止因加载时间太长而卡住

* fix: 缩小 tool 识别 roi

* fix: 调整下滑动距离和参数

* fix: 在点击 <开始行动> 前确认已点击区域节点

* feat: 从主界面导航到生息演算

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

* fix: 补上CloseAnnos#next

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

* fix: 增加 <众人会聚之地> 节点点击判定

* doc: 对文档中生息演算任务名和 theme 参数的描述进行纠正

* fix: 加个 preDelay 防止卡住

* fix: 导航没加 theme 无法从 todo list 进入

* chore: 为导航相关 task 国际服 placeholder

* chore: global adaptation for EN

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

* chore: global adaptation for JP

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

* chore: fill in missing tasks requiring global adaptation

* fix: 为每个 "Tales@RA@StartToday" 派生 task 添加回滚

* chore: global adaptation for KR

* chore: update template for JP

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-09-08 19:56:13 +10:00
uye
b39678faad fix: 界面更新后悖论模拟无法开始战斗 (#10439) 
* fix: 界面更新后悖论模拟无法开始战斗

* chore(docs): change clarification

* chore: 使用 HSV 匹配

* docs: task update info

* fix: 外服 method 错误

---------

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>
 2024-09-04 17:58:21 +08:00
github-actions[bot]
b88de666f1 chore: Auto Templates Optimization 
[skip changelog]
 2024-09-02 15:16:34 +00:00
Sherkey
df285b9a66 feat: 适配「滋味」界面主题 (#10427) 
* feat: 适配「滋味」界面主题

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

* chore(tools): new theme temp ignore

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2024-09-02 16:16:07 +01:00
github-actions[bot]
ba93f8c8e9 chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 03:28:16 +00:00
uye
5349fe0635 fix: sarkaz 仓库识别错误 2024-09-01 23:52:18 +08:00
github-actions[bot]
0ecaaa5400 chore: Auto Templates Optimization 
[skip changelog]
 2024-09-01 15:39:21 +00:00
Sherkey
022fcc2b13 feat: 适配「词祭」界面主题 (#10331) 
* feat: 适配萨卡兹界面主题

* chore: 更新 GetImageFromROI 工具组

* perf: Mall 从 OCR 切换为模板匹配

* fix: smoke testing missing algorithm

* fix: template name consistency

* feat: EN templates

* fix: remove Mall task from global
!!! NEED TEMPLATES !!!
smoke testing

* chore: YostarJP mall template

* chore: YostarKR mall template

* chore: txwy mall template
---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
 2024-09-01 23:38:49 +08:00
uye
af9dd71b30 fix: 萨卡兹肉鸽多选招募券模板错误 
fix #10401
 2024-08-31 00:19:10 +08:00
github-actions[bot]
d1fad4efd4 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-27 23:26:18 +00:00
Weiyou Wang
cdd4c4c78e refactor: 重构生息演算 (#10356) 
* refactor: 调整 tasks.json 中部分 doc field 格式

* feat: ReclamationConfig

* refactor: ReclamationTask

* refactor: template <Tales@Reclamation@ProsperityNoSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityNoSave>

* refactor: template <Tales@Reclamation@ProsperityInSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityInSave>

* refactor: 生息点数达到上限后停止任务

* refactor: global adaption

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

* chore: YostarKR CancelEnterBuildMode

* fix: typo in MaaCore.vcxproj

* refactor: Wpf Gui Support (still under progress)

* refactor: practice of template tasks

* refactor: strategy -> mode; mode -> difficulty

* refactor: WpfGui strategy -> mode; mode -> difficulty

* refactor: Tales@Reclamation -> Tales@RA

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

* refactor: simplify task names

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

* feat: 如果当前编队规模大于等于7人则清空当前编队

* refactor: 简化部分任务流

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

* feat: 跳过可能的对话事件

* fix: 修复部分任务流

* fix: add ocrReplace for JP "Tales@RA@ClickShrubberyGalore"

* fix: 加个 delay 防卡顿

* fix: enlarge roi

* feat: 加入日文适配

* fix: 部分任务 guard 通过后操作不一定马上起效，delay 未知，加入特殊处理

* refactor: 任务链描述

* fix: fix wrong task name

* fix: Yostar Confirmation window

* i18n: tweak YostarKR

* fix: enlarge roi for robustness

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-28 09:25:54 +10:00
Constrat
465f49fbe4 perf: duplicates templates from I.S. (#10376) 
* perf: remove duplicate templates

* chore(tools): update ignore templates

* fix: more IS EN trader regex
 2024-08-27 12:24:18 +02:00
github-actions[bot]
dcf9f0ffe1 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-26 13:06:53 +00:00
Constrat
cc9e3a516c fix: add second skill template (#10377) 
* fix: add second skill template

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

* chore: increase score requirement

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-26 15:06:31 +02:00
github-actions[bot]
64eb5536e1 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-25 13:31:52 +00:00
Horror Proton
fcf5bb696c feat: 使用变换后的图像进行技能按钮识别 (#10293) 
* feat: use `cv::warpPerspective` in `use_skill`

* chore: remove unused reclamation task info

* chore: Auto update by pre-commit hooks 

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-25 21:31:34 +08:00
github-actions[bot]
9b80ba96c7 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-24 15:59:15 +00:00
晓丶梦丶仁
2afb29191a feat: 生息演算2刷开局清空编队干员 (#10359) 
* feat: 生息演算2清空编队干员


* perf: 缩小模板图片以避免可能的外服适配

* fix: 把兜底糊完整

* docs: 修改描述

* docs: 修改描述


* feat: 适配日服

* feat: 适配韩服

* feat: 适配EN服

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-24 23:58:52 +08:00
晓丶梦丶仁
5a66f65287 perf: 生息演算2将第四日开启今日的识别改为模板匹配 (#10355) 
* perf: 生息演算2将第四日开启今日的识别改为模板匹配

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-24 15:56:24 +08:00
github-actions[bot]
62eae0ad59 chore: Auto Update Game Resources - 2024-08-22 
[skip changelog]
 2024-08-22 09:03:23 +00:00
晓丶梦丶仁
0c774de473 refactor: 允许在生息演算内任意位置开始任务，进出关卡、跳过天数任务复用 (#10238) 
* refactor: 允许用户在不同位置开始生息演算任务

* refactor: 重命名图片，任务复用test

* fix: 国服任务名修改

* refactor: 外服任务名替换

* refactor: 给EN服添上继续探索

* refactor: 复用进出关卡、跳过天数，并适配外服

* i18n: Complete "Reclamation2BeginContinue" for KR

* fix: 任务名(为侯国玉)

* fix: 缩小roi，调整开始任务顺序

* fix: 增强开始任务稳定性
 2024-08-14 03:43:00 +08:00
晓丶梦丶仁
e07baaafec refactor: 将生息演算：沙洲遗闻由任务树重构为任务环，以便使用出口、后续重构 (#10223) (#10229) (#10230) 
* refactor!: 将生息演算：沙洲遗闻由任务树重构为任务环，以便使用出口、后续重构 (#10229)

* style: 删除RA2Ex以免混淆视线且方便revert

* refactor: 重构begin模块

* refactor: 重构丰饶灌木林模块

* refactor: 重构聚羽之地模块

* refactor: 完成剩余部分（缺少图片名重构）

* style: 把RA2Ex放回来（同时缺图片和外服适配）

* refactor: 完成英日韩三服任务名转移

* refactor: 替换图片名

* refactor: 新图片名写入任务template

* fix: 补上忘改了的任务名

* fix: 为旧任务更名并允许Ex复用

* fix: 任务名错乱

* fix: 修复模板匹配的空图片名

* fix: 补足落下的任务名

* fix: 韩服任务名打错

* fix: 补齐日服OCR替换

* fix: 补齐韩服OCR替换
 2024-08-13 16:38:35 +08:00
Weiyou Wang
332d067112 refactor: 整理生息演算<沙中之火>的任务流 (#10215) 
* refactor: 为沙中之火的模版文件名加上SandFire前缀

* refactor: 整理生息演算任务顺序，将 Reclamation 放在 Reclamation2 之前

* refactor: 整理沙中之火任务流

* refactor: append SandFire prefix

* fix: 补上隐试生成的任务

* refactor: 为国际服沙中之火的模版文件名加上SandFire前缀

* refactor: 适配国际服

* refactor: SandFire -> Fire

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-12 20:48:40 +10:00
github-actions[bot]
bd346bd578 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-11 11:29:51 +00:00
晓丶梦丶仁
2116fbf347 feat: 生息演算刷满后停止任务 (#10197) 
* feat: 生息演算刷满后停止任务

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

* fix: 修改出口

* fix: 我也不知道我写的什么玩意 revert掉

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

* fix: 用Stop结束任务

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

* perf: 删掉多余图片

* feat: 完成后不删除存档并返回主页面

* chore: Auto update by pre-commit hooks [skip changelog]
 2024-08-11 19:29:33 +08:00
Constrat
9a14f70223 chore: remove unused templates from ResourceUpdater 2024-08-09 15:57:44 +02:00
github-actions[bot]
cdc69eea08 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-09 12:54:38 +00:00
Weiyou Wang
c82aeb0256 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
github-actions[bot]
b557d9f8c6 chore: Auto Update Game Resources - 2024-08-08 
[skip changelog]
 2024-08-08 09:04:16 +00:00
github-actions[bot]
99962c1405 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-03 13:59:34 +00:00
晓丶梦丶仁
d488a5afba fix: 替换合成思绪思绪不足识别模板 (#10063) 
* fix: 替换合成思绪思绪不足识别模板

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-03 21:59:13 +08:00
github-actions[bot]
3134f3d468 chore: Auto Update Game Resources - 2024-08-01 
[skip changelog]
 2024-08-01 10:14:53 +00:00
github-actions[bot]
43f7f1f167 chore: Auto Templates Optimization 
[skip changelog]
 2024-08-01 09:38:07 +00:00
Sherkey
9f6b6f0257 fix: 幸运墙适配夏活 2024-08-01 17:37:47 +08:00