Merged
Conversation
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…ePhase enum を追加 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Broadcast で攻撃イベントを同期し、HP バー・攻撃ボタン・ログを表示する Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
.matched を廃止し、マッチ成立で直接 .battling → BattleGameView に遷移する Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
古い放置バトルに参加してしまう問題を防ぐ Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
放置された waiting バトルに別端末が参加してしまう問題を修正 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
BattleGameView に onFinish を追加し、BattleView のセクションを private struct に分離 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
購読が完了する前に相手が参加した場合の通知見逃しを防ぐ Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
status=waiting の条件を付けて同時参加による上書きを防止する Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
player2 未設定時に最大5回リトライし、Broadcast の ready 交換後にターンを開始する Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- prepare 失敗時に phase = .lost で結果画面に遷移し戻れるようにする - broadcast を await してから勝利判定することで cleanup による消失を防ぐ - handleOpponentAttack / handleOpponentReady に phase チェックを追加 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
broadcast の await 中に相手の攻撃で .lost になった場合、 勝利判定をスキップするよう phase == .battling ガードを追加 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
相手が離脱済みのバトルに参加した場合に画面が固まる問題を修正 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
主な変更
Model/BattlePhase.swift— バトル進行状態の enumModel/BattleDTO.swift— バトル用 DTO 追加（BattleFullRow / MonsterLabelRow / BattleFinishUpdate）ViewModel/BattleViewModel.swift— バトルロジック + Broadcast 同期ViewModel/BattleMatchingViewModel.swift— マッチ成立後の自動遷移・キャンセル処理View/BattleGameView.swift— バトル UI（HP バー・攻撃ボタン・ログ）View/BattleView.swift— セクション struct 化・バトル中タブバー非表示対応した問題
Test plan
🤖 Generated with Claude Code