fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,625 Commits 61 Branches 1,839 Tags
8a4bf6ae0c8a0882ffdbad2d6d0cabf1a7fc35fc
Commit Graph

1840 Commits

Author SHA1 Message Date
uye
9f8c3f583d fix: 生息演算可能无法退出组装台 2024-08-18 14:53:29 +08:00
晓丶梦丶仁
58056d0ccb fix: 国服CharsNameOcrReplace (#10269) 
* fix: 国服CharsNameOcrReplace

* fix: 国服OCR替换改进

* fix: 同上

* fix: 麻了
 2024-08-18 01:44:47 +08:00
zzyyyl
653f1c296a fix: 修复 "-MO-" 会被替换为 "-M0-" 导致的关卡识别错误 (#10263) 2024-08-17 23:53:41 +08:00
晓丶梦丶仁
8b31031f8b fix: 国服干员名ocr替换 (#10262) 2024-08-17 16:39:17 +08:00
zzyyyl
84af1ee70e fix: 修复数色闭运算导致的 StageRefresh FP 2024-08-17 01:22:26 +08:00
zzyyyl
92f24ec988 feat!: 拆分 maskRange 与 colorScales；增加 colorWithClose 开关数色时闭运算 2024-08-17 01:22:17 +08:00
zzyyyl
5e0aaecc3e fix: 修复采购中心字被挡住后出错 
fix #10194
 2024-08-15 12:57:24 +08:00
github-actions[bot]
fdbd7a05f0 chore: Auto Update Game Resources - 2024-08-13 
[skip changelog]
 2024-08-13 20:02:11 +00:00
晓丶梦丶仁
0c774de473 refactor: 允许在生息演算内任意位置开始任务，进出关卡、跳过天数任务复用 (#10238) 
* refactor: 允许用户在不同位置开始生息演算任务

* refactor: 重命名图片，任务复用test

* fix: 国服任务名修改

* refactor: 外服任务名替换

* refactor: 给EN服添上继续探索

* refactor: 复用进出关卡、跳过天数，并适配外服

* i18n: Complete "Reclamation2BeginContinue" for KR

* fix: 任务名(为侯国玉)

* fix: 缩小roi，调整开始任务顺序

* fix: 增强开始任务稳定性
 2024-08-14 03:43:00 +08:00
晓丶梦丶仁
366881fe8f refactor: 允许用户在不同位置开始生息演算任务 (#10237) 2024-08-13 22:43:44 +08:00
晓丶梦丶仁
92e477dd45 fix: 傀影肉鸽卡在商店界面 (#10236) 2024-08-13 22:43:23 +08:00
github-actions[bot]
f4f016b407 chore: Auto Update Game Resources - 2024-08-13 
[skip changelog]
 2024-08-13 08:42:53 +00:00
晓丶梦丶仁
e07baaafec refactor: 将生息演算：沙洲遗闻由任务树重构为任务环，以便使用出口、后续重构 (#10223) (#10229) (#10230) 
* refactor!: 将生息演算：沙洲遗闻由任务树重构为任务环，以便使用出口、后续重构 (#10229)

* style: 删除RA2Ex以免混淆视线且方便revert

* refactor: 重构begin模块

* refactor: 重构丰饶灌木林模块

* refactor: 重构聚羽之地模块

* refactor: 完成剩余部分（缺少图片名重构）

* style: 把RA2Ex放回来（同时缺图片和外服适配）

* refactor: 完成英日韩三服任务名转移

* refactor: 替换图片名

* refactor: 新图片名写入任务template

* fix: 补上忘改了的任务名

* fix: 为旧任务更名并允许Ex复用

* fix: 任务名错乱

* fix: 修复模板匹配的空图片名

* fix: 补足落下的任务名

* fix: 韩服任务名打错

* fix: 补齐日服OCR替换

* fix: 补齐韩服OCR替换
 2024-08-13 16:38:35 +08:00
github-actions[bot]
38139b9091 chore: Auto Update Game Resources - 2024-08-12 
[skip changelog]
 2024-08-12 11:23:48 +00:00
Weiyou Wang
bf10bcdaa6 refactor: polish code for collapsal paradigm plugin (#10198) 
* refactor: 复用 LoadingText

* refactor: 删除国际服 tasks.json 中冗余内容

* refactor: 改用 task 实现点击与滑动操作，并为精简后的相关 config task 添加注释
 2024-08-12 21:03:45 +10:00
github-actions[bot]
87cd2f107f chore: Auto Update Game Resources - 2024-08-12 
[skip changelog]
 2024-08-12 11:01:55 +00:00
Weiyou Wang
332d067112 refactor: 整理生息演算<沙中之火>的任务流 (#10215) 
* refactor: 为沙中之火的模版文件名加上SandFire前缀

* refactor: 整理生息演算任务顺序，将 Reclamation 放在 Reclamation2 之前

* refactor: 整理沙中之火任务流

* refactor: append SandFire prefix

* fix: 补上隐试生成的任务

* refactor: 为国际服沙中之火的模版文件名加上SandFire前缀

* refactor: 适配国际服

* refactor: SandFire -> Fire

* 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-12 20:48:40 +10:00
晓丶梦丶仁
4c348d6cf0 fix: 战斗结束掉落过程弹窗 (#10218) 2024-08-12 17:24:55 +08:00
zzyyyl
de8ba8af63 fix: 修复部分设备萨卡兹肉鸽商店 StageTraderEnter 得分过低 
fix #10160
 2024-08-12 12:56:16 +08:00
Constrat
d2ce2399b9 fix: delay between Mall and CreditStoreOcr for refresh lag 2024-08-11 23:41:31 +02:00
Constrat
59ee90dd10 chore: added regex for EX stages (#10211) 
* chore: added regex for EX stages

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

* perf: remove unneccesart regex

* perf: non-greedy quantifier
 2024-08-11 21:34:00 +02:00
github-actions[bot]
0dea692e41 chore: Auto Update Game Resources - 2024-08-11 
[skip changelog]
 2024-08-11 11:41:54 +00:00
晓丶梦丶仁
2116fbf347 feat: 生息演算刷满后停止任务 (#10197) 
* feat: 生息演算刷满后停止任务

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

* fix: 修改出口

* fix: 我也不知道我写的什么玩意 revert掉

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

* fix: 用Stop结束任务

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

* perf: 删掉多余图片

* feat: 完成后不删除存档并返回主页面

* chore: Auto update by pre-commit hooks [skip changelog]
 2024-08-11 19:29:33 +08:00
uye
a61c6130e2 chore: 扩大组装台寻找范围 2024-08-11 19:27:43 +08:00
晓丶梦丶仁
a0bfa4cd48 fix: 在舍弃思绪过程中识别可关闭弹窗 (#10184) 2024-08-11 13:15:05 +08:00
github-actions[bot]
86dfe16551 chore: Auto Update Game Resources - 2024-08-11 
[skip changelog]
 2024-08-11 01:34:44 +00:00
status102
f47020ce7f chore: task name 
[skip changelog]
 2024-08-11 09:17:23 +08:00
晓丶梦丶仁
290d10418c fix: 肉鸽探索失败后执行ClickToStartPointAfterFailed点进讲述者 (#10177) 2024-08-10 10:44:01 +08:00
github-actions[bot]
05ac9c286d chore: Auto Update Game Resources - 2024-08-09 
[skip changelog]
 2024-08-09 13:04:33 +00:00
Weiyou Wang
c82aeb0256 feat: 加入肉鸽节点地图识别功能，并应用于萨卡兹肉鸽蓝图快速过图 (#9812) 
* feat: 添加 RoguelikeMode::FastPass，负责用蓝图分队快速过图

* chore: update templates for RoguelikeMap and RoguelikeRouting

* feat: RoguelikeMap

* feat: RoguelikeMapConfig

* feat: BrightPointAnalyzer

* feat: RoguelikeRouting

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

* fix: 修复会卡在商店门口的bug

* fix: adapt new plugin-registration signature

* chore: try fix submodule

* perf: 复用task

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

* fix: 为函数申明补上定义

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-08-09 22:54:19 +10:00
SherkeyXD
3c40a48ab5 feat: SideStory「太阳甩在身后」二三阶段导航 2024-08-08 20:35:17 +08:00
晓丶梦丶仁
56f4702278 fix: 识别思绪太快导致无法点击驮兽归队 (#10109) 
fix: 识别思绪太快导致无法点击（CloseCollection-Close/Continue)）
 2024-08-08 16:29:38 +08:00
晓丶梦丶仁
d5e4d0efd7 fix: 萨米肉鸽无法正常识别Level name (#10115) 2024-08-07 01:35:48 +08:00
晓丶梦丶仁
880917b64c Revert "chore: 肉鸽继续尝试探索但并不直接放弃" 
This reverts commit 9711111a36.
 2024-08-07 00:53:01 +08:00
晓丶梦丶仁
a0c1904ae9 fix: Stuck after recruit in Trader Stage 
fix #10012
 2024-08-05 13:54:36 +08:00
SherkeyXD
5731c4e0be fix: 修复幸运墙点击次数不定的问题 2024-08-04 21:26:16 +08:00
晓丶梦丶仁
d488a5afba fix: 替换合成思绪思绪不足识别模板 (#10063) 
* 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-03 21:59:13 +08:00
SherkeyXD
1ef2e664f1 fix: 修复幸运墙无法点击三次的问题 2024-08-03 11:07:25 +08:00
SherkeyXD
5f5eccda72 feat: SideStory「太阳甩在身后」导航 2024-08-01 20:19:01 +08:00
Sherkey
9f6b6f0257 fix: 幸运墙适配夏活 2024-08-01 17:37:47 +08:00
zzyyyl
8581db53f9 fix: 修复萨卡兹肉鸽去伪存真节点卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9966#issuecomment-2260174971
 2024-07-31 19:46:32 +08:00
Lancarus
fe7cc5f7b0 feat: 增加一些肉鸽参数 (#9875) 
* feat: 增加一些肉鸽参数

* feat: 根据获得的藏品改变招募优先级

* fix: 重复定义、注释空函数
 2024-07-31 18:43:59 +08:00
zzyyyl
b6a3c61dfe Revert "feat: 印象加深后卡住时截图" 
This reverts commit 3a4fbd0193.

refer to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9966#issuecomment-2255696252
 2024-07-30 19:25:31 +08:00
status102
7fc2531a8c fix: 移除tasks.json中的无效参数 
@Lancarus
 2024-07-29 15:11:33 +08:00
github-actions[bot]
171c5891ec chore: Auto Update Game Resources - 2024-07-29 
[skip changelog]
 2024-07-29 06:04:24 +00:00
晓丶梦丶仁
338e4e40b1 fix: 肉鸽部分范围点击任务点进萨卡兹肉鸽思绪界面 (#9953) 
* fix: 肉鸽旧的范围点击导致意外点开萨卡兹肉鸽思绪界面

* fix: 肉鸽旧的范围点击导致意外点开萨卡兹肉鸽思绪界面

* fix: 删除旧的空模板
 2024-07-29 13:45:10 +08:00
晓丶梦丶仁
e32c6bb2d6 fix: 萨卡兹肉鸽进入新一层识别太快导致先点击思绪后驼兽归队/混沌未来中逃脱 (#9946) 
* 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-07-29 13:44:41 +08:00
uye
9711111a36 chore: 肉鸽继续尝试探索但并不直接放弃 
fix #9897
 2024-07-28 14:12:10 +08:00
zzyyyl
30e59cbdbe fix: 萨卡兹肉鸽命运所指关卡识别使用 HSVCount 避免达不到阈值 2024-07-28 01:23:44 +08:00
zzyyyl
0a2b003fce 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