Skip to content

fix: 更新场景管理器中关闭ADB控制器的退出逻辑#1862

Merged
MistEO merged 1 commit intov2from
fix/si
Apr 2, 2026
Merged

fix: 更新场景管理器中关闭ADB控制器的退出逻辑#1862
MistEO merged 1 commit intov2from
fix/si

Conversation

@overflow65537
Copy link
Copy Markdown
Member

@overflow65537 overflow65537 commented Apr 2, 2026

由 Sourcery 提供的摘要

在共享和 ADB 专用流水线中,统一在关闭 ADB 控制器时场景管理器的退出行为。

Bug 修复:

  • 修复在关闭 ADB 控制器时,对于同时共享标准和 ADB 场景配置的流水线中,场景管理器退出逻辑不正确的问题。

增强:

  • 对齐界面和场景管理器流水线配置文件,以确保在退出涉及 ADB 控制器的场景时行为一致。
Original summary in English

Summary by Sourcery

Align scene manager exit behavior when closing the ADB controller across shared and ADB-specific pipelines.

Bug Fixes:

  • Fix incorrect scene manager exit logic when closing the ADB controller in pipelines that share standard and ADB scene configurations.

Enhancements:

  • Align interface and scene manager pipeline configuration files to ensure consistent behavior when exiting scenes involving the ADB controller.

Bug 修复:

  • 修复在标准和 ADB 专用流水线共用的场景配置中,关闭 ADB 控制器时场景管理器的退出逻辑。

增强:

  • 对齐界面与场景管理器流水线的配置文件,以确保在退出涉及 ADB 控制器的场景时行为一致。
Original summary in English

由 Sourcery 提供的摘要

在共享和 ADB 专用流水线中,统一在关闭 ADB 控制器时场景管理器的退出行为。

Bug 修复:

  • 修复在关闭 ADB 控制器时,对于同时共享标准和 ADB 场景配置的流水线中,场景管理器退出逻辑不正确的问题。

增强:

  • 对齐界面和场景管理器流水线配置文件,以确保在退出涉及 ADB 控制器的场景时行为一致。
Original summary in English

Summary by Sourcery

Align scene manager exit behavior when closing the ADB controller across shared and ADB-specific pipelines.

Bug Fixes:

  • Fix incorrect scene manager exit logic when closing the ADB controller in pipelines that share standard and ADB scene configurations.

Enhancements:

  • Align interface and scene manager pipeline configuration files to ensure consistent behavior when exiting scenes involving the ADB controller.

@overflow65537 overflow65537 marked this pull request as ready for review April 2, 2026 12: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.

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

  • 由于在普通流程和 ADB 流程中都存在 SceneCommon.json,而本 PR 的目标是让它们保持一致,建议将共享配置抽取为单一来源(或一个有清晰引用的基类),以降低未来在 ADB 相关退出行为上产生差异的风险。
  • 请再次确认 ADB 控制器的关闭/退出标志和回调在 Interface/Scene.json 与两个 SceneManager/SceneCommon.json 文件之间的命名和结构是否保持一致,以便今后对退出逻辑的任何修改都能以相同方式影响这三份配置。
给 AI Agents 的提示
Please address the comments from this code review:

## Overall Comments
- Since `SceneCommon.json` exists in both the normal and ADB pipelines and this PR aims to keep them aligned, consider factoring the shared configuration into a single source (or a clearly referenced base) to reduce the risk of future divergence in ADB-related exit behavior.
- Double-check that the ADB controller shutdown/exit flags and callbacks are named and structured consistently across `Interface/Scene.json` and both `SceneManager/SceneCommon.json` files so that any future changes to the exit logic affect all three configurations in the same way.

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

Hey - I've left some high level feedback:

  • Since SceneCommon.json exists in both the normal and ADB pipelines and this PR aims to keep them aligned, consider factoring the shared configuration into a single source (or a clearly referenced base) to reduce the risk of future divergence in ADB-related exit behavior.
  • Double-check that the ADB controller shutdown/exit flags and callbacks are named and structured consistently across Interface/Scene.json and both SceneManager/SceneCommon.json files so that any future changes to the exit logic affect all three configurations in the same way.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Since `SceneCommon.json` exists in both the normal and ADB pipelines and this PR aims to keep them aligned, consider factoring the shared configuration into a single source (or a clearly referenced base) to reduce the risk of future divergence in ADB-related exit behavior.
- Double-check that the ADB controller shutdown/exit flags and callbacks are named and structured consistently across `Interface/Scene.json` and both `SceneManager/SceneCommon.json` files so that any future changes to the exit logic affect all three configurations in the same way.

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 linked an issue Apr 2, 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 旨在修正“关闭 ADB 控制器导致出现退出游戏弹窗”时,SceneManager/Interface 在退出与返回链路上的行为不一致问题,以避免场景跳转链异常中断或退出逻辑错误。

Changes:

  • 调整 SceneManager 公共节点 __ScenePrivateCloseADBExit 的识别/点击逻辑。
  • 更新 Interface 的 SceneAnyEnterWorld.next 中对 __ScenePrivateCloseADBExit 的调用方式以对齐行为。
  • 为 ADB 资源补充 __ScenePrivateCloseADBExit 节点定义。

Reviewed changes

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

File Description
assets/resource/pipeline/SceneManager/SceneCommon.json 调整关闭 ADB 相关退出弹窗节点的识别与点击参数
assets/resource/pipeline/Interface/Scene.json 修改 SceneAnyEnterWorld 的 next 链路,变更对关闭 ADB 退出节点的调用方式
assets/resource_adb/pipeline/SceneManager/SceneCommon.json ADB 资源下新增 __ScenePrivateCloseADBExit 节点以对齐标准资源

@MistEO MistEO merged commit dc2acdd into v2 Apr 2, 2026
22 checks passed
@MistEO MistEO deleted the fix/si branch April 2, 2026 15:05
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.

安卓端陷入退出游戏死循环

4 participants