Skip to content

Fix:修复基建奖励错误#1041

Merged
MistEO merged 4 commits intomainfrom
Fix/DijiangRewards
Mar 6, 2026
Merged

Fix:修复基建奖励错误#1041
MistEO merged 4 commits intomainfrom
Fix/DijiangRewards

Conversation

@overflow65537
Copy link
Member

@overflow65537 overflow65537 commented Mar 6, 2026

Summary by Sourcery

修复多处地缚(Dijiang)基础设施房间的错误奖励配置,并更新共享按钮资源定义。

Bug 修复:

  • 更正 Dijiang GrowthChamber、MainFlow、Manufacturing、ReceptionRoom 和 RecoveryEmotion 管线的奖励数据,解决基础设施奖励不正确的问题。
  • 对齐标准资源管线与 ADB 资源管线中 RecoveryEmotion 的奖励配置,消除不一致情况。

增强内容:

  • 调整在 UI 管线中使用的通用快速资源按钮配置。
Original summary in English

Summary by Sourcery

Fix incorrect rewards configuration for multiple Dijiang infrastructure rooms and update a shared button resource definition.

Bug Fixes:

  • Correct reward data for Dijiang GrowthChamber, MainFlow, Manufacturing, ReceptionRoom, and RecoveryEmotion pipelines to resolve incorrect infrastructure rewards.
  • Align RecoveryEmotion rewards configuration across standard and ADB resource pipelines to eliminate inconsistencies.

Enhancements:

  • Adjust the common fast-resource button configuration used in the UI pipeline.

Copilot AI review requested due to automatic review settings March 6, 2026 11:37
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.

Copy link
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 修复基建奖励领取流程中的错误,主要改进了奖励关闭按钮的识别精确度(通过 And 组合识别防止误触),新增了培养舱入口节点 EntryGrowthChamber,重构了恢复心情的流程逻辑,并在关键点位增加了 pre_wait_freezes 以稳定 UI。

Changes:

  • CloseRewardsButton 从单一模板匹配改为 And 组合识别(按钮 + 奖励图标),避免在非奖励界面误匹配
  • 新增 EntryGrowthChamber 节点以从控制中枢直接进入培养舱,并在主流程 ControlNexus.next 中添加引用
  • 重构恢复心情流程:使用 [JumpBack] 模式简化 RecoveryEmotionAssistUseAssist 的调用链,简化 ADB overlay

Reviewed changes

Copilot reviewed 7 out of 8 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
assets/resource_fast/pipeline/Common/Button.json CloseRewardsButton 改为 And 识别,新增 DectedCloseRewardsButtonDectedCloseRewardsImage 辅助节点
assets/resource_fast/image/Common/Button/CloseRewardImage.png 新增奖励界面头部图标模板图片
assets/resource_adb/pipeline/DijiangRewards/RecoveryEmotion.json 简化 ADB overlay,仅覆盖 EmotionBarroi_offset
assets/resource/pipeline/DijiangRewards/RecoveryEmotion.json 重构恢复心情流程,使用 JumpBack 模式
assets/resource/pipeline/DijiangRewards/ReceptionRoom.json SetClues 添加 pre_wait_freezes 稳定 UI
assets/resource/pipeline/DijiangRewards/Manufacturing.json MFGCarbinNeedTakeClose 添加 pre_wait_freezes 稳定 UI
assets/resource/pipeline/DijiangRewards/MainFlow.json ControlNexus.next 中添加 [JumpBack]EntryGrowthChamber
assets/resource/pipeline/DijiangRewards/GrowthChamber.json 新增 EntryGrowthChamber 节点,将 InGrowthChamber 重命名为 BackToGrowthChamber

Comment on lines +616 to +617
"DectedCloseRewardsButton",
"DectedCloseRewardsImage"
Copy link

Copilot AI Mar 6, 2026

Choose a reason for hiding this comment

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

DectedCloseRewardsButtonDectedCloseRewardsImage 中的 "Dected" 是 "Detected" 的拼写错误。请将这两个节点名及其在 all_of 列表中的引用统一修正为 DetectedCloseRewardsButtonDetectedCloseRewardsImage

Copilot uses AI. Check for mistakes.
Comment on lines +638 to +657
"DectedCloseRewardsImage": {
"desc": "检测到奖励界面时的图标",
"recognition": {
"type": "TemplateMatch",
"param": {
"roi": [
437,
0,
419,
224
],
"template": [
"Common/Button/CloseRewardImage.png"
],
"method": 10001,
"threshold": 0.9
}
}
},
"DectedCloseRewardsButton": {
Copy link

Copilot AI Mar 6, 2026

Choose a reason for hiding this comment

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

同上,DectedCloseRewardsImageDectedCloseRewardsButton 节点定义名中的 "Dected" 应改为 "Detected"。

Copilot uses AI. Check for mistakes.
@MistEO MistEO merged commit a73bb67 into main Mar 6, 2026
21 checks passed
@MistEO MistEO deleted the Fix/DijiangRewards branch March 6, 2026 12:11
MistEO pushed a commit that referenced this pull request Mar 9, 2026
MistEO pushed a commit that referenced this pull request Mar 9, 2026
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