Skip to content

fix: 重新处理未解锁的情况并支持自动选择开始地区#1623

Merged
he0119 merged 5 commits intov2from
fix/location-locked
Mar 26, 2026
Merged

fix: 重新处理未解锁的情况并支持自动选择开始地区#1623
he0119 merged 5 commits intov2from
fix/location-locked

Conversation

@he0119
Copy link
Copy Markdown
Contributor

@he0119 he0119 commented Mar 26, 2026

Summary by Sourcery

在交付和售卖流水线中更稳健地处理区域解锁状态,并在场景菜单中添加自动选择起始区域的支持。

New Features:

  • 支持在进入场景菜单或相关流程时自动选择起始区域。

Bug Fixes:

  • 在交付和售卖任务流水线中正确处理尚未解锁区域或路线的情况,以防止出现无效选择或状态。

Enhancements:

  • 在多个区域间统一交付和售卖流水线的配置,以一致地应用新的区域选择与锁定行为。
Original summary in English

Summary by Sourcery

Handle region unlocking state more robustly in delivery and selling pipelines and add support for automatically selecting a starting region in the scene menu.

New Features:

  • Support automatically choosing a starting region when entering the scene menu or related flows.

Bug Fixes:

  • Correct handling of cases where regions or routes are not yet unlocked in delivery and selling job pipelines to prevent invalid selections or states.

Enhancements:

  • Align delivery and selling pipeline configurations across multiple regions to consistently apply the new region selection and locking behavior.

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

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


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
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 旨在改进“售卖(SellProduct)”与“运送委托(DeliveryJobs)”两套 Pipeline:重新处理功能未解锁时的分支,并新增“自动根据当前所在地区选择起始地区”的入口逻辑;同时增强从任意界面进入“地区建设”菜单的兼容性。

Changes:

  • 重构 SellProduct / DeliveryJobs 的主入口为带循环的结构,并支持自动选择起始地区。
  • 将各地区子流程在完成后回到主循环/地区建设菜单,移除原先的 Finish 结束节点。
  • SceneManager:进入“地区建设菜单”时增加“已在地区建设/从二级界面返回”的处理路径。

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
assets/resource/pipeline/SellProduct/Wuling.json 武陵售卖流程结束后改为回到 SellProductLoop,并支持跳回地区建设菜单
assets/resource/pipeline/SellProduct/ValleyIV.json 四号谷地售卖流程结束后改为回到 SellProductLoop,并支持跳回地区建设菜单
assets/resource/pipeline/SellProduct/SellCore.json 移除 SellProductSellAreaFinish 结束节点
assets/resource/pipeline/SellProduct.json 新增 SellProductLoop/Auto/未解锁识别等主流程重构
assets/resource/pipeline/Interface/SceneMenu.json SceneEnterMenuRegionalDevelopment 增强:支持已在地区建设、以及从二级界面返回
assets/resource/pipeline/DeliveryJobs/Wuling.json 武陵运送委托流程结束后改为回到 DeliveryJobsLoop,并支持跳回地区建设菜单
assets/resource/pipeline/DeliveryJobs/ValleyIV.json 四号谷地运送委托流程结束后改为回到 DeliveryJobsLoop,并支持跳回地区建设菜单
assets/resource/pipeline/DeliveryJobs/PackCargo.json 移除 DeliveryJobsTaskFinish 结束节点
assets/resource/pipeline/DeliveryJobs.json 新增 DeliveryJobsLoop/Auto/未解锁识别等主流程重构

@he0119 he0119 merged commit 5c7f747 into v2 Mar 26, 2026
18 checks passed
@he0119 he0119 deleted the fix/location-locked branch March 26, 2026 12:44
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