fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,939 Commits 61 Branches 1,837 Tags
424b910b50cd45139bab2cf1508231663d24fce8
Commit Graph

1889 Commits

Author SHA1 Message Date
status102
e869e6e7d7 perf: 开始唤醒增加资源更新Ocr (#10680) 
* perf: 开始唤醒增加资源更新Ocr

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

* docs: unexpected change

* 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-24 16:47:53 +08:00
Weiyou Wang
6b9c20d346 fix: 降低 Tales@RA@LeaveCurrentZone 任务的 templThreshold (#10658) 
fix: decrease template match score threshold for task <Tales@RA@LeaveCurrentZone>
 2024-09-22 19:40:46 +08:00
uye
36f12c31ed perf: 优化 RecognizerViewModel (#10641) 
* perf: 优化 RecognizerViewModel

删除多余变量，避免大量内存重复申请

* perf: 优化 peep 逻辑

* chore: 优化异步截图

* perf: 移除不必要的任务调用

* perf: 优化截图

* chore: stream 使用 using

* chore: TestLinkAndGetImage 改用 AsstGetFreshImageAsync

* refactor: 提取 peep 页面，允许自定义触发器间隔

* chore: 添加 PeepInterval 最小值

* chore: 避免重复订阅事件

* chore: _peepImageTimer 改用 System.Timers.Timer

* refactor: PeepInterval 改为 PeepTargetFps

* fix: 截图时间过长时导致队列阻塞无法停止观测

* perf: 增加截图任务并发限制

* chore: 调整变量名

说起来真有人能截图截到 Int.Max 吗

* chore: 调整初始分配线程数

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-09-21 22:53:19 +08:00
uye
e25a99867f chore: ss-open 使用 StageSideStory.png 2024-09-20 19:09:58 +08:00
Daydreamer514
9efc59d9c5 perf: tasks.json 十四章内容补充 (#10644) 2024-09-20 10:13:54 +08:00
Sherkey
6e63d73e9d feat: CV-4 navigation 2024-09-20 10:13:26 +08:00
uye
2829455fa2 feat: capture fresh image (#10460) 
* feat: 使用 AsstAsyncScreencap 的实时截图

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>

* feat: 增加空阻塞任务以便调试

* chore: 增加帧率显示

---------

Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
 2024-09-18 00:41:30 +08:00
Weiyou Wang
7110f093f5 fix: 修正生息演算滑动参数，为离开区域节点相关任务添加回滚 (#10556) 
* fix: adjust swipe parameters of task "Tales@RA@PIS-ClickTool"

* fix: 为离开区域节点相关任务添加回滚

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

* fix: 为 NextDay 加入回滚机制

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-09-12 11:22:09 +10:00
Manicsteiner
1e6cf01aa5 feat: new theme for txwy (#10566) 2024-09-09 18:20:24 +01:00
Manicsteiner
fc187b1028 fix: Reclamation scroll down (#10554) 2024-09-09 09:32:44 +08:00
github-actions[bot]
a28d1ad06e chore: Auto Update Game Resources - 2024-09-08 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/10758987058

[skip changelog]
 2024-09-08 10:05:15 +00:00
Weiyou Wang
a2b322c575 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
Manicsteiner
35c93ba344 fix: Reclamation for Yostar servers (#10498) 
* fix: Reclamation for Yostar servers

* chore: add more ocr replace
 2024-09-06 13:19:36 +08:00
晓丶梦丶仁
615d2f5ff5 fix: cn char ocr replace 添加phonoR-0 (#10479) 2024-09-05 14:38:20 +01:00
晓丶梦丶仁
602cdf3564 fix: 生息演算将"Tales@RA@FinishCalc"的roi回退到第二次refactor前 (#10482) 2024-09-05 16:06:27 +08:00
晓丶梦丶仁
b48e78a75b fix: CharsNameOcrReplace添加"宝箱的肉？" (#10459) 2024-09-04 19:42:22 +08:00
uye
ebfd1bfce4 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
uye
2c60bc0003 fix: 生息演算无法循环 2024-09-04 17:51:04 +08:00
github-actions[bot]
80423a2f75 chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 15:41:41 +00:00
uye
54efea5ba6 feat: SideStory「泰拉饭」 2024-09-02 23:39:07 +08:00
Sherkey
4ac8fe036b 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]
e30e6ea0e9 chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 05:02:10 +00:00
uye
f1c96db7f4 feat: 生息演算模式 1 道具组装任务链插件化 (#10411) 2024-09-02 12:50:36 +08:00
Sherkey
b6bfda0237 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
Weiyou Wang
8e33919a60 fix: Tales@RA@PIS-ResourceGained 2024-09-01 20:16:12 +10:00
Manicsteiner
1c0b4b06e0 fix: Reclamation for YostarJP (#10414) 2024-09-01 14:45:12 +08:00
Weiyou Wang
070d1d1399 feat: ReclamationCraftTaskPlugin 2024-08-31 23:38:48 +10:00
Weiyou Wang
df43b93b27 refactor: 合成 -> 组装 2024-08-31 19:14:13 +10:00
uye
f1fded1472 fix: 萨卡兹肉鸽多选招募券模板错误 
fix #10401
 2024-08-31 00:19:10 +08:00
github-actions[bot]
5ea2c87381 chore: Auto Update Game Resources - 2024-08-27 
[skip changelog]
 2024-08-27 23:41:27 +00:00
Weiyou Wang
72f06f469a 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
cfd9979433 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
萨拉托加
8014831b4e chore: 保全作业添加玉门市集并优化交战荒野 (#10375) 
* chore: 保全作业添加玉门市集并优化交战荒野

* chore: Delete resource/copilot/SSS_交战荒野-维什戴尔-澄闪-浊蒂-纯烬艾雅法拉兼容应急.json

* 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-27 12:00:32 +08:00
Constrat
3ec3ed3c14 fix(Roguelike): insert delay after SquadConfirm 
enhanced screenshot is too fast
 2024-08-26 15:37:49 +02:00
Constrat
ca97a62201 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
status102
6edcadb00e fix: 使用匹配后偏移代替每日任务 2024-08-26 10:42:31 +01:00
Horror Proton
ba4a36086c 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]
a2619d965a chore: Auto Update Game Resources - 2024-08-24 
[skip changelog]
 2024-08-24 16:01:45 +00:00
晓丶梦丶仁
ca8637623e 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
晓丶梦丶仁
20dc830117 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
晓丶梦丶仁
6e9d78907a fix: 生息演算2"Reclamation2StageEnter"->next纠正 (#10353) 
fix: 重构的时候写错next了

[skip changelog]
 2024-08-24 15:53:23 +08:00
Constrat
13972cd41c fix: add delay after selecting clue 2024-08-23 22:34:21 +02:00
uye
fda4b0360d fix: roi 错误 2024-08-22 21:16:55 +08:00
uye
d7c4188c82 fix: SL 导航错误 2024-08-22 21:13:14 +08:00
github-actions[bot]
db84f4dfc3 chore: Auto Update Game Resources - 2024-08-20 
[skip changelog]
 2024-08-20 00:59:54 +00:00
Weiyou Wang
3e8a2319a2 chore: 整理 tasks.json 中记录的肉鸽插件参数 (#10290) 
* refactor: 整理 tasks.json 中记录的肉鸽插件参数

* chore: delete unused roi fields
 2024-08-20 10:32:44 +10:00
SherkeyXD
fd62b5818a chore: 移除tasks中的默认值 2024-08-19 14:02:11 +08:00
Loong
f23d41d526 fix: 去除干员 OCR 识别结果中的前导下划线 (#10280) 
* fix: 去除干员 OCR 识别结果中的前导下划线

* fix: make sure at least one character following the underscore

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2024-08-18 22:52:37 +02:00
status102
787409be23 fix: 截图速度过快时可能卡在公招放弃界面 2024-08-18 20:33:51 +08:00
uye
de30a7c53d fix: 生息演算可能无法退出组装台 2024-08-18 14:53:29 +08:00