Skip to content

improve: [1185] 一時停止中にキャンセルされたFrzReturnを復帰後に再開するよう変更 - #2268

Merged
cwtickle merged 1 commit into
developfrom
feature/1185-pause-frz-return
Oct 19, 2026
Merged

cwtickle merged 1 commit into
developfrom
feature/1185-pause-frz-return

Conversation

@cwtickle

@cwtickle cwtickle commented Oct 19, 2026 •

Copy link
Copy Markdown
Owner

🔨 変更内容 / Details of Changes

1. improve: 一時停止中にキャンセルされたFrzReturnを復帰後に再開するよう変更

  • 一時停止中にキャンセルされたFrzReturnについて、再開後に最初からモーションするように変更しました。

🔖 関連Issue, 変更理由 / Related Issues, Reason for Changes

  1. 一時停止中にキャンセルされることで、プレイ方法によっては無効化されてしまうのを防ぐため。

📷 スクリーンショット / Screenshot

📝 その他コメント / Other Comments

@cwtickle cwtickle added the func20:Main プレイ画面全般 label Oct 19, 2026
@coderabbitai

coderabbitai Bot commented Oct 19, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Repository UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 687a99f6-7361-40ba-a8c7-4247e969a75e
📥 Commits

Reviewing files that changed from the base of the PR and between 52e0d92 and 9314607.

📒 Files selected for processing: 2
  • js/lib/dataLoader.js
  • js/lib/mainWindow.js

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

📝 Summary

Summary by CodeRabbit

  • Bug Fixes
    • Fixed the in-game return effect so it restarts after the pause countdown finishes. If gameplay ends before it resumes, the effect is cleared instead.
    • The effect now stays in sync with the current play state when pausing and returning to play, avoiding an incorrect restart after leaving the game screen.

The changes update FrzReturn state during pause and resume. They also consolidate life-state class updates for the life label and bar.

Changes: FrzReturn pause and resume

Layer / File(s) Summary
Track and restart paused FrzReturn effects
js/lib/dataLoader.js, js/lib/mainWindow.js
FrzReturn initialization resets the pause flag. Pausing an active timer sets the flag. After the resume countdown, the effect restarts and the flag clears. The flag also clears if the screen is no longer the play screen.

Life-state class updates

Layer / File(s) Summary
Update life-state classes on both elements
js/lib/mainWindow.js
changeLifeColor removes and adds the life-state class on lblLife and lifeBar through a shared iteration.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~8 minutes

Change: Bug fix

Merge Risk: ⚪ Minimal · up to 93146

The FrzReturn restart marker survives the ordinary pause/resume countdown, and no actionable merge-blocking risk is identified.

Pre-merge checks: Passed 5
Check name Status Explanation
Title check Passed The title clearly describes the main change: restarting a FrzReturn canceled during pause after play resumes.
Docstring Coverage Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 2…
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.
Description check Passed The description explains the FrzReturn pause and resume behavior that the changes implement.
Full details: Docstring Coverage

Explanation

No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 2 files.

✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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.

@cwtickle
cwtickle merged commit 39e8ae7 into develop Oct 19, 2026
4 checks passed
@cwtickle cwtickle added the need-to-fix-supportVer. サポートバージョンへの修正が必要 label Oct 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

func20:Main プレイ画面全般 need-to-fix-supportVer. サポートバージョンへの修正が必要

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant