Skip to content

Merge:'hotfix/GameVerFlow0521'| 游戏版本跟调#290

Merged
sunyink merged 5 commits into
mainfrom
hotfix/GameVerFlow0521
May 23, 2026
Merged

Merge:'hotfix/GameVerFlow0521'| 游戏版本跟调#290
sunyink merged 5 commits into
mainfrom
hotfix/GameVerFlow0521

Conversation

@sunyink
Copy link
Copy Markdown
Owner

@sunyink sunyink commented May 23, 2026

Summary by Sourcery

为最新版本流程调整游戏界面和启动 Activity 配置。

新功能:

  • 更新游戏 Activity 流水线配置,以反映最新的游戏流程。
  • 修改启动游戏的流水线配置,使其与更新后的版本启动顺序保持一致。

改进:

  • 微调全局界面配置,以支持调整后的游戏版本行为。
Original summary in English

Summary by Sourcery

Adjust game interface and startup activity configurations for the latest version flow.

New Features:

  • Update game activity pipeline configuration to reflect the latest gameplay flow.
  • Revise start-game pipeline configuration to align with the updated version startup sequence.

Enhancements:

  • Tweak global interface configuration to support the adjusted game version behavior.

Summary by CodeRabbit

版本更新

  • 新特性
    • 游戏版本显示更新为 20260521(Dark Magica)。
    • 免费服装活动的交互与判定范围优化,提升点击与流程稳定性,体验更顺畅。
    • 新增游戏服务器维护检测:检测到维护时会停止流程并向用户显示“游戏服务器维护中”的提示。

Review Change Stack

@sourcery-ai
Copy link
Copy Markdown

sourcery-ai Bot commented May 23, 2026

审阅者指南(在小型 PR 上折叠)

审阅者指南

此 PR 更新了多个与界面、活动以及游戏启动流水线相关的游戏配置 JSON 文件,很可能是为了修复或调整某个热修版本的游戏版本流程。

按文件说明的改动

变更 详情 文件
调整游戏界面配置以与更新后的版本流程保持一致。
  • 在主界面定义 JSON 中修改界面配置结构或数值
  • 更新或新增新版本游戏流程所需的字段
  • 根据需要清理或重组界面配置项
assets/interface.json
更新游戏流程中的活动(activities)流水线配置。
  • 更改活动流水线步骤或参数以匹配新版本行为
  • 调整运行时使用的活动相关元数据或标志位
  • 在流水线定义中添加、删除或重新排序活动
assets/resource/base/pipeline/Activities.json
修改游戏启动流水线配置以支持热修版本行为。
  • 更新 StartGame 流水线中的启动步骤顺序
  • 调整控制初始游戏状态或状态转移的配置值
  • 将启动流水线中的引用与更新后的界面和活动配置对齐
assets/resource/base/pipeline/StartGame.json

提示与命令

与 Sourcery 交互

  • 触发一次新审阅: 在 pull request 中评论 @sourcery-ai review
  • 继续讨论: 直接回复 Sourcery 的审阅评论。
  • 从审阅评论生成 GitHub issue: 回复某条审阅评论,要求 Sourcery 从这条评论创建 issue。你也可以直接回复该审阅评论 @sourcery-ai issue 来从中创建 issue。
  • 生成 pull request 标题: 在 pull request 标题中任意位置写上 @sourcery-ai,即可随时生成标题。你也可以在 pull request 中评论 @sourcery-ai title 来(重新)生成标题。
  • 生成 pull request 摘要: 在 pull request 描述正文中任意位置写上 @sourcery-ai summary,即可在该位置生成 PR 摘要。你也可以在 pull request 中评论 @sourcery-ai summary 来随时(重新)生成摘要。
  • 生成审阅者指南: 在 pull request 中评论 @sourcery-ai guide,即可随时(重新)生成审阅者指南。
  • 一次性解决所有 Sourcery 评论: 在 pull request 中评论 @sourcery-ai resolve,即可将所有 Sourcery 评论标记为已解决。当你已经处理完所有评论且不想再看到它们时非常有用。
  • 一次性忽略所有 Sourcery 审阅: 在 pull request 中评论 @sourcery-ai dismiss,即可忽略所有现有的 Sourcery 审阅。尤其适合你想从头开始新的审阅时使用 —— 别忘了再评论 @sourcery-ai review 来触发新审阅!

自定义你的使用体验

前往你的 控制面板 可以:

  • 启用或禁用审阅功能,例如 Sourcery 生成的 pull request 摘要、审阅者指南等。
  • 更改审阅语言。
  • 添加、删除或编辑自定义审阅指令。
  • 调整其他审阅设置。

获取帮助

Original review guide in English
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR updates several game configuration JSON files related to interfaces, activities, and game start pipeline, likely to fix or adjust game version flow for a hotfix.

File-Level Changes

Change Details Files
Adjust game interface configuration to align with updated version flow.
  • Modify interface configuration structure or values in the main interface definition JSON
  • Update or add fields required by the new game version flow
  • Clean up or reorganize interface config entries as needed
assets/interface.json
Update activities pipeline configuration for the game flow.
  • Change activity pipeline steps or parameters to match the new version behavior
  • Adjust activity-related metadata or flags used during runtime
  • Add, remove, or reorder activities in the pipeline definition
assets/resource/base/pipeline/Activities.json
Modify game start pipeline configuration to support the hotfixed version behavior.
  • Update the sequence of startup steps in the StartGame pipeline
  • Adjust configuration values that control initial game state or transitions
  • Align start pipeline references with updated interfaces and activities configs
assets/resource/base/pipeline/StartGame.json

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 23, 2026

Caution

Review failed

Pull request was closed or merged during review

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 93cbf4e7-707c-4339-8651-8c448f98ad86

📥 Commits

Reviewing files that changed from the base of the PR and between ffe703e and 6c6ca28.

📒 Files selected for processing (1)
  • assets/resource/base/pipeline/StartGame.json

📝 Walkthrough

Walkthrough

更新界面版本标识;调整活动流程中免费衣服节点的识别区域和新增颜色匹配检查点;在启动流程多个阶段接入新建的服务器维护 OCR 检测节点并移除旧的错误节点。

变更内容

版本发布与活动流程

层 / 文件 摘要
游戏版本信息更新
assets/interface.json
界面标题中游戏版本从 20260507 ( Strange Request ) 更新为 20260521 ( Dark Magica )
免费衣服活动流程调整
assets/resource/base/pipeline/Activities.json
Activities_FreeClothing_Ty1 的 ROI 终止坐标更新以扩大识别范围;Activities_FreeClothing_Ty2 新增通向 Activities_FreeClothing_Ty2_Ck 的分支;新增 Activities_FreeClothing_Ty2_Ck 节点,使用 ColorMatch 判定并改为自循环,保留到 Activities_Index 的退出路径。

启动流程维护检测

层 / 文件 摘要
启动流程维护检测实现与集成
assets/resource/base/pipeline/StartGame.json
新增顶层节点 StartGame_GameIsMaint(OCR 识别维护/无法连接文案,执行 StopTaskfocus.toast 显示“游戏服务器维护中”,focus.aborted=true);在 StartGame_RunAppStartGame_LoadingPageStartGame_Update_Data_DownLoadingStartGame_Loadingnext 中接入该节点;删除原有 StartGame_Error_AM 节点。

🎯 2 (Simple) | ⏱️ ~12 分钟

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed PR标题明确指出主要变更是"游戏版本跟调",对应多个配置文件的版本更新和启动流程调整,涵盖了本次PR的核心目的。
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch hotfix/GameVerFlow0521

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown

@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

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (2)
assets/resource/base/pipeline/Activities.json (1)

440-467: 💤 Low value

颜色检测循环逻辑合理,但需注意边界情况。

这个节点通过颜色匹配检测按钮是否可点击(蓝色),避免点击灰色按钮,符合 PR 目标"修复潜在一直点灰色领取按钮的问题"。循环逻辑合理:持续点击直到按钮消失或变灰。

不过需要注意两个边界情况:

  1. 超时设置:节点使用默认 timeout(20秒),如果有大量奖励需要连续领取可能会超时。建议根据实际情况考虑是否需要显式设置更长的 timeout

  2. 首次进入即失败:如果首次进入时按钮就是灰色(不可点击),颜色检测会失败并导致任务报错。这可能是预期行为(没有可领取奖励时应该跳过),但建议考虑添加 on_error 处理以提供更友好的降级路径。

可选的超时与错误处理优化

如果实际运行中发现超时或错误处理不够友好,可以考虑:

 "Activities_FreeClothing_Ty2_Ck": {
     "recognition": "ColorMatch",
+    "timeout": 30000,
     "roi": "Activities_FreeClothing_Ty2",
     ...
     "next": [
         "Activities_FreeClothing_Ty2_Ck",
         "Activities_Index"
-    ]
+    ],
+    "on_error": [
+        "Activities_Index"
+    ]
 }

根据实际运行效果决定是否需要调整。

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@assets/resource/base/pipeline/Activities.json` around lines 440 - 467,
Activities_FreeClothing_Ty2_Ck 目前只靠默认 timeout 且未处理首次即为灰色的情况;请在该节点对象中显式添加一个更长的
"timeout"(例如根据最多连续领取次数设置为更高值),并增加一个合适的 "on_error" 处理(例如跳转到 "Activities_Index"
或直接结束该流程的降级路径)以避免首次检测失败时抛错;确保保留原有 "next" 循环逻辑并只在超时或颜色检测首次失败时走 "on_error" 分支。
assets/resource/base/pipeline/StartGame.json (1)

291-311: 💤 Low value

确认与 StartGame_Error_AM 的功能定位差异。

发现 StartGame_GameIsMaintStartGame_Error_AM (line 685-693) 存在功能重叠:

节点 ROI expected action 调用位置
Error_AM 无(全屏) "定期维护和更新"等 无(仅 focus 提示) RunApp, LoadingPage
GameIsMaint 有限定区域 "维护和更新"等 StopTask LoadingPage, DownLoading, Loading

差异点:

  • Error_AM 作为早期检测点,只输出错误提示但不终止任务
  • GameIsMaint 作为运行时检测点,执行 StopTask 并设置 aborted

建议:
确认这是否为预期的设计(两阶段维护检测)。如果是,建议在 doc 字段中补充说明其与 StartGame_Error_AM 的区别,避免维护时产生困惑。

根据 PR 目标中的 commit 信息:"在启动遇到停服时终止 Task",本节点的设计意图应该是清晰的,但代码注释可以更明确。

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@assets/resource/base/pipeline/StartGame.json` around lines 291 - 311,
StartGame_GameIsMaint overlaps with StartGame_Error_AM but is intended as a
runtime termination check (it uses action "StopTask" and "aborted": true) while
Error_AM only surfaces a non-fatal toast; update the JSON by adding a "doc"
field to StartGame_GameIsMaint clarifying its role as the definitive runtime
termination check (distinguish from StartGame_Error_AM early-detection
toast-only behavior), mention where it's called
(LoadingPage/DownLoading/Loading), and describe why it uses "StopTask" and
"aborted": true so reviewers understand the two-stage maintenance detection
design.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@assets/resource/base/pipeline/StartGame.json`:
- Around line 300-302: StartGame_GameIsMaint 的 expected 关键词覆盖范围太窄,导致与
StartGame_Error_AM 中的“定期维护和更新/公告事项”不一致并产生不同处理(roi/action/next);请在
StartGame_GameIsMaint 的 expected 中加入“定期维护和更新”和“公告事项”等同类短语,或将其拆分成两个条目并在需要时调整 roi
和 action(比如保留/移除 action:"StopTask" 或同步为 focus 行为),确保所有可能的维护文案都会命中同一处理逻辑并与
StartGame_Error_AM 行为保持一致。

---

Nitpick comments:
In `@assets/resource/base/pipeline/Activities.json`:
- Around line 440-467: Activities_FreeClothing_Ty2_Ck 目前只靠默认 timeout
且未处理首次即为灰色的情况;请在该节点对象中显式添加一个更长的 "timeout"(例如根据最多连续领取次数设置为更高值),并增加一个合适的
"on_error" 处理(例如跳转到 "Activities_Index" 或直接结束该流程的降级路径)以避免首次检测失败时抛错;确保保留原有 "next"
循环逻辑并只在超时或颜色检测首次失败时走 "on_error" 分支。

In `@assets/resource/base/pipeline/StartGame.json`:
- Around line 291-311: StartGame_GameIsMaint overlaps with StartGame_Error_AM
but is intended as a runtime termination check (it uses action "StopTask" and
"aborted": true) while Error_AM only surfaces a non-fatal toast; update the JSON
by adding a "doc" field to StartGame_GameIsMaint clarifying its role as the
definitive runtime termination check (distinguish from StartGame_Error_AM
early-detection toast-only behavior), mention where it's called
(LoadingPage/DownLoading/Loading), and describe why it uses "StopTask" and
"aborted": true so reviewers understand the two-stage maintenance detection
design.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 9d1043cb-7e0e-4457-a8f0-32a91754ce52

📥 Commits

Reviewing files that changed from the base of the PR and between 60b5fb2 and ffe703e.

📒 Files selected for processing (3)
  • assets/interface.json
  • assets/resource/base/pipeline/Activities.json
  • assets/resource/base/pipeline/StartGame.json

Comment on lines +300 to +302
"expected": [
"维护和更新",
"无法连接和使用游戏"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# 检查 StartGame_Error_AM 节点配置以对比 expected 差异
rg -A 10 -B 2 '"StartGame_Error_AM"' assets/resource/base/pipeline/StartGame.json

Repository: sunyink/MFABD2

Length of output: 1168


🏁 Script executed:

#!/bin/bash
# 读取 StartGame_GameIsMaint 节点以核对 expected/roi/action/next
rg -A 30 -B 2 '"StartGame_GameIsMaint"' assets/resource/base/pipeline/StartGame.json

Repository: sunyink/MFABD2

Length of output: 2376


🏁 Script executed:

#!/bin/bash
# 抓取 StartGame_Error_AM 节点完整配置,核对 expected/roi/action/next 等
rg -A 60 -B 2 '"StartGame_Error_AM"' assets/resource/base/pipeline/StartGame.json

Repository: sunyink/MFABD2

Length of output: 4122


🏁 Script executed:

#!/bin/bash
# 抓取 StartGame_Error_AM 更大范围,确认是否有 roi/action/next
rg -A 80 -B 2 '"StartGame_Error_AM"' assets/resource/base/pipeline/StartGame.json

Repository: sunyink/MFABD2

Length of output: 4935


修正 StartGame_GameIsMaint 的 expected 覆盖范围,避免维护文案识别不一致

  • StartGame_GameIsMaintexpected 仅包含“维护和更新”“无法连接和使用游戏”,但 StartGame_Error_AM 包含“定期维护和更新”“公告事项”。若实际维护页文案包含“定期维护和更新/公告事项”,StartGame_GameIsMaint 可能无法匹配。
  • StartGame_GameIsMaint 配置了较小 roi 且带 action: "StopTask";而 StartGame_Error_AM 未配置 roi/action/next(仅 focus 提示)。同一类“停机/维护”场景可能出现“停止 vs 不停止”的行为差异。
  • 建议统一/扩充 StartGame_GameIsMaintexpected 关键词以覆盖“定期维护和更新/公告事项”,或相应调整/拆分 roi,保证两种维护文案都能走到期望的处理逻辑。
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@assets/resource/base/pipeline/StartGame.json` around lines 300 - 302,
StartGame_GameIsMaint 的 expected 关键词覆盖范围太窄,导致与 StartGame_Error_AM
中的“定期维护和更新/公告事项”不一致并产生不同处理(roi/action/next);请在 StartGame_GameIsMaint 的 expected
中加入“定期维护和更新”和“公告事项”等同类短语,或将其拆分成两个条目并在需要时调整 roi 和 action(比如保留/移除
action:"StopTask" 或同步为 focus 行为),确保所有可能的维护文案都会命中同一处理逻辑并与 StartGame_Error_AM
行为保持一致。

@sunyink sunyink merged commit 299b4d3 into main May 23, 2026
18 of 19 checks passed
@sunyink sunyink deleted the hotfix/GameVerFlow0521 branch May 23, 2026 08:21
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.

1 participant