Skip to content

refactor: 重构基建奖励#1513

Merged
MistEO merged 26 commits intov2from
refactor/DijiangRewards
Mar 23, 2026
Merged

refactor: 重构基建奖励#1513
MistEO merged 26 commits intov2from
refactor/DijiangRewards

Conversation

@overflow65537
Copy link
Copy Markdown
Member

@overflow65537 overflow65537 commented Mar 21, 2026

由 Sourcery 提供的摘要

重构 DijiangRewards 流水线配置和模板,使标准资源和 ADB 资源在主流程、导航、制造以及文本/状态模板方面保持一致。

增强内容:

  • 重新组织 DijiangRewards 的 MainFlow、Manufacturing 和 Navigation 流水线配置,使结构更加一致。
  • 更新 DijiangRewards 的 Status 和 TextTemplate 定义,采用统一的模板格式。
  • 对齐 ADB 中 DijiangRewards 的文本模板与主资源模板,以确保一致性。
Original summary in English

Summary by Sourcery

重构 DijiangRewards 奖励流水线配置,以在主资源和 ADB 资源之间统一模板和资源定义,并移除单独的导航流水线。

增强内容:

  • 对齐主资源和 ADB 资源中 DijiangRewards 的 GrowthChamber、MainFlow、Manufacturing 和 ReceptionRoom 流水线配置。
  • 在各个流水线中标准化 DijiangRewards 的位置(location)、状态(status)和文本(text)模板定义。
  • 更新 DijiangRewards 任务配置,使其与重构后的流水线和模板结构保持一致。
  • 移除独立的 DijiangRewards Navigation 流水线,改用统一的配置。
Original summary in English

Summary by Sourcery

Refactor DijiangRewards reward pipeline configuration to unify templates and resource definitions across main and ADB resources and remove the separate navigation pipeline.

Enhancements:

  • Align DijiangRewards GrowthChamber, MainFlow, Manufacturing, and ReceptionRoom pipeline configs between main resources and ADB resources.
  • Standardize DijiangRewards template definitions for location, status, and text across pipelines.
  • Update DijiangRewards task configuration to match the refactored pipeline and template structure.
  • Remove the standalone DijiangRewards Navigation pipeline in favor of the unified configuration.

@overflow65537 overflow65537 linked an issue Mar 22, 2026 that may be closed by this pull request
@overflow65537 overflow65537 linked an issue Mar 22, 2026 that may be closed by this pull request
@overflow65537 overflow65537 marked this pull request as ready for review March 22, 2026 10:28
Copilot AI review requested due to automatic review settings March 22, 2026 10: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 - 我在这里提供了一些总体反馈:

  • 由于要移除 DijiangRewards/Navigation.json,请再次确认所有对该流水线的引用(例如在 DijiangRewards.json 的 tasks 中或其他流水线里)已经更新为指向新的流程,或者被删除,以避免运行时查找失败。
  • assets/resourceassets/resource_adb 下的 TextTemplate.json 现在在概念上已经对齐;可以考虑将共享的结构或键提取到一个单一的“真源”(source of truth)中,以降低它们在后续变更中逐渐产生差异的风险。
  • GrowthChamber、Manufacturing 和 ReceptionRoom 的重构后流水线 JSON,在标准资源和 ADB 资源之间应遵循一致的字段排序和命名约定,以便未来的 diff 和代码审查更容易;如果存在有意为之的差异,建议添加简短的行内注释或命名提示来加以说明。
面向 AI 代理的提示
Please address the comments from this code review:

## Overall Comments
- Since `DijiangRewards/Navigation.json` is being removed, double-check that any references to this pipeline (e.g., in `DijiangRewards.json` tasks or other pipelines) are updated to point to the new flow or removed to avoid runtime lookup failures.
- The `TextTemplate.json` files under `assets/resource` and `assets/resource_adb` now appear conceptually aligned; consider extracting shared structures or keys into a single source of truth to reduce the risk of the two drifting apart in future changes.
- The refactored pipeline JSONs for GrowthChamber, Manufacturing, and ReceptionRoom should follow a consistent field ordering and naming convention across standard and ADB resources to make future diffs and reviews easier; if there are intentional deviations, add brief inline comments or naming hints to clarify them.

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

Hey - I've left some high level feedback:

  • Since DijiangRewards/Navigation.json is being removed, double-check that any references to this pipeline (e.g., in DijiangRewards.json tasks or other pipelines) are updated to point to the new flow or removed to avoid runtime lookup failures.
  • The TextTemplate.json files under assets/resource and assets/resource_adb now appear conceptually aligned; consider extracting shared structures or keys into a single source of truth to reduce the risk of the two drifting apart in future changes.
  • The refactored pipeline JSONs for GrowthChamber, Manufacturing, and ReceptionRoom should follow a consistent field ordering and naming convention across standard and ADB resources to make future diffs and reviews easier; if there are intentional deviations, add brief inline comments or naming hints to clarify them.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Since `DijiangRewards/Navigation.json` is being removed, double-check that any references to this pipeline (e.g., in `DijiangRewards.json` tasks or other pipelines) are updated to point to the new flow or removed to avoid runtime lookup failures.
- The `TextTemplate.json` files under `assets/resource` and `assets/resource_adb` now appear conceptually aligned; consider extracting shared structures or keys into a single source of truth to reduce the risk of the two drifting apart in future changes.
- The refactored pipeline JSONs for GrowthChamber, Manufacturing, and ReceptionRoom should follow a consistent field ordering and naming convention across standard and ADB resources to make future diffs and reviews easier; if there are intentional deviations, add brief inline comments or naming hints to clarify them.

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.

@overflow65537 overflow65537 requested a review from zmdyy0318 March 22, 2026 10:29
@overflow65537 overflow65537 linked an issue Mar 22, 2026 that may be closed by this pull request
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 重构了 DijiangRewards(基建奖励) 的流水线配置与模板定义,目标是让标准资源与 ADB 资源在主流程、导航、制造、培养以及文本/状态模板上保持一致,降低两套资源分叉维护成本。

Changes:

  • 重命名/重组 MainFlow、Manufacturing、GrowthChamber、ReceptionRoom 等流水线节点结构,并同步更新 tasks 的 pipeline_override 引用。
  • 将部分识别能力下沉/对齐到 Template(Location/Status/TextTemplate),并补齐 ADB 侧的模板/动作节点。
  • 新增/对齐若干图像模板资源(如返回按钮、最大按钮、补货按钮等)以支持 TemplateMatch。

Reviewed changes

Copilot reviewed 13 out of 17 changed files in this pull request and generated 6 comments.

Show a summary per file
File Description
assets/tasks/DijiangRewards.json 更新任务选项的 pipeline_override,适配新的 GrowthChamber* 节点与 AutoExtractSeed 选项结构
assets/resource_adb/pipeline/DijiangRewards/Template/TextTemplate.json ADB 侧补齐 MFGCarbinText 的 ROI 偏移配置以对齐模板
assets/resource_adb/pipeline/DijiangRewards/ReceptionRoom.json ADB 侧会客室退出/滑动等动作节点重命名并补齐缺失动作
assets/resource_adb/pipeline/DijiangRewards/Manufacturing.json ADB 侧制造舱退出节点更名以对齐主资源命名
assets/resource_adb/pipeline/DijiangRewards/GrowthChamber.json ADB 侧培养舱返回/退出等动作节点重命名并补齐缺失动作
assets/resource_adb/image/ClaimDijiangRewards/Restock.png ADB 侧新增补货按钮模板图
assets/resource_adb/image/ClaimDijiangRewards/BackButton.png ADB 侧新增返回按钮模板图
assets/resource/pipeline/DijiangRewards/Template/TextTemplate.json 标准资源侧新增 MFGCarbinText、GrowthChamberExtractSeedText 等文本识别模板
assets/resource/pipeline/DijiangRewards/Template/Status.json 新增 MFGCarbinTips、GrowthChamberCheckTargetEmpty 等状态识别模板
assets/resource/pipeline/DijiangRewards/Template/Location.json 新增 InGrowthChamber、InDijiangControlNexus、GrowthChamberInSelectTarget 等位置识别模板
assets/resource/pipeline/DijiangRewards/ReceptionRoom.json 会客室流程调整:入口等待、ViewIn 识别方式、线索收集/赠送分支组织等
assets/resource/pipeline/DijiangRewards/Navigation.json 删除旧的导航文件(相关能力迁移/并入 Template/各子流程)
assets/resource/pipeline/DijiangRewards/Manufacturing.json 制造舱流程重组:入口识别、领奖/补货/助力/退出分支统一
assets/resource/pipeline/DijiangRewards/MainFlow.json 主流程 JumpBack 节点更新为 MFGCarbinMain / GrowthChamberMain
assets/resource/pipeline/DijiangRewards/GrowthChamber.json 培养舱流程重组:入口/界面确认/培养目标选择/提取基核与返回链路统一
assets/resource/image/ClaimDijiangRewards/ItemMaxButton.png 新增“最大”按钮模板图(供制造舱助力/补货流程 TemplateMatch 使用)
assets/resource/image/ClaimDijiangRewards/BackButton.png 新增返回按钮模板图(供培养舱返回流程 TemplateMatch 使用)

Comment on lines 453 to +476
@@ -887,135 +468,91 @@
]
}
},
"action": {
"type": "StopTask"
}
"post_delay": 0,
"pre_delay": 0,
"rate_limit": 0,
"next": [
"GrowthChamberBackExtract"
]
Copy link

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

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

GrowthChamberNoMaterials 节点的描述写的是“原料不足时停止任务”,但当前节点没有 StopTask/终止动作,而是跳转到 GrowthChamberBackExtract 继续流程。这会导致行为与描述不一致,且可能在原料不足时反复尝试。建议:要么恢复 StopTask,要么更新 desc 并确保后续流程不会陷入循环。

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

会回到培养舱主界面,看看有没有其他任务
没有的话就退出

Comment on lines 54 to 75
@@ -154,52 +63,33 @@
118
],
"template": [
"ClaimDijiangRewards/Restock.png"
"ClaimDijiangRewards/ItemMaxButton.png"
],
"method": 10001,
"order_by": "Vertical",
"index": -1
"index": -1,
"green_mask": true,
"threshold": [
0.9
]
}
Copy link

Copilot AI Mar 22, 2026

Choose a reason for hiding this comment

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

MFGCabinRestock 的识别模板改成了 ClaimDijiangRewards/ItemMaxButton.png,但该节点语义是“补货”且 ROI 与旧版 Restock 按钮一致。仓库内也存在 ClaimDijiangRewards/Restock.png;如果这里误用 Max 按钮模板,将导致补货入口无法被识别/点击。建议改回使用 Restock.png(或提供一个与该 ROI 对应的补货按钮模板)。

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

是一个按钮

@Daydreamer114 Daydreamer114 changed the title refactor:重构基建奖励 refactor: 重构基建奖励 Mar 22, 2026
@zmdyy0318 zmdyy0318 linked an issue Mar 22, 2026 that may be closed by this pull request
@overflow65537 overflow65537 linked an issue Mar 22, 2026 that may be closed by this pull request
@MistEO MistEO merged commit d492949 into v2 Mar 23, 2026
17 checks passed
@MistEO MistEO deleted the refactor/DijiangRewards branch March 23, 2026 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants