Skip to content

feat:增加自动刷取基质不领取功能#925

Closed
AmingNN wants to merge 9 commits intoMaaEnd:mainfrom
AmingNN:feat-Essence
Closed

feat:增加自动刷取基质不领取功能#925
AmingNN wants to merge 9 commits intoMaaEnd:mainfrom
AmingNN:feat-Essence

Conversation

@AmingNN
Copy link

@AmingNN AmingNN commented Mar 2, 2026

概述 (Summary)

feat: 增加自动刷取基质不领取功能
fix:修正了识别“激活”状态时被误判为“工业设备”的问题。

关联 Issue

#888, #755

Summary by Sourcery

为可配置的自动精华刷取行为添加可选的跳过领取奖励功能,并调整相关任务预设和流水线。

New Features:

  • 在自动精华流程中,为“领取精华奖励”和“跳过精华奖励”引入单独的流水线。
  • 扩展精华刷取任务预设,以支持在刷取完成后不领取奖励。
  • 更新本地化条目,以涵盖新的自动精华奖励选项。

Bug Fixes:

  • 调整自动精华识别数据,避免将激活状态误判为工业设备。

Enhancements:

  • 优化 AutoEssence 流水线和任务配置,更好地分离刷取逻辑与奖励处理逻辑。
Original summary in English

Summary by Sourcery

Add configurable auto essence farming behavior to optionally skip claiming rewards and adjust related task presets and pipelines.

New Features:

  • Introduce separate pipelines for claiming and skipping essence rewards in the auto essence flow.
  • Extend essence farming task presets to support not claiming rewards after farming.
  • Update localization entries to cover the new auto essence reward options.

Bug Fixes:

  • Adjust auto essence recognition data to avoid misclassifying the activation state as industrial equipment.

Enhancements:

  • Refine the AutoEssence pipeline and task configuration to better separate farming and reward-handling logic.

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry @AmingNN, your pull request is larger than the review limit of 150000 diff characters

@MistEO MistEO changed the base branch from feat/RunNodeAction to main March 2, 2026 14:34
@MistEO MistEO marked this pull request as draft March 2, 2026 14:55
AmingNN added 7 commits March 2, 2026 23:23
没按下alt键的问题
修复会识别到设备,重构领取逻辑代码到新文件
更改循环模式,更改领取流程位置
同时回退之前的识别方式
@AmingNN AmingNN changed the title Feat essence feat:增加自动刷取基质不领取功能 Mar 2, 2026
@AmingNN AmingNN marked this pull request as ready for review March 2, 2026 20:27
Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

你好——我已经审查了你的更改,一切看起来都很棒!


Sourcery 对开源项目是免费的——如果你喜欢我们的代码审查,请考虑分享给他人 ✨
帮我变得更有用!请在每条评论上点 👍 或 👎,我会根据你的反馈改进之后的审查。
Original comment in English

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@MistEO MistEO requested review from he0119 and ocsin1 March 3, 2026 03:02
@he0119 he0119 requested review from isHarryh and removed request for he0119 March 3, 2026 03:04
"recognition": {
"param": {
"green_mask": true,
"expected": "激发",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

将激活图标识别改为“激活”OCR,将导致非简体中文玩家无法使用此功能。

建议:点击激活后,判断是否在工业设备页面,如果在工业设备页面,则退出工业设备页面,并重新走一遍到达淤积点的路线。

520,
340
],
"expected": "放弃奖励并重置"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同理。

建议:回撤到基于双按钮模板匹配+目标偏移的点击方法。

316,
196
],
"expected": "领取奖励"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同理。

@AmingNN AmingNN marked this pull request as draft March 3, 2026 06:08
@AmingNN
Copy link
Author

AmingNN commented Mar 3, 2026

本人因电脑坏了一时半会改不了,有迫切需要此功能的朋友可以帮我修复一下

QingYingX pushed a commit to QingYingX-Org/MaaEnd that referenced this pull request Mar 8, 2026
## 概要

此 PR 修复了**自动基质刷取**任务的 5 个问题,并新增了 2 个特性:

### 问题修复

1. 修复了源石研究园淤积点的寻路路径过长的问题。
2. 修复了在基质开始页面开始任务后,寻路未能正常启动的问题(Anchor 未初始化)。
3. 修复了未能在理智减耗的情况下切换刻写选项的问题。
4. 修复了任务成功后仍然显示任务失败的问题(max_hit 禁用节点导致无可命中 next)。
5. 再次修复了重复点击单倍领取的问题(jumpback 误用)。

### 新增特性

1. 可以不领取基质奖励。
2. 新增了误入工业设备界面后可以自行退出的特性。

## 关联

此 PR 将修复以下问题:

Fix MaaEnd#726
Fix MaaEnd#755 
Fix MaaEnd#888
Fix MaaEnd#1042

此 PR 是以下 PR 的后继者:

Close MaaEnd#925

## Summary by Sourcery

更新 AutoEssence 系统,发布首个稳定版本,并提升自动源石溶剂刷取的健壮性和本地化支持。

New Features:
- 允许在 AutoEssence 任务中跳过源石溶剂奖励领取步骤。
- 当自动化流程在刷取过程中误入工业装置界面时,新增自动恢复行为。

Bug Fixes:
- 缩短 AutoEssence 场景中源石技艺园沉积点的寻路路径。
- 通过正确初始化导航锚点,确保从源石溶剂起始界面开始任务后,寻路能够正确启动。
- 在 AutoEssence 运行过程中,当理智折扣生效时,允许正确切换铭刻选项。
- 修正任务结果处理逻辑:当最大打击节点被禁用时,确保成功的 AutoEssence 运行会被报告为成功而非失败。
- 在 AutoEssence 流程中防止对单次领取奖励按钮的重复点击,避免重复交互。

Enhancements:
- 优化各区域的 AutoEssence 任务与流水线定义,以提升稳定性和行为表现。
- 更新所有受支持语言中的本地化字符串,以反映最新的 AutoEssence 功能与提示信息。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update the AutoEssence system to deliver a stable first version with
improved robustness and localization support for automatic essence
farming.

New Features:
- Allow skipping essence reward collection in the AutoEssence task.
- Add automatic recovery behavior when the automation mistakenly enters
the industrial device screen during essence farming.

Bug Fixes:
- Shorten the pathfinding route for the Originium Science Park sediment
point in AutoEssence scenarios.
- Ensure pathfinding starts correctly after beginning the task from the
essence start screen by properly initializing the navigation anchor.
- Allow switching engraving options correctly when sanity discount is
active during AutoEssence runs.
- Correct task result handling so successful AutoEssence runs are
reported as success instead of failure when max-hit nodes are disabled.
- Prevent repeated single-claim reward clicks in the AutoEssence flow to
avoid duplicate interactions.

Enhancements:
- Refine AutoEssence task and pipeline definitions for various zones to
improve stability and behavior.
- Update localized strings across all supported languages to reflect the
latest AutoEssence features and messages.

</details>
@isHarryh
Copy link
Member

isHarryh commented Mar 8, 2026

已完成此 PR 的所有诉求。

MistEO pushed a commit that referenced this pull request Mar 9, 2026
## 概要

此 PR 修复了**自动基质刷取**任务的 5 个问题,并新增了 2 个特性:

### 问题修复

1. 修复了源石研究园淤积点的寻路路径过长的问题。
2. 修复了在基质开始页面开始任务后,寻路未能正常启动的问题(Anchor 未初始化)。
3. 修复了未能在理智减耗的情况下切换刻写选项的问题。
4. 修复了任务成功后仍然显示任务失败的问题(max_hit 禁用节点导致无可命中 next)。
5. 再次修复了重复点击单倍领取的问题(jumpback 误用)。

### 新增特性

1. 可以不领取基质奖励。
2. 新增了误入工业设备界面后可以自行退出的特性。

## 关联

此 PR 将修复以下问题:

Fix #726
Fix #755 
Fix #888
Fix #1042

此 PR 是以下 PR 的后继者:

Close #925

## Summary by Sourcery

更新 AutoEssence 系统,发布首个稳定版本,并提升自动源石溶剂刷取的健壮性和本地化支持。

New Features:
- 允许在 AutoEssence 任务中跳过源石溶剂奖励领取步骤。
- 当自动化流程在刷取过程中误入工业装置界面时,新增自动恢复行为。

Bug Fixes:
- 缩短 AutoEssence 场景中源石技艺园沉积点的寻路路径。
- 通过正确初始化导航锚点,确保从源石溶剂起始界面开始任务后,寻路能够正确启动。
- 在 AutoEssence 运行过程中,当理智折扣生效时,允许正确切换铭刻选项。
- 修正任务结果处理逻辑:当最大打击节点被禁用时,确保成功的 AutoEssence 运行会被报告为成功而非失败。
- 在 AutoEssence 流程中防止对单次领取奖励按钮的重复点击,避免重复交互。

Enhancements:
- 优化各区域的 AutoEssence 任务与流水线定义,以提升稳定性和行为表现。
- 更新所有受支持语言中的本地化字符串,以反映最新的 AutoEssence 功能与提示信息。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update the AutoEssence system to deliver a stable first version with
improved robustness and localization support for automatic essence
farming.

New Features:
- Allow skipping essence reward collection in the AutoEssence task.
- Add automatic recovery behavior when the automation mistakenly enters
the industrial device screen during essence farming.

Bug Fixes:
- Shorten the pathfinding route for the Originium Science Park sediment
point in AutoEssence scenarios.
- Ensure pathfinding starts correctly after beginning the task from the
essence start screen by properly initializing the navigation anchor.
- Allow switching engraving options correctly when sanity discount is
active during AutoEssence runs.
- Correct task result handling so successful AutoEssence runs are
reported as success instead of failure when max-hit nodes are disabled.
- Prevent repeated single-claim reward clicks in the AutoEssence flow to
avoid duplicate interactions.

Enhancements:
- Refine AutoEssence task and pipeline definitions for various zones to
improve stability and behavior.
- Update localized strings across all supported languages to reflect the
latest AutoEssence features and messages.

</details>
MistEO pushed a commit that referenced this pull request Mar 9, 2026
## 概要

此 PR 修复了**自动基质刷取**任务的 5 个问题,并新增了 2 个特性:

### 问题修复

1. 修复了源石研究园淤积点的寻路路径过长的问题。
2. 修复了在基质开始页面开始任务后,寻路未能正常启动的问题(Anchor 未初始化)。
3. 修复了未能在理智减耗的情况下切换刻写选项的问题。
4. 修复了任务成功后仍然显示任务失败的问题(max_hit 禁用节点导致无可命中 next)。
5. 再次修复了重复点击单倍领取的问题(jumpback 误用)。

### 新增特性

1. 可以不领取基质奖励。
2. 新增了误入工业设备界面后可以自行退出的特性。

## 关联

此 PR 将修复以下问题:

Fix #726
Fix #755 
Fix #888
Fix #1042

此 PR 是以下 PR 的后继者:

Close #925

## Summary by Sourcery

更新 AutoEssence 系统,发布首个稳定版本,并提升自动源石溶剂刷取的健壮性和本地化支持。

New Features:
- 允许在 AutoEssence 任务中跳过源石溶剂奖励领取步骤。
- 当自动化流程在刷取过程中误入工业装置界面时,新增自动恢复行为。

Bug Fixes:
- 缩短 AutoEssence 场景中源石技艺园沉积点的寻路路径。
- 通过正确初始化导航锚点,确保从源石溶剂起始界面开始任务后,寻路能够正确启动。
- 在 AutoEssence 运行过程中,当理智折扣生效时,允许正确切换铭刻选项。
- 修正任务结果处理逻辑:当最大打击节点被禁用时,确保成功的 AutoEssence 运行会被报告为成功而非失败。
- 在 AutoEssence 流程中防止对单次领取奖励按钮的重复点击,避免重复交互。

Enhancements:
- 优化各区域的 AutoEssence 任务与流水线定义,以提升稳定性和行为表现。
- 更新所有受支持语言中的本地化字符串,以反映最新的 AutoEssence 功能与提示信息。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update the AutoEssence system to deliver a stable first version with
improved robustness and localization support for automatic essence
farming.

New Features:
- Allow skipping essence reward collection in the AutoEssence task.
- Add automatic recovery behavior when the automation mistakenly enters
the industrial device screen during essence farming.

Bug Fixes:
- Shorten the pathfinding route for the Originium Science Park sediment
point in AutoEssence scenarios.
- Ensure pathfinding starts correctly after beginning the task from the
essence start screen by properly initializing the navigation anchor.
- Allow switching engraving options correctly when sanity discount is
active during AutoEssence runs.
- Correct task result handling so successful AutoEssence runs are
reported as success instead of failure when max-hit nodes are disabled.
- Prevent repeated single-claim reward clicks in the AutoEssence flow to
avoid duplicate interactions.

Enhancements:
- Refine AutoEssence task and pipeline definitions for various zones to
improve stability and behavior.
- Update localized strings across all supported languages to reflect the
latest AutoEssence features and messages.

</details>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants