feat(DeliveryJobs): 支持选择填充的货物 by he0119 · Pull Request #859 · MaaEnd/MaaEnd

he0119 · 2026-02-28T08:20:43Z

close #546

Summary by Sourcery

为 DeliveryJobs 添加可配置的货物选择功能，并相应更新相关流水线、任务、资源和测试。

新功能：

允许 DeliveryJobs 指定并选择在自动配送工作流中要打包的货物条目。

增强：

更新 DeliveryJobs 的流水线和任务配置，以在标准版和 ADB 变体中支持新的货物选择行为。
刷新 DeliveryJobs 的本地化条目，以涵盖新的货物选择用户体验（UX）。

文档：

在 DeliveryJobs 的图片资源目录下新增 README，记录物品选择界面图片的使用限制。

测试：

扩展 DeliveryJobs 的打包测试（包括 ADB 专用测试），以覆盖新的货物选择逻辑。

Original summary in English

Summary by Sourcery

Add configurable cargo selection to DeliveryJobs, updating related pipelines, tasks, assets, and tests accordingly.

New Features:

Allow DeliveryJobs to specify and select which cargo items are packed during automatic delivery workflows.

Enhancements:

Update DeliveryJobs pipeline and task configurations to support the new cargo selection behavior across standard and ADB variants.
Refresh localization entries for DeliveryJobs to cover the new cargo selection UX.

Documentation:

Add a README under DeliveryJobs image resources documenting usage constraints for item selection UI images.

Tests:

Extend DeliveryJobs packing tests, including ADB-specific tests, to cover the new cargo selection logic.

Original summary in English

Summary by Sourcery

为 DeliveryJobs 添加可配置的货物选择功能，并相应更新相关流水线、任务、资源和测试。

新功能：

允许 DeliveryJobs 指定并选择在自动配送工作流中要打包的货物条目。

增强：

更新 DeliveryJobs 的流水线和任务配置，以在标准版和 ADB 变体中支持新的货物选择行为。
刷新 DeliveryJobs 的本地化条目，以涵盖新的货物选择用户体验（UX）。

文档：

在 DeliveryJobs 的图片资源目录下新增 README，记录物品选择界面图片的使用限制。

测试：

扩展 DeliveryJobs 的打包测试（包括 ADB 专用测试），以覆盖新的货物选择逻辑。

Original summary in English

Summary by Sourcery

Add configurable cargo selection to DeliveryJobs, updating related pipelines, tasks, assets, and tests accordingly.

New Features:

Allow DeliveryJobs to specify and select which cargo items are packed during automatic delivery workflows.

Enhancements:

Update DeliveryJobs pipeline and task configurations to support the new cargo selection behavior across standard and ADB variants.
Refresh localization entries for DeliveryJobs to cover the new cargo selection UX.

Documentation:

Add a README under DeliveryJobs image resources documenting usage constraints for item selection UI images.

Tests:

Extend DeliveryJobs packing tests, including ADB-specific tests, to cover the new cargo selection logic.

he0119 · 2026-02-28T10:55:39Z

因为在这个界面的物品上还会显示价值，所以效果很差。

{
  "name": "DeliveryJobsSelectItemToFill",
  "algorithm": "NeuralNetworkDetect",
  "hit": false,
  "box": [0, 0, 0, 0],
  "detail": {
    "all": [
      {
        "box": [243, 463, 82, 76],
        "cls_index": 137,
        "label": "蓝铁块",
        "score": 0.933271
      },
      {
        "box": [242, 171, 86, 89],
        "cls_index": 90,
        "label": "砂叶粉末",
        "score": 0.475505
      },
      {
        "box": [332, 313, 89, 87],
        "cls_index": 170,
        "label": "铁制零件",
        "score": 0.35104
      }
    ],
    "best": null,
    "filtered": []
  }
}

Daydreamer114 · 2026-03-05T08:18:56Z

ok了，我这边运行正常，你看看 adb 要不要测

he0119 · 2026-03-05T08:19:47Z

ok了，我这边运行正常，你看看 adb 要不要测

要测试，明天我测试后再合并吧。

sourcery-ai

Hey - 我在这里给出了一些高层面的反馈：

新的 PackCargo.json 流水线同时出现在 resource_fast 和 resource_adb 中；请考虑将任何共享的配置抽取出来，或者清楚地记录有意为之的差异，以降低这两个配置随时间逐渐偏离的风险。

给 AI Agent 的提示

Please address the comments from this code review:

## Overall Comments
- The new `PackCargo.json` pipeline appears in both `resource_fast` and `resource_adb`; consider factoring out any shared configuration or clearly documenting intentional differences to reduce the risk of the two drifting over time.

Sourcery 对开源项目是免费的——如果你觉得我们的评审有帮助，欢迎分享 ✨

_{帮我变得更有用！请在每条评论上点 👍 或 👎，我会根据你的反馈改进后续的评审。}

Original comment in English

Hey - I've left some high level feedback:

The new PackCargo.json pipeline appears in both resource_fast and resource_adb; consider factoring out any shared configuration or clearly documenting intentional differences to reduce the risk of the two drifting over time.

Prompt for AI Agents

Please address the comments from this code review:

## Overall Comments
- The new `PackCargo.json` pipeline appears in both `resource_fast` and `resource_adb`; consider factoring out any shared configuration or clearly documenting intentional differences to reduce the risk of the two drifting over time.

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.}

Copilot

Pull request overview

本 PR 为 DeliveryJobs（自动转交送货）任务新增了选择要填充货物类型的功能，解决了 #546 中描述的默认"塞满"操作可能装入不期望货物的问题。通过 anchor 机制根据进入的仓储区域（四号谷地/武陵）动态解析对应的货物选择节点。

Changes:

新增 PackCargoSelectItem switch 选项，允许用户启用/禁用指定货物填充功能，并为四号谷地和武陵分别提供下拉选择框选择要填充的货物种类
新增 Pipeline 节点 DeliveryJobsSelectItemToFillValleyIV、DeliveryJobsSelectItemToFillWuling、DeliveryJobsFillCorrespondingGoods，通过 TemplateMatch 识别和点击来实现选择指定货物并填满
在 DepotNode.json 中为各仓储入口节点添加 anchor 属性，使流程可根据当前区域动态解析到正确的货物选择节点

Reviewed changes

Copilot reviewed 12 out of 26 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
assets/tasks/DeliveryJobs.json	新增 `PackCargoSelectItem`、`WhatToFillValleyIV`、`WhatToFillWuling` 选项定义
assets/resource_fast/pipeline/DeliveryJobs/PackCargo.json	新增三个 Pipeline 节点用于选择和填充指定货物
assets/resource_fast/pipeline/DeliveryJobs/DepotNode.json	为各仓储入口节点添加 anchor 属性以支持区域感知的动态分发
assets/resource_adb/pipeline/DeliveryJobs/PackCargo.json	新增 ADB 控制器下 `DeliveryJobsFillCorrespondingGoods` 的 target_offset 覆盖
assets/resource_fast/image/DeliveryJobs/*.png	新增货物选择和填充所需的模板图片（resource_fast）
assets/resource_adb/image/DeliveryJobs/*.png	新增货物选择和填充所需的模板图片（resource_adb）
assets/resource_fast/image/DeliveryJobs/README.md	说明此目录图片含物品价值信息，不可复用
assets/misc/locales/*.json	为所有支持语言新增货物选择相关的本地化字符串
tests/DeliveryJobs/test_pack_cargo.json	更新 Win32 测试用例，覆盖新增节点的识别验证
tests/DeliveryJobs/test_pack_cargo_adb.json	更新 ADB 测试用例，覆盖新增节点的识别验证

close #546 ## Summary by Sourcery 为 DeliveryJobs 添加可配置的货物选择功能，并相应更新相关流水线、任务、资源和测试。新功能： - 允许 DeliveryJobs 指定并选择在自动配送工作流中要打包的货物条目。增强： - 更新 DeliveryJobs 的流水线和任务配置，以在标准版和 ADB 变体中支持新的货物选择行为。 - 刷新 DeliveryJobs 的本地化条目，以涵盖新的货物选择用户体验（UX）。文档： - 在 DeliveryJobs 的图片资源目录下新增 README，记录物品选择界面图片的使用限制。测试： - 扩展 DeliveryJobs 的打包测试（包括 ADB 专用测试），以覆盖新的货物选择逻辑。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery Add configurable cargo selection to DeliveryJobs, updating related pipelines, tasks, assets, and tests accordingly. New Features: - Allow DeliveryJobs to specify and select which cargo items are packed during automatic delivery workflows. Enhancements: - Update DeliveryJobs pipeline and task configurations to support the new cargo selection behavior across standard and ADB variants. - Refresh localization entries for DeliveryJobs to cover the new cargo selection UX. Documentation: - Add a README under DeliveryJobs image resources documenting usage constraints for item selection UI images. Tests: - Extend DeliveryJobs packing tests, including ADB-specific tests, to cover the new cargo selection logic. </details> <details> <summary>Original summary in English</summary> ## Summary by Sourcery 为 DeliveryJobs 添加可配置的货物选择功能，并相应更新相关流水线、任务、资源和测试。新功能： - 允许 DeliveryJobs 指定并选择在自动配送工作流中要打包的货物条目。增强： - 更新 DeliveryJobs 的流水线和任务配置，以在标准版和 ADB 变体中支持新的货物选择行为。 - 刷新 DeliveryJobs 的本地化条目，以涵盖新的货物选择用户体验（UX）。文档： - 在 DeliveryJobs 的图片资源目录下新增 README，记录物品选择界面图片的使用限制。测试： - 扩展 DeliveryJobs 的打包测试（包括 ADB 专用测试），以覆盖新的货物选择逻辑。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery Add configurable cargo selection to DeliveryJobs, updating related pipelines, tasks, assets, and tests accordingly. New Features: - Allow DeliveryJobs to specify and select which cargo items are packed during automatic delivery workflows. Enhancements: - Update DeliveryJobs pipeline and task configurations to support the new cargo selection behavior across standard and ADB variants. - Refresh localization entries for DeliveryJobs to cover the new cargo selection UX. Documentation: - Add a README under DeliveryJobs image resources documenting usage constraints for item selection UI images. Tests: - Extend DeliveryJobs packing tests, including ADB-specific tests, to cover the new cargo selection logic. </details> </details> --------- Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>

he0119 force-pushed the feat/delivery-jobs-pack-item branch from 5755bc4 to b742703 Compare March 5, 2026 05:34

he0119 and others added 8 commits March 6, 2026 08:58

feat(DeliveryJobs): 支持选择填充的货物

5993635

feat(DeliveryJobs): 更新填充货物相关的描述和标签

7b98de9

perf: 模型匹配改为模板匹配，区分四号谷地与武陵的物品选择，手动添满对应物品

858986d

feat: 芽针、锦草图片

9d22479

fix: 将模板移动到 fast 中

a46b097

feat(DeliveryJobs): 移除可能失败的提示

cd1243c

test: 添加测试

c1687d4

feat: 通过单击进度条最右侧填满货物

1b7ec29

he0119 force-pushed the feat/delivery-jobs-pack-item branch from 8a26dac to 1b7ec29 Compare March 6, 2026 01:19

he0119 added 2 commits March 6, 2026 09:25

test: 修正测试图片名称

926449c

refactor: 使用 pre_wait_freezes 更好

0299fc9

he0119 marked this pull request as ready for review March 6, 2026 01:57

Copilot AI review requested due to automatic review settings March 6, 2026 01:57

Copilot started reviewing on behalf of he0119 March 6, 2026 01:57 View session

sourcery-ai bot reviewed Mar 6, 2026

View reviewed changes

Copilot AI reviewed Mar 6, 2026

View reviewed changes

feat: ADB 芽针、锦草图片

81426f9

he0119 force-pushed the feat/delivery-jobs-pack-item branch from f0ec085 to 81426f9 Compare March 6, 2026 02:45

he0119 merged commit 3b48161 into main Mar 6, 2026
17 checks passed

he0119 deleted the feat/delivery-jobs-pack-item branch March 6, 2026 03:01

he0119 mentioned this pull request Mar 9, 2026

自动接单选择填入货物只有几个粉末的选项 #1133

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(DeliveryJobs): 支持选择填充的货物#859

feat(DeliveryJobs): 支持选择填充的货物#859
he0119 merged 11 commits intomainfrom
feat/delivery-jobs-pack-item

he0119 commented Feb 28, 2026 •

edited by sourcery-ai bot

Loading

Uh oh!

he0119 commented Feb 28, 2026

Uh oh!

Daydreamer114 commented Mar 5, 2026

Uh oh!

he0119 commented Mar 5, 2026

Uh oh!

sourcery-ai bot left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

he0119 commented Feb 28, 2026 • edited by sourcery-ai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by Sourcery

Summary by Sourcery

Summary by Sourcery

Summary by Sourcery

Uh oh!

he0119 commented Feb 28, 2026

Uh oh!

Daydreamer114 commented Mar 5, 2026

Uh oh!

he0119 commented Mar 5, 2026

Uh oh!

sourcery-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

he0119 commented Feb 28, 2026 •

edited by sourcery-ai bot

Loading