fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,497 Commits 61 Branches 1,837 Tags
7378ea5f37bf02f9d064c06f062bc61ba2d7f591
Commit Graph

31 Commits

Author SHA1 Message Date
uye
f4cb72aef9 feat: 支持肉鸽选难度 (#10918) 
* feat: 支持肉鸽选难度

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

* refactor: 补充相关机制

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

* feat: 瞎写一个wpf，切系统测试去

* feat: select roguelike difficulty using wpf gui

* fix: 简单修补凹开局密文板功能，等待未来重构

* chore: global adaptation

* refactor: 舍弃 next_difficulty 参数

* refactor: 增加对 RoguelikeMode::Collectible 模式下衍生参数有效性的判定

* rft: 移除run_for_collectible

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

* style: format

* chore: 调整肉鸽等级列表初始化

* perf: 减少不必要判断

* fix: 傀影肉鸽修复潜在的干员招募逻辑错误，并添加难度参数校验

* Revert "fix: 傀影肉鸽修复潜在的干员招募逻辑错误，并添加难度参数校验"

This reverts commit 08b715a8eb.

* perf: 难度参数校验

* Revert "rft: 移除run_for_collectible"

This reverts commit cf170750c5.

# Conflicts:
#	src/MaaCore/Task/Interface/RoguelikeTask.cpp
#	src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp
#	src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalStartTaskPlugin.cpp

* fix: 水烧开是 !get_run_for_collectible()，之前我写错了

* doc: 补充 zh-cn 文档

* doc: 补充其他语言的文档（机翻）

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com>
Co-authored-by: Weiyou Wang <Weiyou.Wang@anu.edu.au>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-10-29 09:08:22 +08:00
晓丶梦丶仁
1439b2663f docs: 更新肉鸽文档 (#10807) 2024-10-21 00:41:11 +08:00
uye
33ebf0bcca docs: 修改文档匹配算法描述错误 2024-10-08 18:40:52 +08:00
晓丶梦丶仁
6834205776 docs: 补充战斗流程协议对 delay 的描述 2024-09-10 13:14:58 +08:00
晓丶梦丶仁
e663111e6f docs: 优化肉鸽文档对 key 干员和 0 希望干员的描述 2024-09-10 13:14:58 +08: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
晓丶梦丶仁
64b12dd342 docs: 肉鸽文档招募 offset 添加默认值描述 (#10552) 2024-09-08 15:32:59 +08:00
uye
e94abc8e7f docs: 添加缺失的生息演算参数 (#10446) 2024-09-03 20:56:04 +08:00
zzyyyl
ec42d503e0 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
zzyyyl
856cc6494d feat!: 拆分 maskRange 与 colorScales；增加 colorWithClose 开关数色时闭运算 2024-08-17 01:22:17 +08:00
Rbqwow
67c10f1982 refactor: StopGame (#9658) 
* perf: StopGame

* style: rename Intent to packageName

* chore: 不准不选择区服

* fix: 移除其他配置中的抽象 stop 匹配

* style: 统一驼峰

* style: 按照执行顺序重新排序

* feat: 添加回调和文档

* fix: 修复参数传入

* docs: 更新文档

* fix: merge

* chore: 把WSA的配置也改了

* chore: update submodule

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Loong <wangl.cc@outlook.com>
 2024-08-11 01:50:30 +08:00
zzyyyl
0aa3d31d95 feat: 删除 action ClickRand (#10003) 2024-08-03 09:35:43 +08:00
Rbqwow
d4c9fb51d7 docs: fix a0bef06 
[skip changelog]
 2024-07-31 04:01:56 +08:00
Lancarus
79da43a932 docs: Update 肉鸽辅助协议.md 2024-07-31 02:52:44 +08:00
Lancarus
a0bef06131 docs: Update 肉鸽辅助协议.md 2024-07-31 02:51:40 +08:00
Rbqwow
5a291123ac docs: fix 75fb962 
[skip changelog]
 2024-07-30 21:39:43 +08:00
Lancarus
75fb9628bd docs: Update integrated-strategy-schema.md 2024-07-30 20:27:19 +08:00
status102
574546cba5 Revert "feat: 战斗流程协议命令块增强 (#9952)" 
This reverts commit 9e6e4fa5c0, reversing
changes made to 78aa0dd40a.
 2024-07-30 17:38:28 +08:00
ValenciaFly
33cdabd2c9 doc: 更新战斗流程协议 2024-07-29 14:41:49 +08:00
zzyyyl
89228d1d6d feat: 删去 CcoeffHSV, HSVCount 时的模板匹配采用 RGB 的 Ccoeff 
CcoeffHSV 有致命缺陷: (0, 0, 0) 与 (179, 0, 0) 应为相似颜色，因为 Hue 是循环的

* feat: HSVCount & RGBCount 的返回结果为点积

为了尽量保证 0.8 的阈值

* workaround: HSVCount & RGBCount 时 maskRange 不再对模板匹配生效

否则数色时的模板匹配结果将不准确，之后可以分开 maskRange 和 colorRange, 后者的格式可以讨论后再做决定
 2024-07-28 01:11:59 +08:00
zzyyyl
4390be57ac docs: 更新 task-schema 文档中对 method 的描述 2024-07-22 14:50:00 +08:00
zzyyyl
49fb5bcf2b feat!: mask_range 支持彩色掩码 (#9818) 2024-07-22 14:42:10 +08:00
zzyyyl
b74809ada6 docs: 更新 task-schema 文档中对 maskRange 的描述 2024-07-22 13:12:18 +08:00
zzyyyl
79f348071e docs: 更新 task-schema.md 文档 2024-07-21 20:48:41 +08:00
zzyyyl
3115ae7ef3 docs: 更新 task-schema 文档 2024-07-20 12:38:17 +08:00
Loong
f2ab4946ce ci: use lychee to check dead links (#9675) 
* ci: use lychee to check dead links

* ci: comment on PR when dead links are found

* docs: fix broken links
 2024-07-17 15:26:17 +01:00
status102
d1586de3d5 docs: 修改Task协议文档，以符合cache默认值 2024-07-14 20:19:50 +08:00
SherkeyXD
d4f0f221cd docs: 跟进肉鸽不期而遇目录重构的文档修改 2024-07-08 13:04:00 +08:00
SherkeyXD
b26ea061a1 refactor: 重构肉鸽不期而遇策略的目录格式 2024-07-08 03:30:24 +08:00
Weiyou Wang
41b50d37a9 docs: 增加关于肉鸽任务刷探索范式功能的说明 2024-07-08 04:29:45 +10:00
uye
67bbf9aac5 refactor: website docs **translation needed** (#9287) 
Co-authored-by: wlwxj <d1ve_wh4le@outlook.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Wallsman <63186641+wallsman@users.noreply.github.com>
Co-authored-by: Loong <wangl.cc@outlook.com>
Co-authored-by: 神代綺凛 <i@loli.best>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
 2024-07-08 01:57:20 +08:00