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
12,829 Commits 60 Branches 1,840 Tags
bbfbf96b83bec79f38ff600d8dec47b4b598a7ab
Commit Graph

4174 Commits

Author SHA1 Message Date
HX3N
bbfbf96b83 chore: YostarKR CR stage navigation 2024-09-02 12:47:04 +01:00
github-actions[bot]
39d0ad576e chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 08:27:58 +00:00
github-actions[bot]
ac6944dbae chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 05:02:10 +00:00
uye
42b773f219 feat: 生息演算模式 1 道具组装任务链插件化 (#10411) 2024-09-02 12:50:36 +08:00
github-actions[bot]
4dfc4dc3c6 chore: Auto Update Game Resources - 2024-09-02 
[skip changelog]
 2024-09-02 04:02:01 +00: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
Weiyou Wang
d862a2fec5 fix: Tales@RA@PIS-ResourceGained 2024-09-01 20:16:12 +10:00
晓丶梦丶仁
69e7b399b6 perf: 全肉鸽招募适配娜仁图亚、艾拉 (#10385) 
* perf: 全肉鸽招募适配娜仁图亚、艾拉

fix #10382

* changes to skill

* Update recruitment.json

* Update recruitment.json

* feat:rebase

* feat:rebase

* fix:error

* feat:rebase

---------

Co-authored-by: 梁星逢 <qswl5959@gmail.com>
 2024-09-01 16:50:19 +08:00
Manicsteiner
9273cf6abe fix: Reclamation for YostarJP (#10414) 2024-09-01 14:45:12 +08:00
github-actions[bot]
f65210ed93 chore: Auto Update Game Resources - 2024-08-31 
[skip changelog]
 2024-08-31 20:25:23 +00:00
Weiyou Wang
6569089abb feat: ReclamationCraftTaskPlugin 2024-08-31 23:38:48 +10:00
github-actions[bot]
881e46f499 chore: Auto Update Game Resources - 2024-08-31 
[skip changelog]
 2024-08-31 11:23:36 +00:00
Weiyou Wang
1608136bea refactor: 合成 -> 组装 2024-08-31 19:14:13 +10:00
uye
af9dd71b30 fix: 萨卡兹肉鸽多选招募券模板错误 
fix #10401
 2024-08-31 00:19:10 +08:00
github-actions[bot]
14f25c8638 chore: Auto Update Game Resources - 2024-08-27 
[skip changelog]
 2024-08-27 23:41:27 +00: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
萨拉托加
d141db3680 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
49e74fa293 fix(Roguelike): insert delay after SquadConfirm 
enhanced screenshot is too fast
 2024-08-26 15:37:49 +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
Constrat
77de769213 fix: EN IS Trader Regex 
[skip changelog]
 2024-08-26 14:57:54 +02:00
status102
ee9c1f38ba fix: 使用匹配后偏移代替每日任务 2024-08-26 10:42:31 +01: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]
bdfc1f139c chore: Auto Update Game Resources - 2024-08-24 
[skip changelog]
 2024-08-24 16:01:45 +00: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
晓丶梦丶仁
d929b433db fix: add ocrReplace for JP "Reclamation2CopiousCoppice" (#10362) 2024-08-24 22:34:08 +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
晓丶梦丶仁
a04269bdcb fix: 生息演算2"Reclamation2StageEnter"->next纠正 (#10353) 
fix: 重构的时候写错next了

[skip changelog]
 2024-08-24 15:53:23 +08:00
github-actions[bot]
55e8436b5f chore: Auto Templates Optimization 
[skip changelog]
 2024-08-23 20:35:50 +00:00
Constrat
4798f4df06 fix: EN needs templates for clue exchange 
the number font is different, score too low
 2024-08-23 22:34:46 +02:00
Constrat
f7d9856c85 fix: add delay after selecting clue 2024-08-23 22:34:21 +02:00
uye
046b3329ea fix: roi 错误 2024-08-22 21:16:55 +08:00
uye
0fd48d774a fix: SL 导航错误 2024-08-22 21:13:14 +08:00
github-actions[bot]
92d187558e chore: Auto Update Game Resources - 2024-08-22 
[skip changelog]
 2024-08-22 11:22:49 +00:00
ManicSteiner
7c3c5b81d4 chore: YostarJP ocr fix 2024-08-22 10:35:22 +01:00
github-actions[bot]
62eae0ad59 chore: Auto Update Game Resources - 2024-08-22 
[skip changelog]
 2024-08-22 09:03:23 +00:00
github-actions[bot]
ae923d65f9 chore: Auto Update Game Resources - 2024-08-22 
[skip changelog]
 2024-08-22 07:41:29 +00:00
github-actions[bot]
46f5475df0 chore: Auto Update Game Resources - 2024-08-22 
[skip changelog]
 2024-08-22 05:25:17 +00:00
github-actions[bot]
c0eb5a2819 chore: Auto Update Game Resources - 2024-08-21 
[skip changelog]
 2024-08-21 20:25:55 +00:00
github-actions[bot]
3d44d574a2 chore: Auto Update Game Resources - 2024-08-21 
[skip changelog]
 2024-08-21 20:02:03 +00:00
github-actions[bot]
cb87f2f614 chore: Auto Update Game Resources - 2024-08-21 
[skip changelog]
 2024-08-21 17:01:34 +00:00
Constrat
eb70b3ddd2 feat: FC rerun navigation fix EN 2024-08-21 13:50:04 +02:00
github-actions[bot]
8d0e9bb9c0 chore: Auto Update Game Resources - 2024-08-21 
[skip changelog]
 2024-08-21 11:21:35 +00:00