fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,772 Commits 61 Branches 1,836 Tags
20cebf57cd7eb106954c4107f80cfc8a357ecca8
Commit Graph

12772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
20cebf57cd chore: 病毒话术升级了） 
[skip changelog]
 2024-08-29 09:40:44 +08:00
uye
f94b1d2c11 fix: DoDragDrop 拖动操作已在进行中 (#10368) 
fix #10367
 2024-08-29 00:43:35 +08:00
Loong
11c1cdcae8 chore: bump maa-cli to 0.4.12 (#10390) 2024-08-28 21:55:52 +08:00
github-actions[bot]
14f25c8638 chore: Auto Update Game Resources - 2024-08-27 
[skip changelog]
alpha/v5.6.0-beta.1.d112.g14f25c863 		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
github-actions[bot]
808e0d2863 chore: Auto Templates Optimization 
[skip changelog]
alpha/v5.6.0-beta.1.d109.g808e0d286 		2024-08-27 10:25:02 +00: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
uye
75e723a1b4 chore: 调整 check link 提示样式 2024-08-27 17:29:48 +08:00
IzakyL
1199b7de42 chore(issue-checker): 对comment中的未知链接进行提醒 (#10379) 
* chore(issue-checker): bump zzyyyl/issue-checker from 1.9 to 1.10

* chore(issue-checker): 对comment中的未知链接进行提醒

* chore: 修改正则表达式

* chore: 修改正则表达式

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-08-27 17:17:56 +08: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
dependabot[bot]
43ec787767 ci: bump zzyyyl/issue-checker 
Bumps the github-actions group in /.github/workflows with 1 update: [zzyyyl/issue-checker](https://github.com/zzyyyl/issue-checker).


Updates `zzyyyl/issue-checker` from 1.9 to 1.10
- [Release notes](https://github.com/zzyyyl/issue-checker/releases)
- [Commits](https://github.com/zzyyyl/issue-checker/compare/v1.9...v1.10)

---
updated-dependencies:
- dependency-name: zzyyyl/issue-checker
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-08-26 15:14:04 +01: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]
alpha/v5.6.0-beta.1.d102.gdcf9f0ffe 		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>
alpha/v5.6.0-beta.1.d101.gcc9e3a516 		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
Constrat
eccc5e08f8 chore(tools): update ignore templates 2024-08-26 11:58:59 +02:00
status102
ee9c1f38ba fix: 使用匹配后偏移代替每日任务 alpha/v5.6.0-beta.1.d098.gee9c1f38b 2024-08-26 10:42:31 +01:00
status102
21c33e68ea chore: ignore MaaDeps (#10371) 
[skip changelog]
 2024-08-26 10:45:55 +08:00
uye
b03e5a56e9 perf: 优化外部通知界面显示 (#10363) 
* perf: 优化外部通知界面显示

* chore: TextBlock warp
 2024-08-26 00:13:32 +08:00
uye
de26d22f79 refactor: 获取任务端口无效时不进行轮询 (#10321) 2024-08-26 00:10:56 +08:00
Rbqwow
75c82df749 chore: 更新 bug issue 模板 (#10357) 
* chore: 更新 bug issue 模板

* chore: review
 2024-08-25 22:26:14 +08: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
dantmnf
e227d71813 chore: use CsWin32 source generator instead of random pinvoke library (#10361) 
* chore: use CsWin32 source generator instead of random pinvoke library

* fix: use local D3D12CreateDevice definition
 2024-08-25 19:46:32 +08:00
github-actions[bot]
bdfc1f139c chore: Auto Update Game Resources - 2024-08-24 
[skip changelog]
alpha/v5.6.0-beta.1.d090.gbdfc1f139 		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
octopus yan
6fe87e4eca feat: add Qmsg notification (#10358) 
* feat: add Qmsg notification (#9078)

* fix: Qmsg 配置UI
 2024-08-24 21:46:11 +08:00
uye
8edcf183a5 chore: 删除子模块 2024-08-24 16:16:44 +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
dantmnf
207172b366 chore: remove MaaDeps submodule (#10354) 
still referenced in maadeps-download.py

Co-authored-by: dantmnf <dantmnf@users.noreply.github.com>
 2024-08-24 15:54:04 +08:00
晓丶梦丶仁
a04269bdcb fix: 生息演算2"Reclamation2StageEnter"->next纠正 (#10353) 
fix: 重构的时候写错next了

[skip changelog]
 2024-08-24 15:53:23 +08:00
uye
736b0055d8 fix: 勾选启动MAA后直接最小化后点击隐藏托盘图标后无法显示MAA 2024-08-24 13:46:13 +08:00
MistEO
7888158f1b docs: 贡献者头像添加 105 上限 (#10351) 2024-08-24 11:57:00 +08:00
Constrat
18257c70e7 chore: RoguelikeRoutingTaskPlugin.h missing VS22 filter alpha/v5.6.0-beta.1.d079.g18257c70e 2024-08-23 22:54:16 +02: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
Constrat
5470c313e2 fix(ci): remove "" in nightly 
fix #10308
alpha/v5.6.0-beta.1.d075.g5470c313e 		2024-08-23 13:28:48 +02:00
Constrat
3be685c560 feat: GetLocalizedNames for Infrast and Copilot output (#10335) 
* feat: GetLocalizedNames for Infrast output

* feat: Localization for Copilot steps

* i18n: EN tweak
alpha/v5.6.0-beta.1.d074.g3be685c56 		2024-08-23 12:13:23 +02:00
zzyyyl
ec93472984 chore(issue-checker): bump zzyyyl/issue-checker from 1.8 to 1.9 2024-08-23 15:41:39 +08:00
uye
c8c90c1604 chore: 公招识别拥有全干员时不显示未拥有干员数量 2024-08-23 11:58:46 +08:00
Constrat
89261430cb i18n: EN tweak 
[skip changelog]
 2024-08-23 00:18:47 +02:00
Constrat
971699bcbe fix: c# warning 
[skip changelog]
 2024-08-22 23:56:15 +02:00
uye
046b3329ea fix: roi 错误 alpha/v5.6.0-beta.1.d069.g046b3329e 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