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,796 Commits 61 Branches 1,836 Tags
d862a2fec5eddce815f3d0ec0da072ccfb9492cc
Commit Graph

12796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weiyou Wang
d862a2fec5 fix: Tales@RA@PIS-ResourceGained 2024-09-01 20:16:12 +10:00
Weiyou Wang
4d824d08af feat: 加入hold模式 2024-09-01 20:11:47 +10:00
Weiyou Wang
6569089abb feat: ReclamationCraftTaskPlugin 2024-08-31 23:38:48 +10:00
Weiyou Wang
950961a089 feat: AbstractReclamationTaskPlugin 2024-08-31 21:58:50 +10:00
Weiyou Wang
5a10df22d3 feat: 生息演算新参数: num_craft_batches 2024-08-31 21:58:50 +10:00
Weiyou Wang
8aa9b63306 refactor: 顺带补上缺失的 Roguelike\Sami filter 并修正注释 2024-08-31 19:30:53 +10:00
Weiyou Wang
872b400bec refactor: 把 Fire@Reclamation 的插件移入 Deprecated 文件夹 2024-08-31 19:30:52 +10:00
Weiyou Wang
1608136bea refactor: 合成 -> 组装 2024-08-31 19:14:13 +10:00
Weiyou Wang
fdb9f7e295 refactor: Within The Sand -> Within the Sand 2024-08-31 19:14:13 +10:00
uye
d869103497 ci: Update issue-checker.yml 
[skip changelog]
 2024-08-31 14:36:19 +08:00
uye
f40ba2e58f chore: 生息演算添加沙中之火选择项 alpha/v5.6.0-beta.1.d129.gf40ba2e58 2024-08-31 10:07:21 +08:00
uye
17cb0ae3e4 fix: 生息演算主题读取配置错误 2024-08-31 09:45:18 +08:00
uye
af9dd71b30 fix: 萨卡兹肉鸽多选招募券模板错误 
fix #10401
 2024-08-31 00:19:10 +08:00
status102
4c6deb571a perf: Mumu截图增强路径清空时不再检查路径是否存在 alpha/v5.6.0-beta.1.d126.g4c6deb571 2024-08-29 20:20:36 +08:00
zzyyyl
e13f4611d1 feat!: 更新保全 strategies 逻辑 (#10314) 
* feat: 保全策略更新

* docs: 修改保全文档对 strategies 的描述

* style: format

[skip changelog]

* feat: 无可用工具人且无 core 时允许检查同一格的后续策略

* style: format

[skip changelog]

* feat: 不再检查干员是否暴毙

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

* fix: 修复m_all_cores可能插入空core名字导致保全战斗主要部署逻辑结束后仍然识别待部署区

* fix: var reset

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-29 19:53:52 +08:00
status102
6dcb77f168 refactor: 迁移公告相关配置 (#10399) 
* refactor: 迁移公告相关配置

* style: format

* fix: config save

* chore: remove using
 2024-08-29 19:53:32 +08:00
uye
5872d6606e ci: pre-commit-ci 不开心 
[skip changelog]
 2024-08-29 15:31:30 +08:00
uye
5875de69aa chore: 第一次启动时默认不勾选肉鸽和生息演算 2024-08-29 14:17:04 +08:00
uye
9a1f59206d style: 格式化 
[skip changelog]
 2024-08-29 14:15:47 +08:00
Weiyou Wang
d5ed0db686 fix: 肉鸽编队检测在未触底时返回 true (#10396) alpha/v5.6.0-beta.1.d120.gd5ed0db68 2024-08-29 11:54:09 +08:00
uye
962dcc3b51 Update issue-checker.yml 
[skip changelog]
 2024-08-29 11:51:48 +08:00
uye
25e409f8d0 ci: Update issue-checker.yml 
[skip changelog]
 2024-08-29 11:42:20 +08:00
uye
f7a4b4bac4 ci: Update issue-checker.yml 
[skip changelog]
 2024-08-29 11:04:52 +08:00
uye
3910bfa0fa ci: Update issue-checker.yml 
[skip changelog]
 2024-08-29 09:47:26 +08:00
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