Skip to content

feat(EnvironmentMonitoring): 环境监测适配 ADB#1545

Merged
he0119 merged 9 commits intov2from
feat/EnvironmentMonitoring-adb
Mar 24, 2026
Merged

feat(EnvironmentMonitoring): 环境监测适配 ADB#1545
he0119 merged 9 commits intov2from
feat/EnvironmentMonitoring-adb

Conversation

@he0119
Copy link
Copy Markdown
Contributor

@he0119 he0119 commented Mar 23, 2026

万能转跳仅适配了用到的节点。

由 Sourcery 提供的摘要

调整环境监控流水线以适配基于 ADB 的执行方式,并添加配置以支持新的流程。

新功能:

  • 添加一个针对 ADB 的环境监控拍照流水线资源。

改进:

  • 更新环境监控郊区监控终端的流水线定义和配置文件,以与新的 ADB 兼容流程保持一致。

文档:

  • 简化郊区监控终端的生成说明,以使用默认的 pipeline-generate 调用方式。
Original summary in English

由 Sourcery 提供的总结

调整环境监控流水线以支持基于 ADB 的执行,并简化 Outskirts Monitoring Terminal 资源的生成流程。

新功能:

  • 引入一个专用于 ADB 的环境监控照片流水线资源。

改进:

  • 更新 Outskirts Monitoring Terminal 的流水线、场景定义和环境监控任务,使其与新的 ADB 兼容工作流保持一致。
  • 增加配置以及模板/数据调整,以便通过标准的 pipeline-generate 工具调用来生成 Outskirts Monitoring Terminal 流水线。

文档:

  • 简化 Outskirts Monitoring Terminal 的 README,使其使用默认的 pipeline-generate 命令,而无需自定义参数。
Original summary in English

Summary by Sourcery

Adapt environment monitoring pipelines to support ADB-based execution and streamline generation of the Outskirts Monitoring Terminal resources.

New Features:

  • Introduce an ADB-specific environment monitoring photo pipeline resource.

Enhancements:

  • Update Outskirts Monitoring Terminal pipelines, scene definitions, and environment monitoring tasks to align with the new ADB-compatible workflow.
  • Add configuration and template/data adjustments for generating Outskirts Monitoring Terminal pipelines via the standard pipeline-generate tool invocation.

Documentation:

  • Simplify the Outskirts Monitoring Terminal README to use the default pipeline-generate command without custom arguments.

@he0119 he0119 force-pushed the feat/EnvironmentMonitoring-adb branch from 0c0c127 to 10c3cc2 Compare March 23, 2026 12:17
@he0119 he0119 force-pushed the feat/EnvironmentMonitoring-adb branch from 10c3cc2 to 2fd110a Compare March 24, 2026 05:29
@he0119 he0119 marked this pull request as ready for review March 24, 2026 06:28
Copilot AI review requested due to automatic review settings March 24, 2026 06:28
Copy link
Copy Markdown
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.

Hey - 我发现了 1 个问题

给 AI 代理的提示词
请根据本次代码审查中的评论进行修改:

## 单独评论

### 评论 1
<location path="tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/README.md" line_range="8" />
<code_context>
- tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/template.jsonc \
- tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/data.json \
- --output-dir assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal
+npx @joebao/maa-pipeline-generate
 ```

</code_context>
<issue_to_address>
**question:** 如果没有在其他地方记录必需的参数或配置,简化后的命令可能会让人感到困惑。

由于 README 之前展示的是包含 template、data 和 output-dir 参数的完整命令,建议说明这些参数现在是从默认值/`config.json` 中读取的,或者提供链接说明用户应在何处进行配置。这样,对于第一次运行该工具的用户来说,这个示例依然可以直接复制粘贴使用。
</issue_to_address>

Sourcery 对开源项目完全免费——如果你觉得我们的审查有帮助,欢迎分享 ✨
帮我变得更有用!请在每条评论上点击 👍 或 👎,我会根据你的反馈改进之后的审查。
Original comment in English

Hey - I've found 1 issue

Prompt for AI Agents
Please address the comments from this code review:

## Individual Comments

### Comment 1
<location path="tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/README.md" line_range="8" />
<code_context>
- tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/template.jsonc \
- tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/data.json \
- --output-dir assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal
+npx @joebao/maa-pipeline-generate
 ```

</code_context>
<issue_to_address>
**question:** The simplified command may be unclear if required arguments or configuration are not documented elsewhere.

Since the README previously showed the full command with template, data, and output-dir arguments, consider either noting that these are now taken from defaults/`config.json` or linking to where users should specify them. That way this example remains copy-pasteable for someone running the tool for the first time.
</issue_to_address>

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.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

该 PR 主要把「环境监测(EnvironmentMonitoring)」相关流水线与场景传送逻辑改造成更适配 ADB 控制器的执行方式:在城郊监测终端任务列表中新增“拍照图标”模板识别作为锚点,并将部分武陵地图传送节点从“模板点选+偏移”迁移到 MapTrackerBigMapPick 方案,同时补齐 ADB 侧资源(pipeline 与模板图)。

Changes:

  • 城郊监测终端任务列表:新增 PhotoIcon.png 模板识别节点,并调整后续 OCR ROI/点击 box_index 以适配新布局锚点。
  • 武陵地图传送:扩展/调整多个 SceneManager ROI,并将部分“找锚点”流程改为 MapTrackerBigMapPick + TeleportConfirm
  • ADB 资源:新增 assets/resource_adb/pipeline/EnvironmentMonitoring/TakePhoto.json 与多张 ADB 模板图;任务定义允许 ADB 控制器运行 EnvironmentMonitoring。

Reviewed changes

Copilot reviewed 24 out of 57 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/template.jsonc 生成模板:新增任务列表图标识别节点并调整 OCR/点击锚点
tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/README.md 更新生成说明(简化调用)
tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/data.json 英文 OCR 期望文本改为更宽松的正则(忽略大小写/空格)
tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/config.json 新增 pipeline-generate 配置文件
assets/tasks/EnvironmentMonitoring.json 任务控制器列表加入 ADB
assets/resource/pipeline/SceneManager/SceneWuling.json 调整武陵场景相关模板匹配 ROI
assets/resource/pipeline/SceneManager/SceneValleyIV.json 调整 ValleyIV 场景相关模板匹配 ROI
assets/resource/pipeline/SceneManager/SceneMap.json 调整地图场景模板匹配 ROI
assets/resource/pipeline/SceneManager/SceneTeleportWuling.json 大幅更新武陵地图传送节点:重命名/替换部分锚点查找逻辑为 BigMapPick
assets/resource/pipeline/Interface/SceneWuling.json Interface 层改用 EnterWorldAnchorWithPick 锚点入口(部分地点)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/AncientTree.json 生成流水线:加入图标模板锚点并调整 OCR ROI/点击 box_index
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/BeaconDamagedInBlightTide.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/CisternOriginiumSlugs.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/CleansingJade.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/CollapsedTianshiPillar.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/EcologyNearTheFieldLogisticsDepot.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/EternalSunset.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/IndoorCrops.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/InflatedAndGlowingBugspittingLankybeast.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/ObservantSableChestedFowlbeast.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/RainbowFin.json 同上(对应任务)
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/VigorousCisternOriginiumSlug.json 同上(对应任务)
assets/resource/pipeline/Common/Button/EnterCameraModeMenuButton.json 调整进入拍照按钮的 TemplateMatch ROI 以适配新定位
assets/resource/image/EnvironmentMonitoring/PhotoIcon.png 新增环境监测任务条目“拍照图标”模板图
assets/resource_adb/pipeline/EnvironmentMonitoring/TakePhoto.json 新增 ADB 环境监测拍照动作节点覆盖/适配
assets/resource_adb/image/SceneManager/MapOverviewWulingNotChoose.png 新增 ADB 武陵地图概览相关模板图
assets/resource_adb/image/SceneManager/MapOverviewWulingChoose.png 新增 ADB 武陵地图概览相关模板图
assets/resource_adb/image/SceneManager/MapOverviewEnter.png 新增 ADB 地图概览进入按钮模板图
assets/resource_adb/image/EnvironmentMonitoring/PhotoIcon.png 新增 ADB 环境监测任务条目“拍照图标”模板图
assets/resource_adb/image/Common/Button/EnterCameraModeMenuButton.png 新增 ADB 进入拍照菜单按钮模板图
assets/resource/image/SceneManager/MapWuling/WulingCity4Right.png 旧武陵地图锚点模板图变更/移除(随 SceneTeleportWuling 调整)
assets/resource/image/SceneManager/MapWuling/WulingCity4Center.png 同上
assets/resource/image/SceneManager/MapWuling/WulingCity4Bottom.png 同上
assets/resource/image/SceneManager/MapWuling/WulingCity3Right.png 同上
assets/resource/image/SceneManager/MapWuling/WulingCity3Center.png 同上
assets/resource/image/SceneManager/MapWuling/WulingCity3Bottom.png 同上
assets/resource/image/SceneManager/MapWuling/WulingCity0Right.png 同上
assets/resource/image/SceneManager/MapWuling/WulingCity0Center.png 同上
assets/resource/image/SceneManager/MapWuling/WulingCity0Bottom.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley8Top.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley8Right.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley8Center.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley7Right.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley7Center.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley7Bottom.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley4Top.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley4Right.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley4Center.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley2Top.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley2Right.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley2Center.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley10Top.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley10Right.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley10Center.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley0Right.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley0Center.png 同上
assets/resource/image/SceneManager/MapWuling/JingyuValley0Bottom.png 同上

@he0119 he0119 merged commit 5765bd2 into v2 Mar 24, 2026
11 checks passed
@he0119 he0119 deleted the feat/EnvironmentMonitoring-adb branch March 24, 2026 08:56
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.

3 participants