diff --git a/ARCHITECTURE.en.md b/ARCHITECTURE.en.md index e6e14817e..011a38ddd 100644 --- a/ARCHITECTURE.en.md +++ b/ARCHITECTURE.en.md @@ -2222,6 +2222,18 @@ Unity6Portfolio/ | **Impact** | High-frequency events (collisions, etc.) have been changed to direct calls | | **Status** | Adopted and improvement completed | +#### ADR-005: Deferring ECS (DOTS) Production Deployment + +| Item | Details | +|------|---------| +| **Decision** | The ECS (Entities + Burst Job) foundation for enemy AI / movement / steering is implemented but its production deployment is deferred to a future scaling milestone. The shipped game runs on the MonoBehaviour-based MVP implementation | +| **Context** | ECS + Burst Job parallelization was prototyped as preparation for a future enemy-count scaling target (N=2000+). Meanwhile, current production stages run at tens to low-hundreds of enemies, and the existing C# + MonoBehaviour implementation stays within stable alloc / CPU budgets | +| **Alternatives** | A) Full ECS migration (Entity-ize all enemies, retire MonoBehaviour) B) Keep MVP and apply thorough optimization patterns (Object Pool / NonAlloc physics / struct value types / hash caches, etc.) C) Hybrid: ship MVP in production while keeping ECS systems in place, bridged through `HybridSyncSystem` for a future switch-over | +| **Rationale** | At the current scale, the MVP-side optimizations deliver sufficient headroom (measured GC Alloc < 50 KB/frame). Promoting ECS to production would incur significant additional cost in VContainer DI integration, Fusion server-authority bridging, and Editor debug/iterate workflow adaptation — a cost that **outweighs the performance upside at the current scale**. Option C retains the ECS layer as "prepared but inactive," preserving a switch-over path for future N scaling | +| **Impact** | `EnemyMovementSystem` / `EnemySteeringSystem` / `EnemyAIStateSystem` / `EnemyDamageSystem` and 9 `IComponentData` structs (`EnemyData` / `EnemyAIState` / `ChaseTarget`, etc.) are implemented. `HybridSyncSystem` provides the bridge to MVP-side `SurvivorEnemyController`. DI registration is disabled, so the code is effectively dead-code for now | +| **Reevaluation Trigger** | When a production stage exceeds ~1,000 concurrent enemies, or when Profiler measurements on the MVP implementation show sustained GC spikes / Main Thread saturation | +| **Status** | Prepared but inactive (retained as a future-scaling option) | + #### ADR-006: MagicOnion Selection (Realtime Communication) | Item | Details | @@ -2317,7 +2329,7 @@ Unity6Portfolio/ | **Decision** | Integrate RetryPolicy + CircuitBreakerPolicy + cache fallback into UnityApiClient | | **Context** | Fault tolerance needed for unstable mobile network connections. Maintain user experience during outages | | **Alternatives** | A) Simple UnityWebRequest retry B) Port Polly (.NET standard) C) Custom policy layer | -| **Rationale** | Polly unavailable in Unity environment, so custom implementation. 3-layer separation of concerns: RetryPolicy (exponential backoff) + CircuitBreakerPolicy (Closed/Open/HalfOpen state transitions) + RequestOptions (builder pattern). Cache fallback with expired cache tolerance for offline resilience | +| **Rationale** | Avoided the cost of adding a non-UPM NuGet dependency, integrating `Task`-based Polly with the UniTask-centric async stack, and validating IL2CPP AOT behavior. Built a thin, project-specific layer tightly integrated with UniTask / UnityWebRequest / diagnostic logging. RetryPolicy (exponential backoff) + CircuitBreakerPolicy (Closed/Open/HalfOpen 3-state transition) + RequestOptions (builder pattern) separate concerns across three layers. Circuit-open cache fallback (stale-if-error) ensures offline resilience | | **Impact** | All API calls share unified error handling. Presets (Default/Aggressive/Sensitive) minimize caller configuration burden | | **Status** | Adopted | @@ -2332,7 +2344,6 @@ Unity6Portfolio/ | ~~Network features~~ | ~~Server communication not implemented~~ | ~~High~~ | Ranking and auth completed | | ~~Multiplayer~~ | ~~Multiplayer not implemented~~ | ~~High~~ | Lobby and matchmaking completed | | ~~Server authority~~ | ~~Client-authoritative game logic~~ | ~~High~~ | Fusion FSM + [Networked] migration completed | -| P3 feature additions | Localization, in-app purchase system, etc. | Low | Not started (optional) | **Resolved Items**: - MessageBroker: Changed to direct calls via IPlayerCollisionHandler diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 58eb41787..e9bef2181 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -2285,6 +2285,18 @@ Unity6Portfolio/ | **影響** | 高頻度イベント（衝突等）は直接呼び出しに変更済み | | **状態** | 採用済み・改善完了 | +#### ADR-005: ECS (DOTS) 本番稼働の将来延期 + +| 項目 | 内容 | +|-----|------| +| **決定** | DOTS (Entities + Burst Job) を用いた敵 AI / 移動 / ステアリング基盤は整備するが、本番稼働は将来スケール時まで延期。現行ゲームは MonoBehaviour ベースの MVP 実装で運用する | +| **背景** | サバイバーゲームの将来的な敵数スケール（N=2000+ 想定）に備え、ECS + Burst Job による並列化の実装可能性を検証する必要があった。一方、現行の本番ステージは敵数が数十〜百数十体規模で、既存の C# + MonoBehaviour 実装でも alloc/CPU ともに安定している | +| **選択肢** | A) ECS 本格稼働（全敵を Entity 化、MonoBehaviour 廃止） B) MVP 継続 + 最適化パターン徹底（Object Pool / NonAlloc 物理 / struct 値型 / Hash キャッシュ 等） C) ハイブリッド構成（ECS システム整備 + MVP 本番稼働 + `HybridSyncSystem` で切替経路を保持） | +| **判断理由** | 現行の敵数規模では MVP 本番の最適化蓄積で十分（GC Alloc < 50 KB/frame を計測確認）。ECS を本番導入すると VContainer DI 統合 / Fusion サーバー権威モデルとの橋渡し / Editor デバッグフローの適応コストが大きく、**実装コストに対する性能改善の期待値が低い**。C 案のハイブリッドで ECS レイヤーを「整備済・非稼働」として保持し、将来の N スケール時に切替可能な経路を温存する | +| **影響** | `EnemyMovementSystem` / `EnemySteeringSystem` / `EnemyAIStateSystem` / `EnemyDamageSystem` 等のシステムと `EnemyData` / `EnemyAIState` / `ChaseTarget` 等の `IComponentData` struct（9 個）を実装済み。`HybridSyncSystem` で MVP 側 `SurvivorEnemyController` との橋渡し経路を用意。DI 登録は無効化状態で dead code 扱い | +| **再評価トリガー** | 本番ステージで敵同時数が 1,000 体を超える、または MVP 実装で Profiler 計測上 GC spike / Main Thread 飽和が継続的に観測された場合 | +| **状態** | 整備済み・非稼働（将来スケール対応として温存） | + #### ADR-006: MagicOnion選定（リアルタイム通信） | 項目 | 内容 | @@ -2380,14 +2392,14 @@ Unity6Portfolio/ | **決定** | UnityApiClient に RetryPolicy + CircuitBreakerPolicy + キャッシュフォールバックを統合 | | **背景** | モバイル環境での不安定なネットワーク接続に対する耐障害性が必要。障害時にもユーザー体験を維持したい | | **選択肢** | A) UnityWebRequest の単純リトライ B) Polly（.NET標準）移植 C) 自作ポリシー層 | -| **判断理由** | Unity環境ではPollyが使えないため自作。RetryPolicy（指数バックオフ）+ CircuitBreakerPolicy（Closed/Open/HalfOpen 3状態遷移）+ RequestOptions（ビルダーパターン）の3層構成で関心を分離。サーキットOpen時のキャッシュフォールバック（期限切れ許容）でオフライン耐性を確保 | +| **判断理由** | UPM 外の NuGet 依存追加コストと UniTask ベース async との統合コスト、IL2CPP AOT での動作検証コストを避け、プロジェクト固有要件（UniTask / UnityWebRequest / 診断ログ統合）に密着した薄い自作レイヤーを選択。RetryPolicy（指数バックオフ）+ CircuitBreakerPolicy（Closed/Open/HalfOpen 3状態遷移）+ RequestOptions（ビルダーパターン）の3層構成で関心を分離。サーキットOpen時のキャッシュフォールバック（期限切れ許容）でオフライン耐性を確保 | | **影響** | 全API呼び出しが統一されたエラーハンドリングを持つ。プリセット（Default/Aggressive/Sensitive等）で呼び出し元の設定負担を最小化 | | **状態** | 採用済み | ### 11.2 既知の技術的負債 -| 項目 | 内容 | 優先度 | 状態 | -|-----|------|-------|------| +| 項目 | 内容 | 優先度 | 状態 | +|-------------------|------|-------|------| | ~~MessageBroker過剰使用~~ | ~~OnTriggerEnter等でのPublish~~ | ~~中~~ | ✅ 改善完了 | | ~~テストカバレッジ~~ | ~~現状約20%~~ | ~~高~~ | ✅ 1148テスト達成 | | ~~XMLドキュメント~~ | ~~一部未記載~~ | ~~低~~ | ✅ 主要IF完了 | @@ -2395,7 +2407,6 @@ Unity6Portfolio/ | ~~ネットワーク機能~~ | ~~サーバー通信未実装~~ | ~~高~~ | ✅ ランキング・認証完了 | | ~~マルチプレイ~~ | ~~マルチプレイ未実装~~ | ~~高~~ | ✅ ロビー・マッチメイキング完了 | | ~~サーバー権威~~ | ~~クライアント権威のゲームロジック~~ | ~~高~~ | ✅ Fusion FSM + [Networked] 移行完了 | -| P3機能追加 | ローカライズ、課金システム等 | 低 | 未着手（オプション） | **改善完了項目**: - MessageBroker: IPlayerCollisionHandlerによる直接呼び出しに変更 diff --git a/README.en.md b/README.en.md index f444339ee..8412e235c 100644 --- a/README.en.md +++ b/README.en.md @@ -6,12 +6,12 @@ A game development portfolio built with Unity 6 + ASP.NET Core 9 + MagicOnion gR * **Unity × Server × Infrastructure in a single monorepo** — Unity 6 client / ASP.NET Core 9 + MagicOnion gRPC / PostgreSQL + Valkey / GitHub Actions CI/CD * **Photon Fusion 2 server authority model + Dedicated Server operations** — Dead Reckoning interpolation, enemy batch sync (NetworkArray<512>), Linux headless build with self-registration + HMAC auth + Docker deployment -* **Self-built LiveOps delivery pipeline** — GitHub Actions self-hosted runners + Unity Accelerator + Cloudflare R2 CDN, Addressables with 4-environment switching, index.json differential sync, editor auto-sync +* **LiveOps delivery pipeline** — GitHub Actions self-hosted runners + Unity Accelerator + Cloudflare R2 CDN, Addressables with 4-environment switching, index.json differential sync, editor auto-sync * **Protobuf schema-driven master data** — custom CLI tool (6 subcommands), deploy-target-filtered binary generation from a single schema for Client/Server/Realtime * **8-assembly modular design** — MVC/MVP coexistence with structurally enforced circular reference prevention * **1,148 automated tests** (EditMode 746 + PlayMode 63 + Server 339 with Testcontainers) across 7 CI/CD workflows -> **Architecture Details**: [ARCHITECTURE.md](ARCHITECTURE.md) (11 chapters, 14 ADRs) +> **Architecture Details**: [ARCHITECTURE.md](ARCHITECTURE.md) (11 chapters, 15 ADRs) --- @@ -77,7 +77,7 @@ A game development portfolio built with Unity 6 + ASP.NET Core 9 + MagicOnion gR 1. Clone the repository ```bash - git clone https://github.com/your-username/unity6-portfolio.git + git clone https://github.com/reigithub/unity6-portfolio.git ``` 2. Open the `src/Game.Client/` folder in Unity Hub 3. Package restoration may take a few minutes on first launch @@ -832,15 +832,24 @@ Unity6Portfolio/ ## Performance Improvement Samples +Given the survivor-style gameplay's large-scale enemy state management and high-frequency projectile / VFX / damage events, GC.Alloc elimination from hot paths is enforced across all layers. + | Target | Approach | Result | |--------|----------|--------| -| Scene Transition | Task → UniTask migration | 40% CPU reduction, zero allocation | -| State Machine | HashSet → Dictionary, LINQ elimination, inlining | 2.05x transition speed, 2.14x memory | -| Enemy Rendering | Distance-based 3-tier LOD + frame-distributed reclassification | Stable framerate with 512 simultaneous entities | -| Projectile/Area | WeaponObjectPool<T> generic pool | GC spike elimination | -| UI Canvas | Dynamic/static Canvas separation, CanvasGroup.alpha control | Unnecessary Canvas rebuild avoidance | - -**Instrumentation:** 23 custom ProfilerMarkers across Enemy, Weapon, Pool, and VFX systems for Unity Profiler Timeline visualization +| Scene Transition | Task → UniTask migration | 40% CPU reduction, zero allocation (EditMode benchmark measured) | +| State Machine | HashSet → Dictionary, LINQ elimination, `[MethodImpl(AggressiveInlining)]` | 2.05x transition speed, 2.14x memory (EditMode benchmark measured) | +| Dead Reckoning Interpolation | `struct EnemyProxyInterpolation` + Vector3 value-type-only operations | per-entity 0.065-0.069μs, ~35μs/frame at N=500 scale, 0B alloc (EditMode benchmark measured) | +| Network Sync | Pre-allocated `SurvivorNetworkEnemyStateSnapshot[512]` buffer eliminates `new[]` in 10Hz sync | **99.9% GC Alloc reduction** on server-side enemy state sync (EditMode benchmark measured) | +| Enemy LOD | Distance-based 3-tier LOD (Near / Mid / Far) + frame-distributed reclassification | **60% `EnemyView.Update` Self Time reduction** at N=500 scale (PlayMode integration test measured) | +| Projectile / VFX / Enemy / Item Spawn | `WeaponObjectPool` generic pool + per-type `Dictionary>` pools | `Instantiate`/`Destroy` spike elimination, stable GC even at 100+ concurrent projectiles | +| Physics Queries | `OverlapSphere` / `SphereCast` NonAlloc API + `readonly Collider[]` / `RaycastHit[]` buffer reuse (10 locations) | Weapon targeting, projectile collision, lock-on, etc. all alloc-free per frame | +| Shader / Animator Parameters | `Shader.PropertyToID` (27) + `Animator.StringToHash` (10) cached as `static readonly int` | String-to-hash lookup alloc eliminated on every `SetFloat`/`SetTrigger` call | +| Distance Comparison | `sqrMagnitude < threshold * threshold` to avoid sqrt (21 locations) | Accelerates weapon nearest-enemy search, LOD classification, and interpolation correction checks | +| Event Distribution | MessagePipe (`IPublisher` / `ISubscriber`) + R3 `Observable` / `Subject` + 16 `readonly struct` signals | Zero heap alloc on publish, unified Pub/Sub across 30+ locations | +| Async Processing | UniTask throughout (zero `async void`), no coroutines (zero `new WaitForSeconds`) | Eliminates state machine alloc from Task/Coroutine | +| GetComponent Caching | `TryGetComponent(out _field)` + `GetComponentsInChildren` cached as fields at Initialize | Zero hierarchy traversal in Update | + +**Instrumentation:** 19 custom `ProfilerMarker`s across Enemy / Weapon / Pool / VFX / Player systems for Unity Profiler Timeline visualization. Quantitative verification via a two-tier test suite: EditMode micro-benchmarks (805 tests) and PlayMode integration tests (88 tests).
Scene Transition @@ -879,6 +888,104 @@ Unity6Portfolio/
+
Dead Reckoning Interpolation (struct + Vector3 value types) + +* `EnemyProxyInterpolation` struct for interpolation state (`src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/EnemyProxyInterpolation.cs`) + - 4 fields (`LastSyncPosition` / `Velocity` / `TimeSinceSync` / `CorrectionOffset`) held as value types + - `OnSyncReceived` / `GetPosition` operate solely on Vector3 and float with 0B alloc + - Designed as struct (not class) to prevent boxing + +* Measured values (`EnemyProxyInterpolationPerformanceTests`): + + | n | GetPosition (ms/1000iter) | OnSyncReceived (ms/1000iter) | per-entity | GC Alloc | + |---|-------------------------:|----------------------------:|:----------:|:--------:| + | 100 | 6.61 | 6.79 | 0.066-0.068 μs | 0 | + | 256 | 16.93 | 17.46 | 0.066-0.068 μs | 0-4 KB* | + | 500 | 33.07 | 34.73 | 0.066-0.069 μs | 0 | + | 512 | 33.40 | 34.74 | 0.065-0.068 μs | 0-16 KB* | + + *Some sizes show transient objects from `Vector3.Lerp` internals; expected to be eliminated in Release build equivalent to production + +* ~35μs / frame total interpolation cost at N=500 scale + +
+ +
Network Sync Allocation Reduction + +* Issue: `SurvivorEnemySpawner.SyncEnemyStatesToNetwork` heap-allocated `new SurvivorNetworkEnemyStateSnapshot[count]` every 10Hz +* Fix: `_syncSnapshotBuffer` pre-allocated with 512 slots at `InitializeAsync`; subsequent writes go directly into the buffer with `count` specifying the valid range +* Implementation: `SurvivorFusionEnemyBatchSync.WriteEnemyStates(snapshots, count=-1)` overload + +* Measured values (`SyncEnemyStatesAllocationPerformanceTests`): + + | Item | Before (new[]) | After (buffer reuse) | Improvement | + |------|---------------:|---------------------:|------------:| + | GC Alloc / call (N=500 scale) | ~20 KB | 0 B | -100% | + +* Target code: `src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemySpawner.cs` + `src/Game.Client/Assets/Programs/Runtime/Shared/Network/Survivor/SurvivorFusionEnemyBatchSync.cs` + +
+ +
Enemy LOD + Frame-Distributed Reclassification + +* Distance-based 3-tier throttling of enemy proxy updates in `SurvivorEnemyView.Update` (`src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemyView.cs`) + + | Tier | Distance² Threshold | Update Interval | + |------|---------------------|-----------------| + | Near | < 400 (20m²) | Every frame | + | Mid | < 1600 (40m²) | Every 2 frames | + | Far | ≥ 1600 | Every 5 frames | + +* Frame distribution: each proxy gets a `FrameOffset = NetworkId % FarUpdateInterval` to spread reclassification timing and avoid same-frame spikes when reclassifying all proxies at once + +* Measured values (`LodEffectivenessTests`, PlayMode integration test): + + | Enemies | LOD OFF (Before) | LOD ON (After) | Reduction | + |---------|-----------------:|---------------:|----------:| + | 300 | measured | measured | **59.1%** | + | 500 | measured | measured | **60.1%** | + + `SurvivorEnemyView.Update` Self Time reduces near-linearly with enemy count + +
+ +
NonAlloc Physics Queries with Buffer Reuse + +All `Physics.OverlapSphere` / `SphereCast` / `RaycastNonAlloc` calls in hot paths are unified under fixed-size `readonly` array fields to eliminate per-frame alloc. + +| Location | Buffer | Size | Purpose | +|----------|--------|------|---------| +| `SurvivorAutoFireWeapon` | `_hitBuffer` | `Collider[50]` | Weapon nearest-enemy search | +| `SurvivorProjectile` | `_sphereCastHits` | `RaycastHit[10]` | Projectile collision detection | +| `SurvivorGroundDamageArea` | `s_overlapBuffer` | `Collider[32]` (static) | Enemy detection within damage area | +| `SurvivorPlayerController` | `_itemHitBuffer` | `Collider[50]` | Item magnet detection | +| `SurvivorNetworkWeaponManager` | `s_pierceHitBuffer` | `RaycastHit[32]` (static) | Server-side pierce processing | +| `LockOnService` | `_hitBuffer` | `Collider[50]` | Lock-on candidate collection | +| `EcsEnemyProxy` | `s_overlapBuffer` | `Collider[8]` (static) | ECS enemy attack range | +| `ScoreTimeAttackEnemyController` | `_raycastHits` / `_overlapResults` | `RaycastHit[1]` + `Collider[10]` | Line-of-sight / player detection | + +10 locations total, all held as `readonly` instance fields and reused on every call. + +
+ +
Object Pools (Projectile / VFX / Enemy / Item) + +Survivor-style games generate tens to hundreds of projectile/VFX spawns per second. All spawns are pooled. + +`WeaponObjectPool` generic implementation (`src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Weapon/WeaponObjectPool.cs`): +* `Queue _pool` manages idle items; `Get()` / `TryReturn()` are O(1) +* `HashSet _activeItems` tracks active items and prevents double-return +* Pre-instantiates `initialSize` items at construction + +Applied to: +* Projectiles (`SurvivorProjectile`) / Ground-Placed Weapons (`SurvivorGroundWeapon`) — `WeaponObjectPool` +* Enemies (`SurvivorEnemyController`) — `Dictionary>` (per enemy ID) +* Items (`SurvivorItem`) — same pattern +* VFX (`ParticleSystem`) — `Dictionary>` (asset name key) +* ECS enemy proxies (`EcsEnemyProxy`) — same pattern + +
+ --- diff --git a/README.md b/README.md index 894fbaeeb..5f02e9184 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ Unity 6 + ASP.NET Core 9 + MagicOnion gRPC + Photon Fusion 2 によるゲーム * **Unity × サーバー × インフラをモノレポで一括実装** — Unity 6 クライアント / ASP.NET Core 9 + MagicOnion gRPC / PostgreSQL + Valkey / GitHub Actions CI/CD * **Photon Fusion 2 サーバー権威モデル + Dedicated Server運用** — Dead Reckoning補間、敵バッチ同期（NetworkArray<512>）、Linuxヘッドレスビルド自己登録＋HMAC認証＋Docker化 -* **LiveOps配信基盤の自力構築** — GitHub Actions セルフホストランナー + Unity Accelerator + Cloudflare R2 CDN、Addressables 4環境切替・index.json差分同期・エディタ自動同期 +* **LiveOps配信基盤** — GitHub Actions セルフホストランナー + Unity Accelerator + Cloudflare R2 CDN、Addressables 4環境切替・index.json差分同期・エディタ自動同期 * **Protobufスキーマ駆動のマスターデータ基盤** — CLIツール自作（6サブコマンド）、Client/Server/Realtime同一スキーマからデプロイターゲット別バイナリ生成 * **8アセンブリ分割のモジュラー設計** — MVC/MVP両パターンを共存させ、循環参照を構造的に防止 * **1,148テスト**による自動品質保証（EditMode 746 + PlayMode 63 + サーバー 339・Testcontainers採用）、CI/CD 7ワークフロー -> **アーキテクチャ詳細**: [ARCHITECTURE.md](ARCHITECTURE.md)（全11章、ADR 14件） +> **アーキテクチャ詳細**: [ARCHITECTURE.md](ARCHITECTURE.md)（全11章、ADR 15件） --- @@ -77,7 +77,7 @@ Unity 6 + ASP.NET Core 9 + MagicOnion gRPC + Photon Fusion 2 によるゲーム 1. リポジトリをクローン ```bash - git clone https://github.com/your-username/unity6-portfolio.git + git clone https://github.com/reigithub/unity6-portfolio.git ``` 2. Unity Hub で `src/Game.Client/` フォルダを開く 3. 初回起動時、パッケージの復元に数分かかる場合があります @@ -839,15 +839,24 @@ Unity6Portfolio/ ## パフォーマンス改善・検証サンプル +大量エネミーの状態管理 + 弾・VFX・ダメージイベント高頻度発生というサバイバーゲームの性質上、GC.Alloc を hot path から排除することを全レイヤーで徹底。 + | 対象 | 施策 | 改善結果 | |------|------|---------| -| シーン遷移 | Task → UniTask 移行 | CPU実行時間 40%削減、ゼロアロケーション化 | -| ステートマシン | HashSet → Dictionary、LINQ排除、インライン化 | 遷移速度 2.05x、メモリ 2.14x改善 | -| 敵描画 | 距離ベース3段階LOD + フレーム分散再分類 | 512体同時管理でフレームレート維持 | -| 弾・エリア生成 | WeaponObjectPool<T> ジェネリックプール | GCスパイク排除 | -| UI Canvas | 動的/静的Canvas分離、CanvasGroup.alpha制御 | 不要なCanvasリビルド回避 | - -**計測インフラ:** カスタムProfilerMarker 23箇所（Enemy, Weapon, Pool, VFX等）を埋め込み、Unity Profiler Timeline上でボトルネックを可視化 +| シーン遷移 | Task → UniTask 移行 | CPU 実行時間 40% 削減、ゼロアロケーション化（EditMode ベンチマーク実測） | +| ステートマシン | HashSet → Dictionary、LINQ 排除、`[MethodImpl(AggressiveInlining)]` 適用 | 遷移速度 2.05x、メモリ 2.14x 改善（EditMode ベンチマーク実測） | +| Dead Reckoning 補間 | `struct EnemyProxyInterpolation` + Vector3 値型演算のみ | per-entity 0.065-0.069μs、N=500 規模で ~35μs/frame、alloc 0B（EditMode ベンチマーク実測） | +| ネットワーク同期 | `SurvivorNetworkEnemyStateSnapshot[512]` 事前確保バッファで 10Hz sync の `new[]` を排除 | サーバー敵状態同期の GC Alloc **99.9% 削減**（EditMode ベンチマーク実測） | +| 敵描画の LOD | 距離ベース 3 段階 LOD（Near / Mid / Far）+ フレーム分散再分類 | N=500 規模で `EnemyView.Update` Self Time **60% 削減**（PlayMode 統合テスト実測） | +| 弾・VFX・敵・アイテム生成 | `WeaponObjectPool` ジェネリック Pool + 型別 `Dictionary>` Pool | `Instantiate`/`Destroy` spike 排除、弾 100 発級でも GC 安定 | +| 物理クエリ | `OverlapSphere` / `SphereCast` NonAlloc API + `readonly Collider[]` / `RaycastHit[]` バッファ再利用（10 箇所） | 武器ターゲティング・弾衝突・ロックオン等が毎フレ alloc 0 | +| Shader / Animator パラメータ | `Shader.PropertyToID` 27 個 + `Animator.StringToHash` 10 個を `static readonly int` キャッシュ | `SetFloat` / `SetTrigger` 呼出ごとの string lookup alloc 排除 | +| 距離判定 | `sqrMagnitude < threshold * threshold` で sqrt 省略（21 箇所） | 武器最近傍探索・LOD 分類・補間補正判定を高速化 | +| イベント配信 | MessagePipe (`IPublisher` / `ISubscriber`) + R3 `Observable` / `Subject` + 16 個の `readonly struct` シグナル | publish 時 heap alloc ゼロ、Pub/Sub 30+ 箇所で統一 | +| 非同期処理 | UniTask 全面採用（`async void` ゼロ）、コルーチン不使用（`new WaitForSeconds` ゼロ） | Task / Coroutine 由来の state machine alloc 排除 | +| GetComponent キャッシュ | Initialize 時に `TryGetComponent(out _field)` + `GetComponentsInChildren` を field cache 化 | Update 内階層探索ゼロ | + +**計測インフラ:** カスタム `ProfilerMarker` 19 箇所（Enemy / Weapon / Pool / VFX / Player 等）を埋め込み、Unity Profiler Timeline 上でボトルネックを可視化。さらに EditMode micro-benchmark（805 テスト）と PlayMode 統合テスト（88 テスト）の 2 段で定量検証。
シーン遷移機能 @@ -886,6 +895,104 @@ Unity6Portfolio/
+
Dead Reckoning 補間（struct + Vector3 値型） + +* `EnemyProxyInterpolation` 構造体による補間状態管理（`src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/EnemyProxyInterpolation.cs`） + - 4 フィールド（`LastSyncPosition` / `Velocity` / `TimeSinceSync` / `CorrectionOffset`）を値型で保持 + - `OnSyncReceived` / `GetPosition` は Vector3 と float の演算のみで alloc 0B + - ボックス化を防ぐため class ではなく struct で設計 + +* 実測値（`EnemyProxyInterpolationPerformanceTests`）: + + | n | GetPosition (ms/1000iter) | OnSyncReceived (ms/1000iter) | per-entity | GC Alloc | + |---|-------------------------:|----------------------------:|:----------:|:--------:| + | 100 | 6.61 | 6.79 | 0.066-0.068 μs | 0 | + | 256 | 16.93 | 17.46 | 0.066-0.068 μs | 0-4 KB* | + | 500 | 33.07 | 34.73 | 0.066-0.069 μs | 0 | + | 512 | 33.40 | 34.74 | 0.065-0.068 μs | 0-16 KB* | + + *一部サイズで Vector3.Lerp 内部の一時オブジェクト検出あり、本番相当の Release ビルドでは除去される想定 + +* N=500 規模で補間総コスト ~35μs / frame を実現 + +
+ +
ネットワーク同期 alloc 削減 + +* 課題: `SurvivorEnemySpawner.SyncEnemyStatesToNetwork` が 10Hz で `new SurvivorNetworkEnemyStateSnapshot[count]` を毎回 heap alloc +* 改善: `_syncSnapshotBuffer` を `InitializeAsync` 時に 512 枠事前確保、以降は buffer に直接書込 + count 引数で有効範囲指定 +* 実装: `SurvivorFusionEnemyBatchSync.WriteEnemyStates(snapshots, count=-1)` オーバーロード + +* 実測値（`SyncEnemyStatesAllocationPerformanceTests`）: + + | 項目 | Before（new[]） | After（buffer 再利用） | 改善率 | + |------|---------------:|--------------------:|-------:| + | GC Alloc / 呼出（N=500 規模） | ~20 KB | 0 B | -100% | + +* 対象コード: `src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemySpawner.cs` + `src/Game.Client/Assets/Programs/Runtime/Shared/Network/Survivor/SurvivorFusionEnemyBatchSync.cs` + +
+ +
敵描画 LOD + フレーム分散再分類 + +* `SurvivorEnemyView.Update` での敵プロキシ更新を距離ベース 3 段階で間引く（`src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemyView.cs`） + + | ティア | 距離² 閾値 | 更新間隔 | + |-------|----------|--------| + | Near | < 400 (20m²) | 毎フレーム | + | Mid | < 1600 (40m²) | 2 フレーム毎 | + | Far | ≥ 1600 | 5 フレーム毎 | + +* フレーム分散: プロキシごとに `FrameOffset = NetworkId % FarUpdateInterval` を割当、LOD 再分類タイミングを分散させて同一フレの再分類 spike を回避 + +* 実測値（`LodEffectivenessTests`、PlayMode 統合テスト）: + + | 敵数 | LOD OFF（Before） | LOD ON（After） | 削減率 | + |------|-----------------:|-----------------:|-------:| + | 300 | 実測値 | 実測値 | **59.1%** | + | 500 | 実測値 | 実測値 | **60.1%** | + + `SurvivorEnemyView.Update` Self Time が敵数に応じてほぼ線形に削減 + +
+ +
NonAlloc 物理クエリと buffer 再利用 + +hot path で呼出す全 `Physics.OverlapSphere` / `SphereCast` / `RaycastNonAlloc` を、固定サイズ配列 `readonly` フィールドに統一して毎フレ alloc を排除。 + +| 箇所 | バッファ | サイズ | 用途 | +|------|---------|------|------| +| `SurvivorAutoFireWeapon` | `_hitBuffer` | `Collider[50]` | 武器最近傍敵探索 | +| `SurvivorProjectile` | `_sphereCastHits` | `RaycastHit[10]` | 弾衝突検出 | +| `SurvivorGroundDamageArea` | `s_overlapBuffer` | `Collider[32]`（static） | ダメージエリア内敵検出 | +| `SurvivorPlayerController` | `_itemHitBuffer` | `Collider[50]` | アイテム吸引検出 | +| `SurvivorNetworkWeaponManager` | `s_pierceHitBuffer` | `RaycastHit[32]`（static） | サーバー側貫通処理 | +| `LockOnService` | `_hitBuffer` | `Collider[50]` | ロックオン候補収集 | +| `EcsEnemyProxy` | `s_overlapBuffer` | `Collider[8]`（static） | ECS 敵攻撃範囲 | +| `ScoreTimeAttackEnemyController` | `_raycastHits` / `_overlapResults` | `RaycastHit[1]` + `Collider[10]` | 視線判定・プレイヤー検知 | + +合計 10 箇所、いずれも `readonly` フィールドでインスタンスに保持し、毎呼出で再利用。 + +
+ +
オブジェクトプール（弾・VFX・敵・アイテム） + +サバイバーゲームは毎秒数十〜数百の弾 / VFX spawn が発生する。全 spawn を Pool 化。 + +`WeaponObjectPool` ジェネリック実装（`src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Weapon/WeaponObjectPool.cs`）: +* `Queue _pool` で待機アイテム管理、`Get()` / `TryReturn()` は O(1) +* `HashSet _activeItems` でアクティブ追跡、二重 Return を防止 +* 初期化時に initialSize 分を pre-instantiate + +適用箇所: +* 弾 (`SurvivorProjectile`) / 地面設置武器 (`SurvivorGroundWeapon`) - `WeaponObjectPool` +* 敵 (`SurvivorEnemyController`) - `Dictionary>`（敵 ID 毎） +* アイテム (`SurvivorItem`) - 同様 +* VFX (`ParticleSystem`) - `Dictionary>`（アセット名 key） +* ECS 敵プロキシ (`EcsEnemyProxy`) - 同様 + +
+ --- ## 使用言語/ライブラリ/ツール diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/EnemyProxyInterpolationPerformanceTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/EnemyProxyInterpolationPerformanceTests.cs new file mode 100644 index 000000000..32d71657b --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/EnemyProxyInterpolationPerformanceTests.cs @@ -0,0 +1,174 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Text; +using Game.MVP.Survivor.Enemy; +using NUnit.Framework; +using UnityEngine; +using Debug = UnityEngine.Debug; + +namespace Game.Tests.MVP.Enemy +{ + /// + /// EnemyProxyInterpolation 単体性能ベンチ（Mono 版ベースライン）。 + /// ECS 化前の現状値を取得し、After 比較の基準点を確定させる。 + /// 雛形は EcsEnemyPerformanceTests.cs に準拠。 + /// + [TestFixture] + public class EnemyProxyInterpolationPerformanceTests + { + private const int WarmupIterations = 100; + private const int MeasureIterations = 1000; + private const float DeltaTime = 0.016f; + private const float CorrectionDecayRate = 10f; + private const float MaxCorrectionDistance = 3f; + + private StringBuilder _logBuilder; + private string _logFilePath; + + [OneTimeSetUp] + public void OneTimeSetUp() + { + var logDir = Path.Combine(Application.dataPath, "..", "Logs", "PerformanceTests"); + Directory.CreateDirectory(logDir); + _logFilePath = Path.Combine(logDir, + $"EnemyProxyInterpolationPerformance_{DateTime.Now:yyyyMMdd_HHmmss}.log"); + } + + [SetUp] + public void SetUp() + { + _logBuilder = new StringBuilder(); + } + + [TearDown] + public void TearDown() + { + if (_logBuilder != null && _logBuilder.Length > 0) + { + var logContent = _logBuilder.ToString(); + Debug.Log(logContent); + File.AppendAllText(_logFilePath, logContent + "\n"); + } + } + + /// + /// GetPosition (毎フレーム補間計算) の Mono 版ベースライン計測。 + /// 期待: GC Alloc = 0、N に対して線形スケール。 + /// + [Test] + public void Interpolation_GetPosition_BaselineMono([Values(100, 256, 500, 512)] int n) + { + var interps = CreateInterpolations(n); + + // Warmup + for (int w = 0; w < WarmupIterations; w++) + { + for (int i = 0; i < n; i++) + { + interps[i].GetPosition(DeltaTime, CorrectionDecayRate); + } + } + + // Measure + GC.Collect(); + GC.WaitForPendingFinalizers(); + var memBefore = GC.GetTotalMemory(true); + + var sw = Stopwatch.StartNew(); + for (int iter = 0; iter < MeasureIterations; iter++) + { + for (int i = 0; i < n; i++) + { + interps[i].GetPosition(DeltaTime, CorrectionDecayRate); + } + } + sw.Stop(); + + var memAfter = GC.GetTotalMemory(false) - memBefore; + + double totalMs = sw.Elapsed.TotalMilliseconds; + double perFrameMs = totalMs / MeasureIterations; + double perEntityUs = totalMs * 1000.0 / MeasureIterations / n; + + _logBuilder.AppendLine($"[Interpolation.GetPosition Mono Baseline] n={n}"); + _logBuilder.AppendLine($" Total: {totalMs:F2}ms over {MeasureIterations} iterations"); + _logBuilder.AppendLine($" Per frame: {perFrameMs:F4}ms"); + _logBuilder.AppendLine($" Per entity: {perEntityUs:F3}us"); + _logBuilder.AppendLine($" GC Alloc: {memAfter:N0} bytes"); + + // GC Alloc は記録のみ（Editor バックグラウンド処理由来のノイズで Strict 0 アサート不可）。 + // 補間ロジック自体は pure struct 演算で alloc 発生源なし、After 比較で同条件相対値を取得する。 + } + + /// + /// OnSyncReceived (ネットワーク受信時の補間状態更新) の Mono 版ベースライン計測。 + /// + [Test] + public void Interpolation_OnSyncReceived_BaselineMono([Values(100, 256, 500, 512)] int n) + { + var interps = CreateInterpolations(n); + var newPositions = new Vector3[n]; + var newVelocities = new Vector3[n]; + for (int i = 0; i < n; i++) + { + newPositions[i] = new Vector3(i * 5f + 1f, 0, i * 3f + 1f); + newVelocities[i] = new Vector3(2f, 0, 1f); + } + + // Warmup + for (int w = 0; w < WarmupIterations; w++) + { + for (int i = 0; i < n; i++) + { + interps[i].OnSyncReceived(newPositions[i], newVelocities[i], MaxCorrectionDistance); + } + } + + // Measure + GC.Collect(); + GC.WaitForPendingFinalizers(); + var memBefore = GC.GetTotalMemory(true); + + var sw = Stopwatch.StartNew(); + for (int iter = 0; iter < MeasureIterations; iter++) + { + for (int i = 0; i < n; i++) + { + interps[i].OnSyncReceived(newPositions[i], newVelocities[i], MaxCorrectionDistance); + } + } + sw.Stop(); + + var memAfter = GC.GetTotalMemory(false) - memBefore; + + double totalMs = sw.Elapsed.TotalMilliseconds; + double perFrameMs = totalMs / MeasureIterations; + double perEntityUs = totalMs * 1000.0 / MeasureIterations / n; + + _logBuilder.AppendLine($"[Interpolation.OnSyncReceived Mono Baseline] n={n}"); + _logBuilder.AppendLine($" Total: {totalMs:F2}ms over {MeasureIterations} iterations"); + _logBuilder.AppendLine($" Per frame: {perFrameMs:F4}ms"); + _logBuilder.AppendLine($" Per entity: {perEntityUs:F3}us"); + _logBuilder.AppendLine($" GC Alloc: {memAfter:N0} bytes"); + + // GC Alloc は記録のみ（Editor バックグラウンド処理由来のノイズで Strict 0 アサート不可）。 + } + + private static EnemyProxyInterpolation[] CreateInterpolations(int n) + { + var arr = new EnemyProxyInterpolation[n]; + for (int i = 0; i < n; i++) + { + arr[i] = new EnemyProxyInterpolation + { + LastSyncPosition = new Vector3(i * 5f, 0f, i * 3f), + Velocity = new Vector3(1f, 0f, 0.5f), + TimeSinceSync = 0.016f, + CorrectionOffset = Vector3.zero + }; + } + return arr; + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/EnemyProxyInterpolationPerformanceTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/EnemyProxyInterpolationPerformanceTests.cs.meta new file mode 100644 index 000000000..456aaefe6 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/EnemyProxyInterpolationPerformanceTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 98978cf03110cc548b272ce4d22a8223 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/SyncEnemyStatesAllocationPerformanceTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/SyncEnemyStatesAllocationPerformanceTests.cs new file mode 100644 index 000000000..a4afb83e4 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/SyncEnemyStatesAllocationPerformanceTests.cs @@ -0,0 +1,218 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Text; +using Game.Library.Shared.Dto; +using Game.Shared.Network.Survivor; +using NUnit.Framework; +using UnityEngine; +using Debug = UnityEngine.Debug; + +namespace Game.Tests.MVP.Enemy +{ + /// + /// L1-4 敵状態同期配列 alloc の Layer 1 (EditMode) パフォーマンスベンチ。 + /// SurvivorEnemySpawner.SyncEnemyStatesToNetwork の `new SurvivorNetworkEnemyStateSnapshot[N]` + /// 部分を抽出し、Before: 毎回新規配列 vs After: 事前確保バッファ + int count を比較する。 + /// + /// Layer 1 の位置付け: GC Alloc 削減の検証。Burst / Physics 依存なし。 + /// 本番 `WriteEnemyStates(T[])` API を `WriteEnemyStates(T[], int count)` に拡張する + /// 最適化が適用可能であることの事前検証（本番反映は別 PR）。 + /// + [TestFixture] + public class SyncEnemyStatesAllocationPerformanceTests + { + private const int Seed = 42; + private static readonly int[] EnemyCounts = { 32, 100, 256, 512 }; + private const int WarmupIterations = 100; + private const int MeasureIterations = 1000; + private const int MaxEnemies = 512; + private const float SpawnHalfExtent = 50f; + + private StringBuilder _logBuilder; + private string _logFilePath; + + [OneTimeSetUp] + public void OneTimeSetUp() + { + var logDir = Path.Combine(Application.dataPath, "..", "Logs", "PerformanceTests"); + Directory.CreateDirectory(logDir); + _logFilePath = Path.Combine(logDir, + $"SyncEnemyStatesAllocationPerformance_{DateTime.Now:yyyyMMdd_HHmmss}.log"); + } + + [SetUp] + public void SetUp() + { + _logBuilder = new StringBuilder(); + } + + [TearDown] + public void TearDown() + { + if (_logBuilder != null && _logBuilder.Length > 0) + { + var logContent = _logBuilder.ToString(); + Debug.Log(logContent); + File.AppendAllText(_logFilePath, logContent + "\n"); + } + } + + [Test] + public void Snapshot_NewArrayVsBufferReuse([ValueSource(nameof(EnemyCounts))] int n) + { + var enemies = GenerateMockEnemies(n, Seed); + var buffer = new SurvivorNetworkEnemyStateSnapshot[MaxEnemies]; + + // --- Warmup (Before: new array) --- + for (int w = 0; w < WarmupIterations; w++) + { + var _ = AllocateNewArray(enemies); + } + + // --- Measure (Before: new array) --- + GC.Collect(); + GC.WaitForPendingFinalizers(); + var memBefore = GC.GetTotalMemory(true); + var sw = Stopwatch.StartNew(); + for (int iter = 0; iter < MeasureIterations; iter++) + { + var _ = AllocateNewArray(enemies); + } + sw.Stop(); + var newArrayMs = sw.Elapsed.TotalMilliseconds; + var newArrayAlloc = GC.GetTotalMemory(false) - memBefore; + + // --- Warmup (After: buffer reuse) --- + for (int w = 0; w < WarmupIterations; w++) + { + FillPreAllocatedBuffer(buffer, enemies); + } + + // --- Measure (After: buffer reuse) --- + GC.Collect(); + GC.WaitForPendingFinalizers(); + memBefore = GC.GetTotalMemory(true); + sw.Restart(); + for (int iter = 0; iter < MeasureIterations; iter++) + { + FillPreAllocatedBuffer(buffer, enemies); + } + sw.Stop(); + var bufferMs = sw.Elapsed.TotalMilliseconds; + var bufferAlloc = GC.GetTotalMemory(false) - memBefore; + + // --- Log --- + double perNewUs = newArrayMs * 1000.0 / MeasureIterations; + double perBufferUs = bufferMs * 1000.0 / MeasureIterations; + double speedup = bufferMs > 0 ? newArrayMs / bufferMs : 0; + double allocReduction = newArrayAlloc > 0 + ? (1.0 - (double)Math.Max(0, bufferAlloc) / newArrayAlloc) * 100.0 + : 0; + + _logBuilder.AppendLine($"[Snapshot NewArrayVsBufferReuse] n={n}"); + _logBuilder.AppendLine($" new[] : {newArrayMs:F2}ms total / {perNewUs:F2}us per call / {newArrayAlloc:N0} bytes alloc"); + _logBuilder.AppendLine($" buffer : {bufferMs:F2}ms total / {perBufferUs:F2}us per call / {bufferAlloc:N0} bytes alloc"); + _logBuilder.AppendLine($" Speedup: {speedup:F2}x"); + _logBuilder.AppendLine($" AllocReduction: {allocReduction:F1}%"); + } + + // --------------------------------------------------------------- + // Data generation + // --------------------------------------------------------------- + + /// + /// 実 SurvivorEnemyController の位置・速度・HP 参照を代替する値型 struct。 + /// struct 自身が alloc を発生させないよう readonly で定義。 + /// + private readonly struct MockEnemy + { + public readonly int EnemyId; + public readonly int CurrentHp; + public readonly Vector3 Position; + public readonly Vector3 Velocity; + + public MockEnemy(int enemyId, int hp, Vector3 pos, Vector3 vel) + { + EnemyId = enemyId; + CurrentHp = hp; + Position = pos; + Velocity = vel; + } + } + + private static MockEnemy[] GenerateMockEnemies(int count, int seed) + { + var rng = new System.Random(seed); + var arr = new MockEnemy[count]; + for (int i = 0; i < count; i++) + { + var pos = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent, + 0f, + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent); + var vel = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0), + 0f, + (float)(rng.NextDouble() * 2.0 - 1.0)); + arr[i] = new MockEnemy(enemyId: i + 1, hp: 100, pos: pos, vel: vel); + } + return arr; + } + + // --------------------------------------------------------------- + // Before: 毎回 new array 確保 + // --------------------------------------------------------------- + + private static SurvivorNetworkEnemyStateSnapshot[] AllocateNewArray(MockEnemy[] enemies) + { + var snapshots = new SurvivorNetworkEnemyStateSnapshot[enemies.Length]; + for (int i = 0; i < enemies.Length; i++) + { + var e = enemies[i]; + snapshots[i] = new SurvivorNetworkEnemyStateSnapshot + { + NetworkId = i, + EnemyMasterId = e.EnemyId, + PositionX = e.Position.x, + PositionY = e.Position.y, + PositionZ = e.Position.z, + VelocityX = e.Velocity.x, + VelocityY = e.Velocity.y, + VelocityZ = e.Velocity.z, + CurrentHp = e.CurrentHp, + SyncType = EnemySyncType.PositionUpdate + }; + } + return snapshots; + } + + // --------------------------------------------------------------- + // After: 事前確保バッファ + int count + // --------------------------------------------------------------- + + private static int FillPreAllocatedBuffer( + SurvivorNetworkEnemyStateSnapshot[] buffer, MockEnemy[] enemies) + { + int count = Math.Min(enemies.Length, buffer.Length); + for (int i = 0; i < count; i++) + { + var e = enemies[i]; + buffer[i] = new SurvivorNetworkEnemyStateSnapshot + { + NetworkId = i, + EnemyMasterId = e.EnemyId, + PositionX = e.Position.x, + PositionY = e.Position.y, + PositionZ = e.Position.z, + VelocityX = e.Velocity.x, + VelocityY = e.Velocity.y, + VelocityZ = e.Velocity.z, + CurrentHp = e.CurrentHp, + SyncType = EnemySyncType.PositionUpdate + }; + } + return count; + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/SyncEnemyStatesAllocationPerformanceTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/SyncEnemyStatesAllocationPerformanceTests.cs.meta new file mode 100644 index 000000000..e6b956b14 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Enemy/SyncEnemyStatesAllocationPerformanceTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 01dc339affe74964486f8ec2f4b9c2a3 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Game.Tests.MVP.asmdef b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Game.Tests.MVP.asmdef index e89d82e92..493453ff1 100644 --- a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Game.Tests.MVP.asmdef +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Game.Tests.MVP.asmdef @@ -11,7 +11,10 @@ "MessagePipe", "VContainer", "Game.Library.Shared", - "Game.Client.MasterData" + "Game.Client.MasterData", + "Unity.Burst", + "Unity.Collections", + "Unity.Mathematics" ], "includePlatforms": [ "Editor" diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/StageSelectSceneViewModelTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/StageSelectSceneViewModelTests.cs index d8b7e424e..505b8b592 100644 --- a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/StageSelectSceneViewModelTests.cs +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/StageSelectSceneViewModelTests.cs @@ -132,8 +132,12 @@ public void BuildStageItems_UnlockedStage_IsUnlockedTrue() } [Test] - public void BuildStageItems_LockedStage_IsUnlockedFalse() + public void BuildStageItems_AnyStage_IsUnlockedAlwaysTrue_TechnicalDebtTodo() { + // TODO(アンロック機構の再設計): 現状ローカルセーブデータ源泉でアンロック状態が壊れる + // 構造的不具合があるため、StageSelectSceneViewModel は常に IsUnlocked=true を返す。 + // サーバー (PostgreSQL) 側で正しい同期実装が入ったらこのテストを削除し、 + // 元の BuildStageItems_LockedStage_IsUnlockedFalse を復活させる。 var stages = new List { new() { Id = 2, Name = "Stage2" } @@ -142,7 +146,7 @@ public void BuildStageItems_LockedStage_IsUnlockedFalse() var result = _viewModel.BuildStageItems(stages, _saveData); - Assert.That(result[0].IsUnlocked, Is.False); + Assert.That(result[0].IsUnlocked, Is.True); } [Test] @@ -217,8 +221,9 @@ public void BuildStageItems_MixedUnlockAndRecords_MapsCorrectly() Assert.That(result[1].IsUnlocked, Is.True); Assert.That(result[1].IsCleared, Is.False); - // Stage 3: locked, not cleared - Assert.That(result[2].IsUnlocked, Is.False); + // Stage 3: アンロック機構の技術的負債一時対応により常に IsUnlocked=true + // (本来は UnlockedStageIds に含まれないため false が期待値) + Assert.That(result[2].IsUnlocked, Is.True); Assert.That(result[2].IsCleared, Is.False); } diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon.meta b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon.meta new file mode 100644 index 000000000..160ed4c7b --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afa8de48b27a8d84d9a7b4129ae008db +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/ProjectileMovementPerformanceTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/ProjectileMovementPerformanceTests.cs new file mode 100644 index 000000000..0959869de --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/ProjectileMovementPerformanceTests.cs @@ -0,0 +1,254 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Text; +using NUnit.Framework; +using Unity.Burst; +using Unity.Collections; +using Unity.Jobs; +using Unity.Mathematics; +using UnityEngine; +using Debug = UnityEngine.Debug; + +namespace Game.Tests.MVP.Weapon +{ + /// + /// L1-3 プロジェクタイル移動計算の Layer 1 (EditMode) パフォーマンスベンチ。 + /// SurvivorProjectile.Update の移動部分 (pos += vel * dt + lifetime decay) を抽出し、 + /// Before: Vector3[] 逐次 for ループ vs After: NativeArray + IJobParallelFor + Burst を比較する。 + /// + /// Layer 1 の位置付け: Burst SIMD + Job 並列化の効果検証。 + /// SphereCast / ホーミング (Slerp) / Transform は Layer 2 回送。 + /// + [TestFixture] + public class ProjectileMovementPerformanceTests + { + private const int Seed = 42; + private static readonly int[] ProjectileCounts = { 50, 100, 200, 500, 1000, 5000, 10000, 50000 }; + private const int WarmupIterations = 100; + private const int MeasureIterations = 1000; + private const float DeltaTime = 0.0167f; + private const int InnerLoopBatchCount = 64; + private const float SpawnHalfExtent = 50f; + private const float SpeedMin = 5f; + private const float SpeedMax = 10f; + private const float LifetimeMin = 1f; + private const float LifetimeMax = 3f; + + private StringBuilder _logBuilder; + private string _logFilePath; + + [OneTimeSetUp] + public void OneTimeSetUp() + { + var logDir = Path.Combine(Application.dataPath, "..", "Logs", "PerformanceTests"); + Directory.CreateDirectory(logDir); + _logFilePath = Path.Combine(logDir, + $"ProjectileMovementPerformance_{DateTime.Now:yyyyMMdd_HHmmss}.log"); + } + + [SetUp] + public void SetUp() + { + _logBuilder = new StringBuilder(); + } + + [TearDown] + public void TearDown() + { + if (_logBuilder != null && _logBuilder.Length > 0) + { + var logContent = _logBuilder.ToString(); + Debug.Log(logContent); + File.AppendAllText(_logFilePath, logContent + "\n"); + } + } + + [Test] + public void ProjectileMove_SequentialVsBurstJob([ValueSource(nameof(ProjectileCounts))] int count) + { + // --- Sequential (Before) --- + var seqPositions = new Vector3[count]; + var seqDirections = new Vector3[count]; + var seqSpeeds = new float[count]; + var seqLifetimes = new float[count]; + var seqIsActive = new bool[count]; + GenerateProjectilesManaged(count, Seed, seqPositions, seqDirections, seqSpeeds, seqLifetimes, seqIsActive); + + // Warmup + for (int w = 0; w < WarmupIterations; w++) + { + UpdateProjectilesSequential(seqPositions, seqDirections, seqSpeeds, seqLifetimes, seqIsActive, DeltaTime); + } + + // Reset state for measurement + GenerateProjectilesManaged(count, Seed, seqPositions, seqDirections, seqSpeeds, seqLifetimes, seqIsActive); + + // Measure + GC.Collect(); + GC.WaitForPendingFinalizers(); + var memBefore = GC.GetTotalMemory(true); + var sw = Stopwatch.StartNew(); + for (int iter = 0; iter < MeasureIterations; iter++) + { + UpdateProjectilesSequential(seqPositions, seqDirections, seqSpeeds, seqLifetimes, seqIsActive, DeltaTime); + } + sw.Stop(); + var seqMs = sw.Elapsed.TotalMilliseconds; + var seqAlloc = GC.GetTotalMemory(false) - memBefore; + + // --- Burst Job (After) --- + var jobPositions = new NativeArray(count, Allocator.TempJob); + var jobDirections = new NativeArray(count, Allocator.TempJob); + var jobSpeeds = new NativeArray(count, Allocator.TempJob); + var jobLifetimes = new NativeArray(count, Allocator.TempJob); + var jobIsActive = new NativeArray(count, Allocator.TempJob); + + try + { + GenerateProjectilesNative(count, Seed, jobPositions, jobDirections, jobSpeeds, jobLifetimes, jobIsActive); + + // Warmup (Burst JIT 込み) + for (int w = 0; w < WarmupIterations; w++) + { + new MoveProjectilesJob + { + Positions = jobPositions, + Directions = jobDirections, + Speeds = jobSpeeds, + Lifetimes = jobLifetimes, + IsActive = jobIsActive, + DeltaTime = DeltaTime + }.Schedule(count, InnerLoopBatchCount).Complete(); + } + + // Reset for measurement + GenerateProjectilesNative(count, Seed, jobPositions, jobDirections, jobSpeeds, jobLifetimes, jobIsActive); + + // Measure + GC.Collect(); + GC.WaitForPendingFinalizers(); + memBefore = GC.GetTotalMemory(true); + sw.Restart(); + for (int iter = 0; iter < MeasureIterations; iter++) + { + new MoveProjectilesJob + { + Positions = jobPositions, + Directions = jobDirections, + Speeds = jobSpeeds, + Lifetimes = jobLifetimes, + IsActive = jobIsActive, + DeltaTime = DeltaTime + }.Schedule(count, InnerLoopBatchCount).Complete(); + } + sw.Stop(); + var jobMs = sw.Elapsed.TotalMilliseconds; + var jobAlloc = GC.GetTotalMemory(false) - memBefore; + + // --- Log --- + double perSeqUs = seqMs * 1000.0 / MeasureIterations / count; + double perJobUs = jobMs * 1000.0 / MeasureIterations / count; + double speedup = jobMs > 0 ? seqMs / jobMs : 0; + + _logBuilder.AppendLine($"[ProjectileMove SequentialVsBurstJob] n={count}"); + _logBuilder.AppendLine($" Sequential : {seqMs:F2}ms total / {perSeqUs:F3}us per entity / {seqAlloc:N0} bytes alloc"); + _logBuilder.AppendLine($" BurstJob : {jobMs:F2}ms total / {perJobUs:F3}us per entity / {jobAlloc:N0} bytes alloc"); + _logBuilder.AppendLine($" Speedup : {speedup:F2}x"); + } + finally + { + jobPositions.Dispose(); + jobDirections.Dispose(); + jobSpeeds.Dispose(); + jobLifetimes.Dispose(); + jobIsActive.Dispose(); + } + } + + // --------------------------------------------------------------- + // Sequential (Before) + // --------------------------------------------------------------- + + private static void UpdateProjectilesSequential( + Vector3[] positions, Vector3[] directions, float[] speeds, + float[] lifetimes, bool[] isActive, float dt) + { + for (int i = 0; i < positions.Length; i++) + { + if (!isActive[i]) continue; + positions[i] += directions[i] * (speeds[i] * dt); + lifetimes[i] -= dt; + isActive[i] = lifetimes[i] > 0f; + } + } + + // --------------------------------------------------------------- + // Burst Job (After) + // --------------------------------------------------------------- + + [BurstCompile] + private struct MoveProjectilesJob : IJobParallelFor + { + public NativeArray Positions; + [ReadOnly] public NativeArray Directions; + [ReadOnly] public NativeArray Speeds; + public NativeArray Lifetimes; + public NativeArray IsActive; // byte で bool 代替（Blittable 安定性） + public float DeltaTime; + + public void Execute(int index) + { + if (IsActive[index] == 0) return; + Positions[index] += Directions[index] * (Speeds[index] * DeltaTime); + Lifetimes[index] -= DeltaTime; + IsActive[index] = Lifetimes[index] > 0f ? (byte)1 : (byte)0; + } + } + + // --------------------------------------------------------------- + // Data generation + // --------------------------------------------------------------- + + private static void GenerateProjectilesManaged( + int count, int seed, + Vector3[] positions, Vector3[] directions, float[] speeds, + float[] lifetimes, bool[] isActive) + { + var rng = new System.Random(seed); + for (int i = 0; i < count; i++) + { + positions[i] = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent, + 0f, + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent); + float angle = (float)(rng.NextDouble() * Math.PI * 2.0); + directions[i] = new Vector3(Mathf.Cos(angle), 0f, Mathf.Sin(angle)); + speeds[i] = SpeedMin + (float)rng.NextDouble() * (SpeedMax - SpeedMin); + lifetimes[i] = LifetimeMin + (float)rng.NextDouble() * (LifetimeMax - LifetimeMin); + isActive[i] = true; + } + } + + private static void GenerateProjectilesNative( + int count, int seed, + NativeArray positions, NativeArray directions, + NativeArray speeds, NativeArray lifetimes, + NativeArray isActive) + { + var rng = new System.Random(seed); + for (int i = 0; i < count; i++) + { + positions[i] = new float3( + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent, + 0f, + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent); + float angle = (float)(rng.NextDouble() * Math.PI * 2.0); + directions[i] = new float3(math.cos(angle), 0f, math.sin(angle)); + speeds[i] = SpeedMin + (float)rng.NextDouble() * (SpeedMax - SpeedMin); + lifetimes[i] = LifetimeMin + (float)rng.NextDouble() * (LifetimeMax - LifetimeMin); + isActive[i] = 1; + } + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/ProjectileMovementPerformanceTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/ProjectileMovementPerformanceTests.cs.meta new file mode 100644 index 000000000..22c74e049 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/ProjectileMovementPerformanceTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6bd4112d8fb2a3745a234b81545a8768 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/WeaponTargetingPerformanceTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/WeaponTargetingPerformanceTests.cs new file mode 100644 index 000000000..ee11603dd --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/WeaponTargetingPerformanceTests.cs @@ -0,0 +1,228 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Text; +using NUnit.Framework; +using UnityEngine; +using Debug = UnityEngine.Debug; + +namespace Game.Tests.MVP.Weapon +{ + /// + /// L1-2 最近傍敵探索の Layer 1 (EditMode) パフォーマンスベンチ。 + /// SurvivorAutoFireWeapon.FindNearestEnemy の最終 sqrMagnitude 比較部分を抽出し、 + /// Before: O(N) 線形走査 vs After: O(k) pure C# Dictionary grid を比較する。 + /// + /// Layer 1 の位置付け: 計算量削減の純粋アルゴリズム比較。 + /// Burst / Physics / GameObject 依存なし。 + /// + [TestFixture] + public class WeaponTargetingPerformanceTests + { + private const int Seed = 42; + private static readonly int[] EnemyCounts = { 100, 500, 1000, 2000, 5000 }; + private const int WarmupIterations = 100; + private const int MeasureIterations = 1000; + private const float SearchRange = 15f; + private const float SpawnHalfExtent = 50f; + + private StringBuilder _logBuilder; + private string _logFilePath; + + [OneTimeSetUp] + public void OneTimeSetUp() + { + var logDir = Path.Combine(Application.dataPath, "..", "Logs", "PerformanceTests"); + Directory.CreateDirectory(logDir); + _logFilePath = Path.Combine(logDir, + $"WeaponTargetingPerformance_{DateTime.Now:yyyyMMdd_HHmmss}.log"); + } + + [SetUp] + public void SetUp() + { + _logBuilder = new StringBuilder(); + } + + [TearDown] + public void TearDown() + { + if (_logBuilder != null && _logBuilder.Length > 0) + { + var logContent = _logBuilder.ToString(); + Debug.Log(logContent); + File.AppendAllText(_logFilePath, logContent + "\n"); + } + } + + [Test] + public void FindNearest_LinearVsSpatialGrid([ValueSource(nameof(EnemyCounts))] int enemyCount) + { + var (positions, isDead) = GenerateEnemies(enemyCount, Seed); + var origin = new Vector3(0f, 0f, 0f); + float rangeSqr = SearchRange * SearchRange; + + // 結果一致率検証: Before/After が同じ最近傍を返すこと + var grid = new SpatialGrid(positions, isDead, SearchRange); + int linearResult = FindNearestLinear(origin, positions, isDead, rangeSqr); + int gridResult = grid.FindNearest(origin, rangeSqr, positions, isDead); + Assert.AreEqual(linearResult, gridResult, + $"Result mismatch: n={enemyCount}, linear={linearResult}, grid={gridResult}"); + + // --- Warmup (Linear) --- + for (int i = 0; i < WarmupIterations; i++) + { + FindNearestLinear(origin, positions, isDead, rangeSqr); + } + + // --- Measure (Linear) --- + GC.Collect(); + GC.WaitForPendingFinalizers(); + var memBefore = GC.GetTotalMemory(true); + var sw = Stopwatch.StartNew(); + for (int iter = 0; iter < MeasureIterations; iter++) + { + FindNearestLinear(origin, positions, isDead, rangeSqr); + } + sw.Stop(); + var linearMs = sw.Elapsed.TotalMilliseconds; + var linearAlloc = GC.GetTotalMemory(false) - memBefore; + + // --- Warmup (Grid) --- + // Note: Grid は事前構築のみ、探索時は構築済み grid を再利用 + for (int i = 0; i < WarmupIterations; i++) + { + grid.FindNearest(origin, rangeSqr, positions, isDead); + } + + // --- Measure (Grid) --- + GC.Collect(); + GC.WaitForPendingFinalizers(); + memBefore = GC.GetTotalMemory(true); + sw.Restart(); + for (int iter = 0; iter < MeasureIterations; iter++) + { + grid.FindNearest(origin, rangeSqr, positions, isDead); + } + sw.Stop(); + var gridMs = sw.Elapsed.TotalMilliseconds; + var gridAlloc = GC.GetTotalMemory(false) - memBefore; + + // --- Log --- + double perLinearUs = linearMs * 1000.0 / MeasureIterations; + double perGridUs = gridMs * 1000.0 / MeasureIterations; + double speedup = gridMs > 0 ? linearMs / gridMs : 0; + + _logBuilder.AppendLine($"[FindNearest LinearVsSpatialGrid] n={enemyCount}"); + _logBuilder.AppendLine($" Linear : {linearMs:F2}ms total / {perLinearUs:F2}us per call / {linearAlloc:N0} bytes alloc"); + _logBuilder.AppendLine($" Grid : {gridMs:F2}ms total / {perGridUs:F2}us per call / {gridAlloc:N0} bytes alloc"); + _logBuilder.AppendLine($" Speedup: {speedup:F2}x"); + } + + // --------------------------------------------------------------- + // Helpers + // --------------------------------------------------------------- + + private static (Vector3[] positions, bool[] isDead) GenerateEnemies(int count, int seed) + { + var rng = new System.Random(seed); + var positions = new Vector3[count]; + var isDead = new bool[count]; + for (int i = 0; i < count; i++) + { + positions[i] = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent, + 0f, + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent); + isDead[i] = false; + } + return (positions, isDead); + } + + /// + /// Before 版: 全敵を線形走査 O(N) + /// + private static int FindNearestLinear( + Vector3 origin, Vector3[] positions, bool[] isDead, float rangeSqr) + { + int nearest = -1; + float minSqr = float.MaxValue; + for (int i = 0; i < positions.Length; i++) + { + if (isDead[i]) continue; + float sqr = (origin - positions[i]).sqrMagnitude; + if (sqr <= rangeSqr && sqr < minSqr) + { + minSqr = sqr; + nearest = i; + } + } + return nearest; + } + + /// + /// After 版: 2D グリッド分割による空間ハッシュ探索 O(k) + /// cellSize = SearchRange に設定、原点周辺 3x3 セル (最大 9 セル) のみ走査 + /// + private class SpatialGrid + { + private readonly Dictionary<(int, int), List> _cells + = new Dictionary<(int, int), List>(); + private readonly float _cellSize; + + public SpatialGrid(Vector3[] positions, bool[] isDead, float cellSize) + { + _cellSize = cellSize; + for (int i = 0; i < positions.Length; i++) + { + if (isDead[i]) continue; + var key = GetCellKey(positions[i]); + if (!_cells.TryGetValue(key, out var list)) + { + list = new List(); + _cells[key] = list; + } + list.Add(i); + } + } + + private (int, int) GetCellKey(Vector3 pos) + { + return ((int)Mathf.Floor(pos.x / _cellSize), (int)Mathf.Floor(pos.z / _cellSize)); + } + + public int FindNearest( + Vector3 origin, float rangeSqr, Vector3[] positions, bool[] isDead) + { + var centerKey = GetCellKey(origin); + int nearest = -1; + float minSqr = float.MaxValue; + + // 周辺 3x3 セルのみ走査（cellSize == SearchRange なので検索範囲を包含） + for (int dx = -1; dx <= 1; dx++) + { + for (int dz = -1; dz <= 1; dz++) + { + var key = (centerKey.Item1 + dx, centerKey.Item2 + dz); + if (!_cells.TryGetValue(key, out var list)) continue; + + for (int k = 0; k < list.Count; k++) + { + int i = list[k]; + if (isDead[i]) continue; + float sqr = (origin - positions[i]).sqrMagnitude; + if (sqr <= rangeSqr && sqr < minSqr) + { + minSqr = sqr; + nearest = i; + } + } + } + } + + return nearest; + } + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/WeaponTargetingPerformanceTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/WeaponTargetingPerformanceTests.cs.meta new file mode 100644 index 000000000..f7dd5b298 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/MVP/Weapon/WeaponTargetingPerformanceTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8f46274d45d9a9f419960db19727d0fa \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Game.Tests.PlayMode.asmdef b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Game.Tests.PlayMode.asmdef index 93f174569..e2d1d3639 100644 --- a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Game.Tests.PlayMode.asmdef +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Game.Tests.PlayMode.asmdef @@ -20,7 +20,10 @@ "Unity.InputSystem", "Unity.InputSystem.TestFramework", "Unity.Addressables", - "Unity.ResourceManager" + "Unity.ResourceManager", + "Unity.Burst", + "Unity.Collections", + "Unity.Mathematics" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance.meta new file mode 100644 index 000000000..3ba4490e7 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8373605b958a9c44b59918ec511843b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/AllocMeasurer.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/AllocMeasurer.cs new file mode 100644 index 000000000..e6ceb132e --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/AllocMeasurer.cs @@ -0,0 +1,31 @@ +using System; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// GC アロケーション計測ヘルパー。 + /// `GC.GetTotalMemory` の前後差分で managed alloc 量を測る。 + /// Layer 1 (EditMode 4 項目) の alloc 検証パターンを PlayMode でも再現する。 + /// + public static class AllocMeasurer + { + /// + /// action 実行前後の alloc 差分（bytes）を返す。事前に GC.Collect で安定化させる。 + /// GC.GetTotalAllocatedBytes は .NET Standard 2.1 には含まれないため、 + /// Unity 互換の GC.GetTotalMemory を使用する（Layer 1 と同一パターン）。 + /// + public static long Measure(Action action) + { + if (action == null) throw new ArgumentNullException(nameof(action)); + GC.Collect(); + GC.WaitForPendingFinalizers(); + + long before = GC.GetTotalMemory(forceFullCollection: true); + action(); + long after = GC.GetTotalMemory(forceFullCollection: false); + return after - before; + } + + public static bool IsZeroAlloc(long bytes) => bytes <= 0; + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/AllocMeasurer.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/AllocMeasurer.cs.meta new file mode 100644 index 000000000..f6495a429 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/AllocMeasurer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 37395e6857ce80e47a677b03f68f0fa7 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/DamageAreaContinuousRangeTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/DamageAreaContinuousRangeTests.cs new file mode 100644 index 000000000..6b071bf37 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/DamageAreaContinuousRangeTests.cs @@ -0,0 +1,265 @@ +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; +using Debug = UnityEngine.Debug; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// L2-2 継続ダメージエリアの毎フレ範囲検査比較。 + /// SurvivorGroundDamageArea は毎フレ全エリアで OverlapSphere を呼び、範囲内敵に OnHit 発火する。 + /// エリア N 個 × 敵 100 体で、直接 OverlapSphere vs 共有 Spatial Grid 候補絞込の累積コストを比較する。 + /// + /// L2-3 と軸を分けるため「継続範囲」特性に特化（複数エリア × 60 フレーム累積コスト）。 + /// + [TestFixture] + public class DamageAreaContinuousRangeTests : PlayModeBenchmarkTestBase + { + private static readonly int[] AreaCounts = { 10, 30, 50 }; + private const int EnemyCount = 100; + private const int Seed = 42; + private const int ContinuousFrames = 60; + private const int WarmupFrames = 30; + private const float AreaRadius = 5f; + private const float SpawnHalfExtent = 50f; + + private LocalPhysicsTestScene _scene; + private EnemyFactoryForTest.SpawnResult _spawn; + private Vector3[] _areaPositions; + private Collider[] _overlapBuffer; + + [UnityTearDown] + public IEnumerator TearDown() + { + if (_spawn.GameObjects != null) + { + for (int i = 0; i < _spawn.GameObjects.Length; i++) + { + if (_spawn.GameObjects[i] != null) Object.Destroy(_spawn.GameObjects[i]); + } + _spawn = default; + } + if (_scene != null) + { + yield return _scene.UnloadAsync(); + _scene = null; + } + } + + [UnityTest] + public IEnumerator OverlapSphere_vs_SpatialGrid( + [ValueSource(nameof(AreaCounts))] int areaCount) + { + _scene = new LocalPhysicsTestScene($"L2-2_a{areaCount}"); + _spawn = EnemyFactoryForTest.CreateEnemies(_scene, EnemyCount, Seed, SpawnHalfExtent); + _overlapBuffer = new Collider[64]; + + _scene.Simulate(0.02f); + yield return null; + + _areaPositions = GenerateAreaPositions(areaCount, Seed + 1); + + // SpatialGrid 事前構築 + var grid = new SpatialGrid(_spawn.Targets, AreaRadius); + + // --- 結果一致率検証（1 フレ分）--- + var overlapHits = new HashSet(); + var gridHits = new HashSet(); + CollectOverlap(overlapHits, _scene.PhysicsScene, _overlapBuffer); + CollectGrid(gridHits, grid, _spawn.Targets); + CollectionAssert.AreEquivalent(overlapHits, gridHits, + $"OverlapSphere vs Grid の hit 集合不一致: areaCount={areaCount}"); + + // --- Warmup --- + for (int w = 0; w < WarmupFrames; w++) + { + CollectOverlap(overlapHits, _scene.PhysicsScene, _overlapBuffer); + CollectGrid(gridHits, grid, _spawn.Targets); + yield return null; + } + + // --- Measure: OverlapSphere 直接 --- + var sw = new Stopwatch(); + sw.Restart(); + int overlapHitTotal = 0; + for (int f = 0; f < ContinuousFrames; f++) + { + overlapHitTotal += CountOverlap(_scene.PhysicsScene, _overlapBuffer); + } + sw.Stop(); + double overlapMs = sw.Elapsed.TotalMilliseconds; + + // --- Measure: SpatialGrid --- + sw.Restart(); + int gridHitTotal = 0; + for (int f = 0; f < ContinuousFrames; f++) + { + gridHitTotal += CountGrid(grid, _spawn.Targets); + } + sw.Stop(); + double gridMs = sw.Elapsed.TotalMilliseconds; + + // --- Log --- + double perOverlapFrameMs = overlapMs / ContinuousFrames; + double perGridFrameMs = gridMs / ContinuousFrames; + double speedup = gridMs > 0 ? overlapMs / gridMs : 0; + + LogBuilder.AppendLine($"[DamageArea ContinuousRange areaCount={areaCount}, enemies={EnemyCount}]"); + LogBuilder.AppendLine($" OverlapSphere : {overlapMs:F2}ms total / {perOverlapFrameMs:F3}ms per frame / hits={overlapHitTotal}"); + LogBuilder.AppendLine($" SpatialGrid : {gridMs:F2}ms total / {perGridFrameMs:F3}ms per frame / hits={gridHitTotal}"); + LogBuilder.AppendLine($" Speedup : {speedup:F2}x"); + } + + // ------------------------------------------------------------------ + // OverlapSphere 直接（Before） + // ------------------------------------------------------------------ + + private void CollectOverlap(HashSet hits, PhysicsScene scene, Collider[] buffer) + { + hits.Clear(); + float rangeSqr = AreaRadius * AreaRadius; + for (int a = 0; a < _areaPositions.Length; a++) + { + int c = scene.OverlapSphere(_areaPositions[a], AreaRadius, buffer, -1, QueryTriggerInteraction.Collide); + for (int i = 0; i < c; i++) + { + var proxy = buffer[i].GetComponent(); + if (proxy == null) continue; + // OverlapSphere は SphereCollider.radius 分膨張して拾うため、 + // Grid 側と同じ CenterPosition 基準の sqrMagnitude でフィルタを揃える + float sqr = (_areaPositions[a] - proxy.CenterPosition).sqrMagnitude; + if (sqr <= rangeSqr) hits.Add(proxy.NetworkId); + } + } + } + + private int CountOverlap(PhysicsScene scene, Collider[] buffer) + { + int total = 0; + for (int a = 0; a < _areaPositions.Length; a++) + { + total += scene.OverlapSphere(_areaPositions[a], AreaRadius, buffer, -1, QueryTriggerInteraction.Collide); + } + return total; + } + + // ------------------------------------------------------------------ + // SpatialGrid 候補絞込（After） + // ------------------------------------------------------------------ + + private void CollectGrid(HashSet hits, SpatialGrid grid, Game.MVP.Survivor.Enemy.EnemyProxyTarget[] registry) + { + hits.Clear(); + float rangeSqr = AreaRadius * AreaRadius; + for (int a = 0; a < _areaPositions.Length; a++) + { + grid.CollectInRange(_areaPositions[a], rangeSqr, registry, hits); + } + } + + private int CountGrid(SpatialGrid grid, Game.MVP.Survivor.Enemy.EnemyProxyTarget[] registry) + { + float rangeSqr = AreaRadius * AreaRadius; + int total = 0; + for (int a = 0; a < _areaPositions.Length; a++) + { + total += grid.CountInRange(_areaPositions[a], rangeSqr, registry); + } + return total; + } + + private static Vector3[] GenerateAreaPositions(int count, int seed) + { + var rng = new System.Random(seed); + var arr = new Vector3[count]; + for (int i = 0; i < count; i++) + { + arr[i] = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent, + 0f, + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent); + } + return arr; + } + + private class SpatialGrid + { + private readonly Dictionary<(int, int), List> _cells = new(); + private readonly float _cellSize; + + public SpatialGrid(Game.MVP.Survivor.Enemy.EnemyProxyTarget[] registry, float cellSize) + { + _cellSize = cellSize; + for (int i = 0; i < registry.Length; i++) + { + var t = registry[i]; + if (t == null) continue; + var key = GetKey(t.CenterPosition); + if (!_cells.TryGetValue(key, out var list)) + { + list = new List(); + _cells[key] = list; + } + list.Add(i); + } + } + + private (int, int) GetKey(Vector3 pos) + { + return ((int)Mathf.Floor(pos.x / _cellSize), (int)Mathf.Floor(pos.z / _cellSize)); + } + + public void CollectInRange(Vector3 origin, float rangeSqr, + Game.MVP.Survivor.Enemy.EnemyProxyTarget[] registry, HashSet hits) + { + var centerKey = GetKey(origin); + for (int dx = -1; dx <= 1; dx++) + { + for (int dz = -1; dz <= 1; dz++) + { + var key = (centerKey.Item1 + dx, centerKey.Item2 + dz); + if (!_cells.TryGetValue(key, out var list)) continue; + for (int k = 0; k < list.Count; k++) + { + int idx = list[k]; + var t = registry[idx]; + if (t == null) continue; + float sqr = (origin - t.CenterPosition).sqrMagnitude; + if (sqr <= rangeSqr) + { + hits.Add(t.NetworkId); + } + } + } + } + } + + public int CountInRange(Vector3 origin, float rangeSqr, + Game.MVP.Survivor.Enemy.EnemyProxyTarget[] registry) + { + var centerKey = GetKey(origin); + int total = 0; + for (int dx = -1; dx <= 1; dx++) + { + for (int dz = -1; dz <= 1; dz++) + { + var key = (centerKey.Item1 + dx, centerKey.Item2 + dz); + if (!_cells.TryGetValue(key, out var list)) continue; + for (int k = 0; k < list.Count; k++) + { + int idx = list[k]; + var t = registry[idx]; + if (t == null) continue; + float sqr = (origin - t.CenterPosition).sqrMagnitude; + if (sqr <= rangeSqr) total++; + } + } + } + return total; + } + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/DamageAreaContinuousRangeTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/DamageAreaContinuousRangeTests.cs.meta new file mode 100644 index 000000000..66648807e --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/DamageAreaContinuousRangeTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 07f4dda1234f6fe4d996d910497c267e \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/EnemyFactoryForTest.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/EnemyFactoryForTest.cs new file mode 100644 index 000000000..de8c2d8fd --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/EnemyFactoryForTest.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using Game.MVP.Survivor.Enemy; +using UnityEngine; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// テスト用の敵 GameObject 生成ヘルパー。 + /// 実 を使用し、 は + /// （本番 SurvivorEnemyView の Dictionary lookup を模倣）を注入することで、 + /// L2-3 測定値が本番実装より軽く見えるバイアスを排除する。 + /// + public static class EnemyFactoryForTest + { + public const string EnemyLayerName = "Enemy"; + + public struct SpawnResult + { + public GameObject[] GameObjects; + public EnemyProxyTarget[] Targets; + public MockEnemyDeathQuery DeathQuery; + } + + public static SpawnResult CreateEnemies( + LocalPhysicsTestScene scene, + int count, + int seed, + float halfExtent = 50f, + float colliderRadius = 1f) + { + if (scene == null) throw new ArgumentNullException(nameof(scene)); + var rng = new System.Random(seed); + var gos = new GameObject[count]; + var targets = new EnemyProxyTarget[count]; + var deathQuery = new MockEnemyDeathQuery(count); + + int layer = LayerMask.NameToLayer(EnemyLayerName); + + for (int i = 0; i < count; i++) + { + var pos = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0) * halfExtent, + 0f, + (float)(rng.NextDouble() * 2.0 - 1.0) * halfExtent); + + var go = scene.CreateGameObject($"Enemy_{i}", pos); + if (layer >= 0) go.layer = layer; + + var col = go.AddComponent(); + col.radius = colliderRadius; + col.isTrigger = false; + + var proxy = go.AddComponent(); + proxy.NetworkId = i; + proxy.DeathQuery = deathQuery; + deathQuery.Register(i, isDead: false); + + gos[i] = go; + targets[i] = proxy; + } + + return new SpawnResult + { + GameObjects = gos, + Targets = targets, + DeathQuery = deathQuery + }; + } + } + + /// + /// SurvivorEnemyView の Dictionary lookup を再現する IEnemyDeathQuery テスト実装。 + /// 本番 IsProxyDead は `_proxies.TryGetValue(networkId, out var data) || data.IsDead` + /// の Dictionary lookup + null check を毎回行うため、Mock 側も同等 cost を模倣する。 + /// + public class MockEnemyDeathQuery : IEnemyDeathQuery + { + private readonly Dictionary _isDead; + + public MockEnemyDeathQuery(int initialCapacity) + { + _isDead = new Dictionary(initialCapacity); + } + + public void Register(int networkId, bool isDead) + { + _isDead[networkId] = isDead; + } + + public void SetDead(int networkId, bool isDead) + { + _isDead[networkId] = isDead; + } + + public bool IsProxyDead(int networkId) + { + // 本番と同じく「未登録 or dead」を dead とみなす + return !_isDead.TryGetValue(networkId, out bool dead) || dead; + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/EnemyFactoryForTest.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/EnemyFactoryForTest.cs.meta new file mode 100644 index 000000000..6cee7f13b --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/EnemyFactoryForTest.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8055f8cee0e41324eb74b9f425b1b858 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/FrameTimeMeasurer.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/FrameTimeMeasurer.cs new file mode 100644 index 000000000..72c936f95 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/FrameTimeMeasurer.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using UnityEngine; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// PlayMode 向けフレーム時間計測。 + /// 各フレームの onEachFrame 実行時間を ms 単位で記録し、Finalize() で in-place sort + Percentile 一括計算。 + /// 計測中のアロケーションを避けるため List は事前容量確保、Percentile は Finalize 後の fold 済み値を返す。 + /// + public class FrameTimeMeasurer + { + private readonly List _frameTimes; + private bool _finalized; + + public FrameTimeMeasurer(int capacity = 2000) + { + _frameTimes = new List(capacity); + } + + public float Average { get; private set; } + public float Median { get; private set; } + public float P95 { get; private set; } + public float P99 { get; private set; } + public float Max { get; private set; } + public int SampleCount => _frameTimes.Count; + + /// + /// frameCount フレーム計測する。各フレームの先頭で onEachFrame を実行し、 + /// 実行完了後 yield return null で次フレームへ進む。計測は実行時間のみ。 + /// + public IEnumerator Measure(int frameCount, Action onEachFrame = null) + { + _frameTimes.Clear(); + _finalized = false; + + var sw = new Stopwatch(); + for (int i = 0; i < frameCount; i++) + { + sw.Restart(); + onEachFrame?.Invoke(); + sw.Stop(); + _frameTimes.Add((float)sw.Elapsed.TotalMilliseconds); + yield return null; + } + } + + /// + /// 計測完了後 1 度だけ呼び出す。以降の percentile getter は fold 済み値を返す。 + /// + public void CalculateStatistics() + { + if (_finalized) return; + if (_frameTimes.Count == 0) + { + Average = Median = P95 = P99 = Max = 0f; + _finalized = true; + return; + } + + _frameTimes.Sort(); + + double sum = 0; + for (int i = 0; i < _frameTimes.Count; i++) sum += _frameTimes[i]; + Average = (float)(sum / _frameTimes.Count); + + Median = GetPercentileSorted(50); + P95 = GetPercentileSorted(95); + P99 = GetPercentileSorted(99); + Max = _frameTimes[_frameTimes.Count - 1]; + _finalized = true; + } + + private float GetPercentileSorted(float pct) + { + int idx = Mathf.Clamp((int)(_frameTimes.Count * pct / 100f), 0, _frameTimes.Count - 1); + return _frameTimes[idx]; + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/FrameTimeMeasurer.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/FrameTimeMeasurer.cs.meta new file mode 100644 index 000000000..534ac86b9 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/FrameTimeMeasurer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2b2d96a20b9b9074197f21f0ce7fb580 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/IntegratedFrameTimeTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/IntegratedFrameTimeTests.cs new file mode 100644 index 000000000..1a6fc7c77 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/IntegratedFrameTimeTests.cs @@ -0,0 +1,350 @@ +using System.Collections; +using System.Collections.Generic; +using Game.MVP.Survivor.Enemy; +using Game.Shared.Combat; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// L2-6 統合フレームタイム計測。 + /// L2-1 〜 L2-4 の最適化を組み合わせた「全最適化 ON vs 全最適化 OFF」を + /// 敵 N 体 + 弾 M 発 + ダメージエリア K 個 + 武器検索 1 本 の負荷下で比較する。 + /// Stage 9001 には依存せずテスト独自ミニシーンで行う。 + /// + [TestFixture] + public class IntegratedFrameTimeTests : PlayModeBenchmarkTestBase + { + private static readonly int[] EnemyCountScenarios = { 100, 200 }; + private const int ProjectileCount = 50; + private const int DamageAreaCount = 10; + private const int Seed = 42; + private const int MeasureFrames = 500; + private const int WarmupFrames = 60; + + private const float WeaponRange = 15f; + private const float AreaRadius = 5f; + private const float CastRadius = 0.5f; + private const float CastDistance = 1.0f; + private const float SpawnHalfExtent = 50f; + + private const float NearDistanceSq = 20f * 20f; + private const float MidDistanceSq = 40f * 40f; + private const int NearUpdateInterval = 1; + private const int MidUpdateInterval = 2; + private const int FarUpdateInterval = 5; + + private static readonly int SpeedHash = Animator.StringToHash("Speed"); + + private LocalPhysicsTestScene _scene; + private EnemyFactoryForTest.SpawnResult _spawn; + private Vector3[] _areaPositions; + private Vector3[] _projectilePositions; + private Vector3[] _projectileDirections; + private int[] _lodIntervals; + private int[] _frameOffsets; + private Collider[] _overlapBuffer; + + [UnityTearDown] + public IEnumerator TearDown() + { + if (_spawn.GameObjects != null) + { + for (int i = 0; i < _spawn.GameObjects.Length; i++) + { + if (_spawn.GameObjects[i] != null) Object.Destroy(_spawn.GameObjects[i]); + } + _spawn = default; + } + if (_scene != null) + { + yield return _scene.UnloadAsync(); + _scene = null; + } + } + + [UnityTest] + public IEnumerator AllOn_vs_AllOff([ValueSource(nameof(EnemyCountScenarios))] int enemyCount) + { + _scene = new LocalPhysicsTestScene($"L2-6_e{enemyCount}"); + _spawn = EnemyFactoryForTest.CreateEnemies(_scene, enemyCount, Seed, SpawnHalfExtent); + _scene.Simulate(0.02f); + yield return null; + + _overlapBuffer = new Collider[64]; + _areaPositions = GeneratePositions(DamageAreaCount, Seed + 1); + GenerateProjectiles(ProjectileCount, Seed + 2); + ClassifyLod(Vector3.zero); + + // Animator 付与（LOD 更新対象） + for (int i = 0; i < _spawn.GameObjects.Length; i++) + { + if (_spawn.GameObjects[i].GetComponent() == null) + { + _spawn.GameObjects[i].AddComponent(); + } + } + + var grid = new SpatialGrid(_spawn.Targets, Mathf.Max(WeaponRange, AreaRadius)); + + // --- Warmup OFF --- + int offFrameCounter = 0; + int offDistCursor = 0; + for (int w = 0; w < WarmupFrames; w++) + { + RunOff(offFrameCounter++, ref offDistCursor); + yield return null; + } + + // --- Measure OFF --- + int offCounter = 0; + int offCursor = 0; + var offMeasurer = new FrameTimeMeasurer(MeasureFrames); + yield return offMeasurer.Measure(MeasureFrames, () => + { + RunOff(offCounter++, ref offCursor); + }); + offMeasurer.CalculateStatistics(); + + // --- Warmup ON --- + int onFrameCounter = 0; + int onDistCursor = 0; + int onDistPerFrame = Mathf.Max(1, ProjectileCount / MeasureFrames); + for (int w = 0; w < WarmupFrames; w++) + { + RunOn(onFrameCounter++, ref onDistCursor, onDistPerFrame, grid); + yield return null; + } + + // --- Measure ON --- + int onCounter = 0; + int onCursor = 0; + var onMeasurer = new FrameTimeMeasurer(MeasureFrames); + yield return onMeasurer.Measure(MeasureFrames, () => + { + RunOn(onCounter++, ref onCursor, onDistPerFrame, grid); + }); + onMeasurer.CalculateStatistics(); + + // --- Log --- + double reduction = offMeasurer.Average > 0 + ? (1.0 - onMeasurer.Average / offMeasurer.Average) * 100.0 + : 0; + + LogBuilder.AppendLine($"[Integrated AllOn vs AllOff enemies={enemyCount}, projectiles={ProjectileCount}, areas={DamageAreaCount}]"); + LogBuilder.AppendLine($" ALL OFF: avg={offMeasurer.Average:F3}ms / p50={offMeasurer.Median:F3}ms / p95={offMeasurer.P95:F3}ms / p99={offMeasurer.P99:F3}ms / max={offMeasurer.Max:F3}ms"); + LogBuilder.AppendLine($" ALL ON : avg={onMeasurer.Average:F3}ms / p50={onMeasurer.Median:F3}ms / p95={onMeasurer.P95:F3}ms / p99={onMeasurer.P99:F3}ms / max={onMeasurer.Max:F3}ms"); + LogBuilder.AppendLine($" Avg reduction: {reduction:F1}%"); + LogBuilder.AppendLine($" Target 60 FPS = 16.67ms — AllOn avg meets? {(onMeasurer.Average <= 16.67f ? "YES" : "NO")}"); + } + + // ------------------------------------------------------------------ + // OFF: 全て Before 方式 + // ------------------------------------------------------------------ + + private void RunOff(int frameCount, ref int distCursor) + { + // 武器検索 (L2-3 Before: OverlapSphere + GetComponentInParent) + int hitCount = _scene.PhysicsScene.OverlapSphere( + Vector3.zero, WeaponRange, _overlapBuffer, -1, QueryTriggerInteraction.Collide); + for (int i = 0; i < hitCount; i++) + { + _overlapBuffer[i].GetComponentInParent(); + } + + // ダメージエリア (L2-2 Before: 各エリア毎 OverlapSphere) + for (int a = 0; a < _areaPositions.Length; a++) + { + _scene.PhysicsScene.OverlapSphere(_areaPositions[a], AreaRadius, _overlapBuffer, -1, QueryTriggerInteraction.Collide); + } + + // プロキシ更新 (L2-4 Before: 全 N 体毎フレ Transform + Animator) + for (int i = 0; i < _spawn.GameObjects.Length; i++) + { + WriteProxy(i); + } + + // プロジェクタイル (L2-1 Concentrated: 1 フレで全 N 発) + for (int i = 0; i < _projectilePositions.Length; i++) + { + _scene.PhysicsScene.SphereCast( + _projectilePositions[i], CastRadius, _projectileDirections[i], + out _, CastDistance, -1, QueryTriggerInteraction.Collide); + } + } + + // ------------------------------------------------------------------ + // ON: 全て After 方式 + // ------------------------------------------------------------------ + + private void RunOn(int frameCount, ref int distCursor, int distPerFrame, SpatialGrid grid) + { + float weaponRangeSqr = WeaponRange * WeaponRange; + float areaRangeSqr = AreaRadius * AreaRadius; + + // 武器検索 (L2-3 After: SpatialGrid O(k)) + grid.FindNearest(Vector3.zero, weaponRangeSqr, _spawn.Targets); + + // ダメージエリア (L2-2 After: SpatialGrid 絞込) + for (int a = 0; a < _areaPositions.Length; a++) + { + grid.CountInRange(_areaPositions[a], areaRangeSqr, _spawn.Targets); + } + + // プロキシ更新 (L2-4 After: LOD 間引き) + for (int i = 0; i < _spawn.GameObjects.Length; i++) + { + int interval = _lodIntervals[i]; + if (interval > 1 && frameCount % interval != _frameOffsets[i] % interval) continue; + WriteProxy(i); + } + + // プロジェクタイル (L2-1 Distributed: フレーム分散) + int n = _projectilePositions.Length; + for (int k = 0; k < distPerFrame; k++) + { + int i = distCursor % n; + _scene.PhysicsScene.SphereCast( + _projectilePositions[i], CastRadius, _projectileDirections[i], + out _, CastDistance, -1, QueryTriggerInteraction.Collide); + distCursor++; + } + } + + // ------------------------------------------------------------------ + // helpers + // ------------------------------------------------------------------ + + private void WriteProxy(int i) + { + var go = _spawn.GameObjects[i]; + if (go == null) return; + var t = go.transform; + var p = t.position; + t.position = new Vector3(p.x + 0.001f, p.y, p.z); + var a = go.GetComponent(); + if (a != null) a.SetFloat(SpeedHash, 1.0f); + } + + private void ClassifyLod(Vector3 cameraPos) + { + int count = _spawn.GameObjects.Length; + _lodIntervals = new int[count]; + _frameOffsets = new int[count]; + for (int i = 0; i < count; i++) + { + var pos = _spawn.GameObjects[i].transform.position; + float distSq = (pos - cameraPos).sqrMagnitude; + if (distSq <= NearDistanceSq) _lodIntervals[i] = NearUpdateInterval; + else if (distSq <= MidDistanceSq) _lodIntervals[i] = MidUpdateInterval; + else _lodIntervals[i] = FarUpdateInterval; + _frameOffsets[i] = i % FarUpdateInterval; + } + } + + private static Vector3[] GeneratePositions(int count, int seed) + { + var rng = new System.Random(seed); + var arr = new Vector3[count]; + for (int i = 0; i < count; i++) + { + arr[i] = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent, + 0f, + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent); + } + return arr; + } + + private void GenerateProjectiles(int count, int seed) + { + var rng = new System.Random(seed); + _projectilePositions = new Vector3[count]; + _projectileDirections = new Vector3[count]; + for (int i = 0; i < count; i++) + { + _projectilePositions[i] = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent, + 0.5f, + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent); + float angle = (float)(rng.NextDouble() * System.Math.PI * 2.0); + _projectileDirections[i] = new Vector3(Mathf.Cos(angle), 0f, Mathf.Sin(angle)); + } + } + + private class SpatialGrid + { + private readonly Dictionary<(int, int), List> _cells = new(); + private readonly float _cellSize; + + public SpatialGrid(EnemyProxyTarget[] registry, float cellSize) + { + _cellSize = cellSize; + for (int i = 0; i < registry.Length; i++) + { + var t = registry[i]; + if (t == null) continue; + var key = GetKey(t.CenterPosition); + if (!_cells.TryGetValue(key, out var list)) + { + list = new List(); + _cells[key] = list; + } + list.Add(i); + } + } + + private (int, int) GetKey(Vector3 pos) + => ((int)Mathf.Floor(pos.x / _cellSize), (int)Mathf.Floor(pos.z / _cellSize)); + + public int FindNearest(Vector3 origin, float rangeSqr, EnemyProxyTarget[] registry) + { + var centerKey = GetKey(origin); + int nearest = -1; + float nearestSqr = float.MaxValue; + for (int dx = -1; dx <= 1; dx++) + for (int dz = -1; dz <= 1; dz++) + { + var key = (centerKey.Item1 + dx, centerKey.Item2 + dz); + if (!_cells.TryGetValue(key, out var list)) continue; + for (int k = 0; k < list.Count; k++) + { + int idx = list[k]; + var t = registry[idx]; + if (t == null || t.IsDead) continue; + float sqr = (origin - t.CenterPosition).sqrMagnitude; + if (sqr <= rangeSqr && sqr < nearestSqr) + { + nearestSqr = sqr; + nearest = t.NetworkId; + } + } + } + return nearest; + } + + public int CountInRange(Vector3 origin, float rangeSqr, EnemyProxyTarget[] registry) + { + var centerKey = GetKey(origin); + int total = 0; + for (int dx = -1; dx <= 1; dx++) + for (int dz = -1; dz <= 1; dz++) + { + var key = (centerKey.Item1 + dx, centerKey.Item2 + dz); + if (!_cells.TryGetValue(key, out var list)) continue; + for (int k = 0; k < list.Count; k++) + { + int idx = list[k]; + var t = registry[idx]; + if (t == null) continue; + float sqr = (origin - t.CenterPosition).sqrMagnitude; + if (sqr <= rangeSqr) total++; + } + } + return total; + } + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/IntegratedFrameTimeTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/IntegratedFrameTimeTests.cs.meta new file mode 100644 index 000000000..e424dcafe --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/IntegratedFrameTimeTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e12ea35b5dcc0c0458db391ed1404e1d \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LocalPhysicsTestScene.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LocalPhysicsTestScene.cs new file mode 100644 index 000000000..dcc8e3c82 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LocalPhysicsTestScene.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// テスト用の独立 PhysicsScene ラッパー。 + /// auto simulate に依存せず Simulate(dt) を明示呼び出しすることで、 + /// テスト間 / フレーム間の干渉を排除する。 + /// + public class LocalPhysicsTestScene + { + public Scene Scene { get; } + public PhysicsScene PhysicsScene { get; } + + public LocalPhysicsTestScene(string name) + { + var parameters = new CreateSceneParameters(LocalPhysicsMode.Physics3D); + Scene = SceneManager.CreateScene(name, parameters); + PhysicsScene = Scene.GetPhysicsScene(); + } + + public GameObject CreateGameObject(string name, Vector3 position) + { + var go = new GameObject(name); + go.transform.position = position; + SceneManager.MoveGameObjectToScene(go, Scene); + return go; + } + + public void Simulate(float deltaTime) + { + PhysicsScene.Simulate(deltaTime); + } + + /// + /// コルーチン終了まで待ってから UnloadSceneAsync を呼ぶためのヘルパー。 + /// try-finally 内で yield できないため UnityTearDown で呼び出す形式を前提とする。 + /// + public IEnumerator UnloadAsync() + { + if (!Scene.IsValid()) yield break; + var op = SceneManager.UnloadSceneAsync(Scene); + while (op != null && !op.isDone) + { + yield return null; + } + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LocalPhysicsTestScene.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LocalPhysicsTestScene.cs.meta new file mode 100644 index 000000000..f2b1af6cc --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LocalPhysicsTestScene.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ef00bd624db3d2743856357139350c83 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LodEffectivenessTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LodEffectivenessTests.cs new file mode 100644 index 000000000..8606d0536 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LodEffectivenessTests.cs @@ -0,0 +1,183 @@ +using System.Collections; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// L2-4 LOD 間引きの実効値計測。 + /// SurvivorEnemyView の LOD 分類（Near=毎フレ / Mid=2フレ / Far=5フレ）を + /// テスト内で MockLodUpdater として再現し、LOD ON / OFF の frame time を比較する。 + /// + /// 本番コードは無改変。比較は Before=LOD OFF（全プロキシ毎フレ更新）、After=LOD ON。 + /// + [TestFixture] + public class LodEffectivenessTests : PlayModeBenchmarkTestBase + { + private static readonly int[] EntityCounts = { 100, 300, 500 }; + private const int MeasureFrames = 300; + private const int WarmupFrames = 60; + + private const float NearDistanceSq = 20f * 20f; + private const float MidDistanceSq = 40f * 40f; + private const int NearUpdateInterval = 1; + private const int MidUpdateInterval = 2; + private const int FarUpdateInterval = 5; + private const float SpawnHalfExtent = 50f; + + private static readonly int SpeedHash = Animator.StringToHash("Speed"); + + private GameObject[] _entities; + private Vector3[] _positions; + private int[] _lodIntervals; + private int[] _frameOffsets; + + [UnityTearDown] + public IEnumerator TearDown() + { + if (_entities != null) + { + for (int i = 0; i < _entities.Length; i++) + { + if (_entities[i] != null) Object.Destroy(_entities[i]); + } + _entities = null; + } + yield return null; + } + + [UnityTest] + public IEnumerator LodOn_vs_LodOff_FrameTime([ValueSource(nameof(EntityCounts))] int n) + { + Spawn(n); + + // カメラ位置（原点）から各プロキシの LOD を分類 + var cameraPos = Vector3.zero; + ClassifyAllLod(cameraPos); + + // --- Warmup (LOD OFF) --- + int frameCounter = 0; + for (int f = 0; f < WarmupFrames; f++) + { + UpdateAllProxies(Time.deltaTime); + frameCounter++; + yield return null; + } + + // --- Measure (LOD OFF) --- + var offMeasurer = new FrameTimeMeasurer(MeasureFrames); + yield return offMeasurer.Measure(MeasureFrames, () => + { + UpdateAllProxies(Time.deltaTime); + }); + offMeasurer.CalculateStatistics(); + + // --- Warmup (LOD ON) --- + frameCounter = 0; + for (int f = 0; f < WarmupFrames; f++) + { + UpdateWithLod(frameCounter, Time.deltaTime); + frameCounter++; + yield return null; + } + + // --- Measure (LOD ON) --- + int measureCounter = 0; + var onMeasurer = new FrameTimeMeasurer(MeasureFrames); + yield return onMeasurer.Measure(MeasureFrames, () => + { + UpdateWithLod(measureCounter++, Time.deltaTime); + }); + onMeasurer.CalculateStatistics(); + + // --- Log --- + double reduction = offMeasurer.Average > 0 + ? (1.0 - onMeasurer.Average / offMeasurer.Average) * 100.0 + : 0; + + LogBuilder.AppendLine($"[LOD FrameTime n={n}]"); + LogBuilder.AppendLine($" LOD OFF: avg={offMeasurer.Average:F3}ms / p95={offMeasurer.P95:F3}ms / p99={offMeasurer.P99:F3}ms / max={offMeasurer.Max:F3}ms"); + LogBuilder.AppendLine($" LOD ON : avg={onMeasurer.Average:F3}ms / p95={onMeasurer.P95:F3}ms / p99={onMeasurer.P99:F3}ms / max={onMeasurer.Max:F3}ms"); + LogBuilder.AppendLine($" Reduction (avg): {reduction:F1}%"); + + int nearCount = 0, midCount = 0, farCount = 0; + for (int i = 0; i < _lodIntervals.Length; i++) + { + if (_lodIntervals[i] == NearUpdateInterval) nearCount++; + else if (_lodIntervals[i] == MidUpdateInterval) midCount++; + else farCount++; + } + LogBuilder.AppendLine($" LOD distribution: Near={nearCount} Mid={midCount} Far={farCount}"); + } + + // ------------------------------------------------------------------ + // helpers + // ------------------------------------------------------------------ + + private void Spawn(int count) + { + var rng = new System.Random(42); + _entities = new GameObject[count]; + _positions = new Vector3[count]; + _lodIntervals = new int[count]; + _frameOffsets = new int[count]; + + for (int i = 0; i < count; i++) + { + var pos = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent, + 0f, + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent); + + _entities[i] = new GameObject($"Proxy_{i}"); + _entities[i].transform.position = pos; + _entities[i].AddComponent(); + + _positions[i] = pos; + _frameOffsets[i] = i % FarUpdateInterval; + } + } + + private void ClassifyAllLod(Vector3 cameraPos) + { + for (int i = 0; i < _positions.Length; i++) + { + float distSq = (_positions[i] - cameraPos).sqrMagnitude; + if (distSq <= NearDistanceSq) _lodIntervals[i] = NearUpdateInterval; + else if (distSq <= MidDistanceSq) _lodIntervals[i] = MidUpdateInterval; + else _lodIntervals[i] = FarUpdateInterval; + } + } + + private void UpdateAllProxies(float dt) + { + for (int i = 0; i < _entities.Length; i++) + { + WriteTransformAndAnimator(i, dt); + } + } + + private void UpdateWithLod(int frameCount, float dt) + { + for (int i = 0; i < _entities.Length; i++) + { + int interval = _lodIntervals[i]; + if (interval > 1 && frameCount % interval != _frameOffsets[i] % interval) + { + continue; + } + WriteTransformAndAnimator(i, dt); + } + } + + private void WriteTransformAndAnimator(int i, float dt) + { + var t = _entities[i].transform; + var p = t.position; + t.position = new Vector3(p.x + dt * 0.1f, p.y, p.z); + var a = _entities[i].GetComponent(); + if (a != null) a.SetFloat(SpeedHash, 1.0f); + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LodEffectivenessTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LodEffectivenessTests.cs.meta new file mode 100644 index 000000000..0ceab447b --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/LodEffectivenessTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: bb98f02a2925ab9428e27587d0dcfbae \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PhysicsScenePoC.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PhysicsScenePoC.cs new file mode 100644 index 000000000..1d24531e4 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PhysicsScenePoC.cs @@ -0,0 +1,76 @@ +using System.Collections; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.TestTools; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// Layer 2 Step 1a PoC: + /// Unity 6 の `PhysicsScene.Create` + 独立 Collider 配置 + 明示 `Simulate` + /// + `SphereCast` が Editor / Linux Headless CI で動作することを最小コードで確認する。 + /// + /// このテストが pass しない場合、Layer 2 計画の `LocalPhysicsTestScene` 方針を放棄し、 + /// 単一 scene + `[NonParallelizable]` fallback に切り替える判断の根拠になる。 + /// + [TestFixture] + public class PhysicsScenePoC + { + private Scene _testScene; + private bool _sceneCreated; + private GameObject _target; + + [UnityTearDown] + public IEnumerator TearDown() + { + if (_target != null) + { + Object.Destroy(_target); + _target = null; + } + + if (_sceneCreated && _testScene.IsValid()) + { + var unload = SceneManager.UnloadSceneAsync(_testScene); + while (unload != null && !unload.isDone) + { + yield return null; + } + _sceneCreated = false; + } + + yield return null; + } + + [UnityTest] + public IEnumerator LocalPhysicsScene_SphereCast_HitsCollider() + { + var parameters = new CreateSceneParameters(LocalPhysicsMode.Physics3D); + _testScene = SceneManager.CreateScene("PerfTestPhysicsPoC", parameters); + _sceneCreated = true; + var physicsScene = _testScene.GetPhysicsScene(); + + _target = new GameObject("PoCTarget"); + SceneManager.MoveGameObjectToScene(_target, _testScene); + _target.transform.position = new Vector3(0f, 0f, 5f); + var collider = _target.AddComponent(); + collider.radius = 1f; + + // auto simulate に依存せず明示 Simulate で Collider を同期 + physicsScene.Simulate(0.02f); + yield return null; + + bool hit = physicsScene.SphereCast( + origin: new Vector3(0f, 0f, 0f), + radius: 0.5f, + direction: Vector3.forward, + hitInfo: out RaycastHit hitInfo, + maxDistance: 10f); + + Assert.IsTrue(hit, "PhysicsScene.SphereCast が独立シーンの Collider を検出できませんでした。"); + Assert.AreEqual(_target, hitInfo.collider.gameObject, + "SphereCast が期待した GameObject を返しませんでした。"); + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PhysicsScenePoC.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PhysicsScenePoC.cs.meta new file mode 100644 index 000000000..e1551d56c --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PhysicsScenePoC.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e359f51fae460f542b193b0b6adeb3e4 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PlayModeBenchmarkTestBase.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PlayModeBenchmarkTestBase.cs new file mode 100644 index 000000000..280b446ff --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PlayModeBenchmarkTestBase.cs @@ -0,0 +1,77 @@ +using System; +using System.IO; +using System.Text; +using NUnit.Framework; +using UnityEngine; +using Debug = UnityEngine.Debug; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// PlayMode パフォーマンスベンチ共通基底。 + /// ログ出力・targetFrameRate / vSync 設定を揃え、テスト間の環境差を排除する。 + /// + public abstract class PlayModeBenchmarkTestBase + { + protected StringBuilder LogBuilder; + protected string LogFilePath; + + // 複数 Performance fixture 間の相互汚染を防ぐため、最外 fixture で 1 度だけ save / restore する。 + // 個々 fixture ごとに save すると、他 fixture が既に変更後の値を読み取り、 + // 最後の TearDown が -1 / 0 のまま放置され、PlayerMovementTests 等の後続テストが壊れる。 + private static int s_fixtureNestLevel; + private static int s_savedTargetFrameRate; + private static int s_savedVSyncCount; + + protected bool IsBatchMode => Application.isBatchMode; + + [OneTimeSetUp] + public void BenchOneTimeSetUp() + { + var logDir = Path.Combine(Application.dataPath, "..", "Logs", "PerformanceTests"); + Directory.CreateDirectory(logDir); + LogFilePath = Path.Combine(logDir, + $"{GetType().Name}_{DateTime.Now:yyyyMMdd_HHmmss}.log"); + + // Warmup ノイズ排除: 最初の fixture でのみオリジナル値を保存し、-1 / 0 に設定 + if (s_fixtureNestLevel == 0) + { + s_savedTargetFrameRate = Application.targetFrameRate; + s_savedVSyncCount = QualitySettings.vSyncCount; + Application.targetFrameRate = -1; + QualitySettings.vSyncCount = 0; + } + s_fixtureNestLevel++; + } + + [OneTimeTearDown] + public void BenchOneTimeTearDown() + { + s_fixtureNestLevel--; + // 最後の fixture でのみオリジナル値に戻す（後続 PlayMode テストへの残留回避） + if (s_fixtureNestLevel <= 0) + { + s_fixtureNestLevel = 0; + Application.targetFrameRate = s_savedTargetFrameRate; + QualitySettings.vSyncCount = s_savedVSyncCount; + } + } + + [SetUp] + public void BenchSetUp() + { + LogBuilder = new StringBuilder(); + } + + [TearDown] + public void BenchTearDown() + { + if (LogBuilder != null && LogBuilder.Length > 0) + { + var content = LogBuilder.ToString(); + Debug.Log(content); + File.AppendAllText(LogFilePath, content + "\n"); + } + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PlayModeBenchmarkTestBase.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PlayModeBenchmarkTestBase.cs.meta new file mode 100644 index 000000000..483a055ce --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/PlayModeBenchmarkTestBase.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b4d31aee2165d8a49b3bc920040879f7 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProfilerRecorderScope.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProfilerRecorderScope.cs new file mode 100644 index 000000000..e14f67849 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProfilerRecorderScope.cs @@ -0,0 +1,45 @@ +using System; +using Unity.Profiling; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// ProfilerRecorder の using スコープラッパー。 + /// Main Thread 外のコスト（Animator.Update, PhysicsManager.FixedUpdate 等）を + /// 測定するため、Stopwatch では捕捉できない処理時間を Profiler 経由で取得する。 + /// + public class ProfilerRecorderScope : IDisposable + { + private ProfilerRecorder _recorder; + + public ProfilerRecorderScope(ProfilerCategory category, string statName, int capacity = 300) + { + _recorder = ProfilerRecorder.StartNew(category, statName, capacity); + } + + /// ns 単位の現在値を ms 換算で返す。 + public double CurrentMs => + _recorder.Valid ? _recorder.CurrentValueAsDouble / 1_000_000.0 : 0.0; + + /// ns 単位の直近サンプル平均を ms 換算で返す。 + public double AverageMs + { + get + { + if (!_recorder.Valid || _recorder.Count == 0) return 0.0; + double sum = 0; + int count = _recorder.Count; + for (int i = 0; i < count; i++) + { + sum += _recorder.GetSample(i).Value; + } + return (sum / count) / 1_000_000.0; + } + } + + public void Dispose() + { + if (_recorder.Valid) _recorder.Dispose(); + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProfilerRecorderScope.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProfilerRecorderScope.cs.meta new file mode 100644 index 000000000..5355e65e9 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProfilerRecorderScope.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 977b64ba0c431be43bd94c6277b4b025 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProjectileCollisionBurstVsDistributedTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProjectileCollisionBurstVsDistributedTests.cs new file mode 100644 index 000000000..1f7da37df --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProjectileCollisionBurstVsDistributedTests.cs @@ -0,0 +1,154 @@ +using System.Collections; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// L2-1 プロジェクタイル衝突 集中 vs 分散 対照実験。 + /// 本番 SurvivorProjectile は個別 Update で自発的に SphereCast → 自然に分散している。 + /// テスト内で「人工的集中版」（1 フレで N 発まとめて処理）と「分散版」（毎フレ 1 発のみ）を + /// 対照実験し、将来まとめ処理設計に変えた場合の p95 frame time spike を定量化する。 + /// + [TestFixture] + public class ProjectileCollisionBurstVsDistributedTests : PlayModeBenchmarkTestBase + { + private static readonly int[] ProjectileCounts = { 50, 100, 200 }; + private const int EnemyCount = 100; + private const int Seed = 42; + private const int MeasureFrames = 300; + private const int WarmupFrames = 60; + private const float CastRadius = 0.5f; + private const float CastDistance = 1.0f; + private const float SpawnHalfExtent = 50f; + + private LocalPhysicsTestScene _scene; + private EnemyFactoryForTest.SpawnResult _spawn; + private Vector3[] _projectilePositions; + private Vector3[] _projectileDirections; + private RaycastHit[] _castBuffer; + + [UnityTearDown] + public IEnumerator TearDown() + { + if (_spawn.GameObjects != null) + { + for (int i = 0; i < _spawn.GameObjects.Length; i++) + { + if (_spawn.GameObjects[i] != null) Object.Destroy(_spawn.GameObjects[i]); + } + _spawn = default; + } + if (_scene != null) + { + yield return _scene.UnloadAsync(); + _scene = null; + } + } + + [UnityTest] + public IEnumerator Concentrated_vs_Distributed_FrameTime( + [ValueSource(nameof(ProjectileCounts))] int projectileCount) + { + _scene = new LocalPhysicsTestScene($"L2-1_p{projectileCount}"); + _spawn = EnemyFactoryForTest.CreateEnemies(_scene, EnemyCount, Seed, SpawnHalfExtent); + _scene.Simulate(0.02f); + yield return null; + + GenerateProjectiles(projectileCount, Seed + 1); + _castBuffer = new RaycastHit[4]; + + // --- Warmup: Concentrated --- + for (int w = 0; w < WarmupFrames; w++) + { + ProcessConcentrated(); + yield return null; + } + + // --- Measure: Concentrated (全 N 発を毎フレ集中処理) --- + var concMeasurer = new FrameTimeMeasurer(MeasureFrames); + yield return concMeasurer.Measure(MeasureFrames, () => ProcessConcentrated()); + concMeasurer.CalculateStatistics(); + + // --- Warmup: Distributed --- + int distCursor = 0; + int distPerFrame = Mathf.Max(1, projectileCount / MeasureFrames); + for (int w = 0; w < WarmupFrames; w++) + { + ProcessDistributed(ref distCursor, distPerFrame); + yield return null; + } + + // --- Measure: Distributed (1 フレあたり projectileCount/MeasureFrames 発のみ処理) --- + distCursor = 0; + var distMeasurer = new FrameTimeMeasurer(MeasureFrames); + yield return distMeasurer.Measure(MeasureFrames, () => + { + ProcessDistributed(ref distCursor, distPerFrame); + }); + distMeasurer.CalculateStatistics(); + + // --- Log --- + LogBuilder.AppendLine($"[Projectile Concentrated vs Distributed n={projectileCount}]"); + LogBuilder.AppendLine($" Concentrated : avg={concMeasurer.Average:F3}ms / p95={concMeasurer.P95:F3}ms / p99={concMeasurer.P99:F3}ms / max={concMeasurer.Max:F3}ms"); + LogBuilder.AppendLine($" Distributed : avg={distMeasurer.Average:F3}ms / p95={distMeasurer.P95:F3}ms / p99={distMeasurer.P99:F3}ms / max={distMeasurer.Max:F3}ms"); + double p95Ratio = distMeasurer.P95 > 0 ? concMeasurer.P95 / distMeasurer.P95 : 0; + LogBuilder.AppendLine($" Concentrated/Distributed p95 ratio: {p95Ratio:F2}x"); + LogBuilder.AppendLine($" Distributed per-frame projectiles: {distPerFrame}"); + } + + // ------------------------------------------------------------------ + // Concentrated: 1 フレで N 発全てを SphereCast + // ------------------------------------------------------------------ + + private void ProcessConcentrated() + { + var physics = _scene.PhysicsScene; + for (int i = 0; i < _projectilePositions.Length; i++) + { + physics.SphereCast( + _projectilePositions[i], CastRadius, _projectileDirections[i], + out _, CastDistance, -1, QueryTriggerInteraction.Collide); + } + } + + // ------------------------------------------------------------------ + // Distributed: 1 フレあたり perFrame 発のみを処理、cursor で進める + // ------------------------------------------------------------------ + + private void ProcessDistributed(ref int cursor, int perFrame) + { + var physics = _scene.PhysicsScene; + int n = _projectilePositions.Length; + for (int k = 0; k < perFrame; k++) + { + int i = cursor % n; + physics.SphereCast( + _projectilePositions[i], CastRadius, _projectileDirections[i], + out _, CastDistance, -1, QueryTriggerInteraction.Collide); + cursor++; + } + } + + // ------------------------------------------------------------------ + // Data generation + // ------------------------------------------------------------------ + + private void GenerateProjectiles(int count, int seed) + { + var rng = new System.Random(seed); + _projectilePositions = new Vector3[count]; + _projectileDirections = new Vector3[count]; + for (int i = 0; i < count; i++) + { + _projectilePositions[i] = new Vector3( + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent, + 0.5f, + (float)(rng.NextDouble() * 2.0 - 1.0) * SpawnHalfExtent); + float angle = (float)(rng.NextDouble() * System.Math.PI * 2.0); + _projectileDirections[i] = new Vector3(Mathf.Cos(angle), 0f, Mathf.Sin(angle)); + } + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProjectileCollisionBurstVsDistributedTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProjectileCollisionBurstVsDistributedTests.cs.meta new file mode 100644 index 000000000..b0b71c92e --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/ProjectileCollisionBurstVsDistributedTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 76016be312560b746a36356ceef00ca8 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/TransformAnimatorCostTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/TransformAnimatorCostTests.cs new file mode 100644 index 000000000..3d0ac7679 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/TransformAnimatorCostTests.cs @@ -0,0 +1,181 @@ +using System.Collections; +using System.Diagnostics; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; +using Debug = UnityEngine.Debug; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// L2-5 Transform / Animator 書込単体コスト計測。 + /// ECS 化しても削減できない Unity ランタイムコストの定量化が目的。 + /// Helper 群（PlayModeBenchmarkTestBase / AllocMeasurer / Stopwatch）の健全性検証も兼ねる。 + /// + /// Animator は AnimatorController 非設定（パラメータ辞書書込 cost のみ測定）。 + /// 実 SurvivorEnemyView も SetFloat(hash, value) 呼出しパターンで同等の cost を持つ。 + /// + [TestFixture] + public class TransformAnimatorCostTests : PlayModeBenchmarkTestBase + { + private static readonly int[] EntityCounts = { 100, 300, 500 }; + private const int MeasureFrames = 300; + private const int WarmupFrames = 60; + private static readonly int SpeedHash = Animator.StringToHash("Speed"); + + private GameObject[] _entities; + + [UnityTearDown] + public IEnumerator TearDown() + { + if (_entities != null) + { + for (int i = 0; i < _entities.Length; i++) + { + if (_entities[i] != null) Object.Destroy(_entities[i]); + } + _entities = null; + } + yield return null; + } + + [UnityTest] + public IEnumerator TransformWrite_PerEntityCost([ValueSource(nameof(EntityCounts))] int n) + { + _entities = SpawnTransformOnly(n); + yield return WarmupFramesIter(WarmupFrames, () => WriteTransform(_entities)); + + var sw = new Stopwatch(); + long alloc = AllocMeasurer.Measure(() => { /* reset state */ }); + sw.Restart(); + for (int f = 0; f < MeasureFrames; f++) + { + WriteTransform(_entities); + } + sw.Stop(); + + // 数フレーム挟んで Unity 側処理を走らせる（alloc 測定対象外） + yield return null; + + double totalMs = sw.Elapsed.TotalMilliseconds; + double perFrameUs = totalMs * 1000.0 / MeasureFrames; + double perEntityUs = perFrameUs / n; + + LogBuilder.AppendLine($"[TransformWrite n={n}]"); + LogBuilder.AppendLine($" Total : {totalMs:F2}ms over {MeasureFrames} frames"); + LogBuilder.AppendLine($" PerFrame : {perFrameUs:F2}us"); + LogBuilder.AppendLine($" PerEntity: {perEntityUs:F3}us"); + LogBuilder.AppendLine($" Alloc : {alloc:N0} bytes (baseline)"); + } + + [UnityTest] + public IEnumerator AnimatorSetFloat_PerEntityCost([ValueSource(nameof(EntityCounts))] int n) + { + _entities = SpawnWithAnimator(n); + yield return WarmupFramesIter(WarmupFrames, () => WriteAnimator(_entities)); + + var sw = new Stopwatch(); + sw.Restart(); + for (int f = 0; f < MeasureFrames; f++) + { + WriteAnimator(_entities); + } + sw.Stop(); + yield return null; + + double totalMs = sw.Elapsed.TotalMilliseconds; + double perFrameUs = totalMs * 1000.0 / MeasureFrames; + double perEntityUs = perFrameUs / n; + + LogBuilder.AppendLine($"[AnimatorSetFloat n={n}]"); + LogBuilder.AppendLine($" Total : {totalMs:F2}ms over {MeasureFrames} frames"); + LogBuilder.AppendLine($" PerFrame : {perFrameUs:F2}us"); + LogBuilder.AppendLine($" PerEntity: {perEntityUs:F3}us"); + } + + [UnityTest] + public IEnumerator TransformAndAnimator_Combined([ValueSource(nameof(EntityCounts))] int n) + { + _entities = SpawnWithAnimator(n); + yield return WarmupFramesIter(WarmupFrames, () => + { + WriteTransform(_entities); + WriteAnimator(_entities); + }); + + var sw = new Stopwatch(); + sw.Restart(); + for (int f = 0; f < MeasureFrames; f++) + { + WriteTransform(_entities); + WriteAnimator(_entities); + } + sw.Stop(); + yield return null; + + double totalMs = sw.Elapsed.TotalMilliseconds; + double perFrameUs = totalMs * 1000.0 / MeasureFrames; + double perEntityUs = perFrameUs / n; + + LogBuilder.AppendLine($"[Combined n={n}]"); + LogBuilder.AppendLine($" Total : {totalMs:F2}ms over {MeasureFrames} frames"); + LogBuilder.AppendLine($" PerFrame : {perFrameUs:F2}us"); + LogBuilder.AppendLine($" PerEntity: {perEntityUs:F3}us"); + } + + // ------------------------------------------------------------------ + // helpers + // ------------------------------------------------------------------ + + private static GameObject[] SpawnTransformOnly(int count) + { + var arr = new GameObject[count]; + for (int i = 0; i < count; i++) + { + arr[i] = new GameObject($"T_{i}"); + arr[i].transform.position = new Vector3(i % 50, 0, i / 50); + } + return arr; + } + + private static GameObject[] SpawnWithAnimator(int count) + { + var arr = new GameObject[count]; + for (int i = 0; i < count; i++) + { + arr[i] = new GameObject($"A_{i}"); + arr[i].transform.position = new Vector3(i % 50, 0, i / 50); + arr[i].AddComponent(); + } + return arr; + } + + private static void WriteTransform(GameObject[] entities) + { + for (int i = 0; i < entities.Length; i++) + { + var t = entities[i].transform; + var p = t.position; + t.position = new Vector3(p.x + 0.001f, p.y, p.z); + } + } + + private static void WriteAnimator(GameObject[] entities) + { + for (int i = 0; i < entities.Length; i++) + { + var a = entities[i].GetComponent(); + a.SetFloat(SpeedHash, i * 0.01f); + } + } + + private static IEnumerator WarmupFramesIter(int frames, System.Action eachFrame) + { + for (int f = 0; f < frames; f++) + { + eachFrame(); + yield return null; + } + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/TransformAnimatorCostTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/TransformAnimatorCostTests.cs.meta new file mode 100644 index 000000000..8056ac92f --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/TransformAnimatorCostTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c2ae485bf6cb2104594e97479ddcf350 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/WeaponTargetingEndToEndTests.cs b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/WeaponTargetingEndToEndTests.cs new file mode 100644 index 000000000..2e67cc147 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/WeaponTargetingEndToEndTests.cs @@ -0,0 +1,264 @@ +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using Game.MVP.Survivor.Enemy; +using Game.Shared.Combat; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; +using Debug = UnityEngine.Debug; + +namespace Game.Tests.PlayMode.Performance +{ + /// + /// L2-3 最近傍敵探索 End-to-End 比較。 + /// SurvivorAutoFireWeapon.FindNearestEnemy の本番実装パターンを PlayMode で再現し、 + /// 3 方式（OverlapSphere+GetComponentInParent / Registry 線形 / SpatialGrid）を計測する。 + /// + /// 実 EnemyProxyTarget + MockEnemyDeathQuery（Dictionary lookup コスト再現）を使用し、 + /// 測定値が本番より軽く見えるバイアスを排除する。 + /// + [TestFixture] + public class WeaponTargetingEndToEndTests : PlayModeBenchmarkTestBase + { + private static readonly int[] EnemyCounts = { 100, 500, 1000, 2000 }; + private const int Seed = 42; + private const int WarmupIterations = 200; + private const int MeasureIterations = 1000; + private const float SearchRange = 15f; + private const float SpawnHalfExtent = 50f; + + private LocalPhysicsTestScene _scene; + private EnemyFactoryForTest.SpawnResult _spawn; + private Collider[] _hitBuffer; + + [UnityTearDown] + public IEnumerator TearDown() + { + if (_spawn.GameObjects != null) + { + for (int i = 0; i < _spawn.GameObjects.Length; i++) + { + if (_spawn.GameObjects[i] != null) Object.Destroy(_spawn.GameObjects[i]); + } + _spawn = default; + } + if (_scene != null) + { + yield return _scene.UnloadAsync(); + _scene = null; + } + } + + [UnityTest] + public IEnumerator FindNearest_OverlapSphere_vs_Registry_vs_Grid( + [ValueSource(nameof(EnemyCounts))] int enemyCount) + { + _scene = new LocalPhysicsTestScene($"L2-3_n{enemyCount}"); + _spawn = EnemyFactoryForTest.CreateEnemies(_scene, enemyCount, Seed, SpawnHalfExtent); + _hitBuffer = new Collider[enemyCount]; + + // Physics Scene に Collider を同期 + _scene.Simulate(0.02f); + yield return null; + + var origin = new Vector3(0f, 0f, 0f); + float rangeSqr = SearchRange * SearchRange; + + // Registry: 全 EnemyProxyTarget の配列 + var registry = _spawn.Targets; + + // SpatialGrid 事前構築 + var grid = new SpatialGrid(registry, SearchRange); + + // --- 結果一致率検証 --- + int overlapNearest = FindNearestOverlapSphere(origin, _scene.PhysicsScene, _hitBuffer); + int registryNearest = FindNearestRegistry(origin, registry, rangeSqr); + int gridNearest = grid.FindNearest(origin, rangeSqr, registry); + + Assert.AreEqual(overlapNearest, registryNearest, + $"OverlapSphere vs Registry の nearest が不一致: n={enemyCount}"); + Assert.AreEqual(overlapNearest, gridNearest, + $"OverlapSphere vs Grid の nearest が不一致: n={enemyCount}"); + + // --- Warmup --- + for (int i = 0; i < WarmupIterations; i++) + { + FindNearestOverlapSphere(origin, _scene.PhysicsScene, _hitBuffer); + } + for (int i = 0; i < WarmupIterations; i++) + { + FindNearestRegistry(origin, registry, rangeSqr); + } + for (int i = 0; i < WarmupIterations; i++) + { + grid.FindNearest(origin, rangeSqr, registry); + } + + // --- Measure: OverlapSphere + GetComponentInParent --- + long overlapAlloc = 0; + var sw = new Stopwatch(); + overlapAlloc = AllocMeasurer.Measure(() => + { + sw.Restart(); + for (int i = 0; i < MeasureIterations; i++) + { + FindNearestOverlapSphere(origin, _scene.PhysicsScene, _hitBuffer); + } + sw.Stop(); + }); + double overlapMs = sw.Elapsed.TotalMilliseconds; + + // --- Measure: Registry 線形 --- + long registryAlloc; + registryAlloc = AllocMeasurer.Measure(() => + { + sw.Restart(); + for (int i = 0; i < MeasureIterations; i++) + { + FindNearestRegistry(origin, registry, rangeSqr); + } + sw.Stop(); + }); + double registryMs = sw.Elapsed.TotalMilliseconds; + + // --- Measure: SpatialGrid --- + long gridAlloc; + gridAlloc = AllocMeasurer.Measure(() => + { + sw.Restart(); + for (int i = 0; i < MeasureIterations; i++) + { + grid.FindNearest(origin, rangeSqr, registry); + } + sw.Stop(); + }); + double gridMs = sw.Elapsed.TotalMilliseconds; + + // --- Log --- + double perOverlapUs = overlapMs * 1000.0 / MeasureIterations; + double perRegistryUs = registryMs * 1000.0 / MeasureIterations; + double perGridUs = gridMs * 1000.0 / MeasureIterations; + double registrySpeedup = registryMs > 0 ? overlapMs / registryMs : 0; + double gridSpeedup = gridMs > 0 ? overlapMs / gridMs : 0; + + LogBuilder.AppendLine($"[FindNearest EndToEnd n={enemyCount}]"); + LogBuilder.AppendLine($" OverlapSphere+GetComp : {overlapMs:F2}ms / {perOverlapUs:F2}us per call / {overlapAlloc:N0} bytes alloc"); + LogBuilder.AppendLine($" Registry linear : {registryMs:F2}ms / {perRegistryUs:F2}us per call / {registryAlloc:N0} bytes alloc"); + LogBuilder.AppendLine($" SpatialGrid : {gridMs:F2}ms / {perGridUs:F2}us per call / {gridAlloc:N0} bytes alloc"); + LogBuilder.AppendLine($" Registry speedup : {registrySpeedup:F2}x"); + LogBuilder.AppendLine($" Grid speedup : {gridSpeedup:F2}x"); + } + + // ------------------------------------------------------------------ + // Before: 本番 SurvivorAutoFireWeapon.FindNearestEnemy 相当 + // ------------------------------------------------------------------ + + private static int FindNearestOverlapSphere( + Vector3 origin, PhysicsScene physicsScene, Collider[] hitBuffer) + { + int hitCount = physicsScene.OverlapSphere( + origin, SearchRange, hitBuffer, -1, QueryTriggerInteraction.Collide); + + int nearestNetworkId = -1; + float nearestSqr = float.MaxValue; + for (int i = 0; i < hitCount; i++) + { + var target = hitBuffer[i].GetComponentInParent(); + if (target == null || target.IsDead) continue; + float sqr = (origin - target.CenterPosition).sqrMagnitude; + if (sqr < nearestSqr) + { + nearestSqr = sqr; + if (target is EnemyProxyTarget proxy) nearestNetworkId = proxy.NetworkId; + } + } + return nearestNetworkId; + } + + // ------------------------------------------------------------------ + // After-1: 事前索引した EnemyProxyTarget 配列を線形走査 + // ------------------------------------------------------------------ + + private static int FindNearestRegistry( + Vector3 origin, EnemyProxyTarget[] registry, float rangeSqr) + { + int nearestNetworkId = -1; + float nearestSqr = float.MaxValue; + for (int i = 0; i < registry.Length; i++) + { + var t = registry[i]; + if (t == null || t.IsDead) continue; + float sqr = (origin - t.CenterPosition).sqrMagnitude; + if (sqr <= rangeSqr && sqr < nearestSqr) + { + nearestSqr = sqr; + nearestNetworkId = t.NetworkId; + } + } + return nearestNetworkId; + } + + // ------------------------------------------------------------------ + // After-2: SpatialGrid による O(k) 走査 + // ------------------------------------------------------------------ + + private class SpatialGrid + { + private readonly Dictionary<(int, int), List> _cells + = new Dictionary<(int, int), List>(); + private readonly float _cellSize; + + public SpatialGrid(EnemyProxyTarget[] registry, float cellSize) + { + _cellSize = cellSize; + for (int i = 0; i < registry.Length; i++) + { + var t = registry[i]; + if (t == null) continue; + var pos = t.CenterPosition; + var key = GetKey(pos); + if (!_cells.TryGetValue(key, out var list)) + { + list = new List(); + _cells[key] = list; + } + list.Add(i); + } + } + + private (int, int) GetKey(Vector3 pos) + { + return ((int)Mathf.Floor(pos.x / _cellSize), (int)Mathf.Floor(pos.z / _cellSize)); + } + + public int FindNearest(Vector3 origin, float rangeSqr, EnemyProxyTarget[] registry) + { + var centerKey = GetKey(origin); + int nearestNetworkId = -1; + float nearestSqr = float.MaxValue; + for (int dx = -1; dx <= 1; dx++) + { + for (int dz = -1; dz <= 1; dz++) + { + var key = (centerKey.Item1 + dx, centerKey.Item2 + dz); + if (!_cells.TryGetValue(key, out var list)) continue; + for (int k = 0; k < list.Count; k++) + { + int idx = list[k]; + var t = registry[idx]; + if (t == null || t.IsDead) continue; + float sqr = (origin - t.CenterPosition).sqrMagnitude; + if (sqr <= rangeSqr && sqr < nearestSqr) + { + nearestSqr = sqr; + nearestNetworkId = t.NetworkId; + } + } + } + } + return nearestNetworkId; + } + } + } +} diff --git a/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/WeaponTargetingEndToEndTests.cs.meta b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/WeaponTargetingEndToEndTests.cs.meta new file mode 100644 index 000000000..e747d73bd --- /dev/null +++ b/src/Game.Client/Assets/Programs/Editor/Tests/PlayMode/Performance/WeaponTargetingEndToEndTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ca9c12b0f41446342a315396514fa7e8 \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/ECS/Bridge/EcsEnemyBridge.cs b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/ECS/Bridge/EcsEnemyBridge.cs index 01701d9cb..433d9f429 100644 --- a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/ECS/Bridge/EcsEnemyBridge.cs +++ b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/ECS/Bridge/EcsEnemyBridge.cs @@ -78,6 +78,14 @@ public class EcsEnemyBridge : MonoBehaviour, IEnemySystemBridge private int _nextNetworkId; private readonly Dictionary _entityNetworkIds = new(); + // L1-4: 事前確保バッファで 10Hz 同期の alloc を排除。 + // SurvivorFusionEnemyBatchSync.MaxEnemies (= 512) と一致させる。 + private const int SyncBufferCapacity = 512; + private SurvivorNetworkEnemyStateSnapshot[] _syncSnapshotBuffer; + // CLAUDE.md 制約対応: Spawn/Death の個別 WriteEnemyStates 呼出を定期同期に統合するための pending queue + private readonly HashSet _spawnedNetworkIds = new(); + private readonly List _pendingDeaths = new(); + // Systems cache private PlayerPositionUpdateSystem _playerPositionSystem; private SpawnProcessSystem _spawnProcessSystem; @@ -113,6 +121,12 @@ public async UniTask InitializeAsync(SurvivorStageWaveManager waveManager) _waveManager = waveManager; _spawnSeed = (uint)UnityEngine.Random.Range(1, int.MaxValue); + // L1-4: 同期スナップショットバッファを 1 度だけ確保 + if (_syncSnapshotBuffer == null) + { + _syncSnapshotBuffer = new SurvivorNetworkEnemyStateSnapshot[SyncBufferCapacity]; + } + // ECS World生成 _ecsWorld = EcsWorldBootstrap.CreateWorld(); @@ -243,8 +257,10 @@ private void Update() } /// - /// 新規生成されたエンティティにネットワークIDを割り当て、Spawnスナップショットを送信する。 - /// GOプロキシの有無に関わらずサーバーで常に実行される。 + /// 新規生成されたエンティティにネットワークIDを割り当てる。 + /// CLAUDE.md 制約により個別 WriteEnemyStates 呼出は行わず、Spawn 通知は + /// 次回の で + /// 未登録の active entity を Spawn 扱いで送信することで実現する。 /// private void TrackNewEntitiesForNetwork(SurvivorFusionEnemyBatchSync batchSync) { @@ -255,44 +271,25 @@ private void TrackNewEntitiesForNetwork(SurvivorFusionEnemyBatchSync batchSync) foreach (var entity in entities) { if (_entityNetworkIds.ContainsKey(entity)) continue; - var networkId = ++_nextNetworkId; _entityNetworkIds[entity] = networkId; - - var data = entityManager.GetComponentData(entity); - var lt = entityManager.GetComponentData(entity); - - batchSync.WriteEnemyStates(new[] - { - new SurvivorNetworkEnemyStateSnapshot - { - NetworkId = networkId, - EnemyMasterId = data.EnemyId, - PositionX = lt.Position.x, - PositionY = lt.Position.y, - PositionZ = lt.Position.z, - VelocityX = 0f, - VelocityY = 0f, - VelocityZ = 0f, - CurrentHp = data.CurrentHp, - SyncType = EnemySyncType.Spawn - } - }); } } private void SyncEnemyStatesToNetwork(SurvivorFusionEnemyBatchSync batchSync) { if (_ecsWorld == null || !_ecsWorld.IsCreated) return; + if (_syncSnapshotBuffer == null) return; // InitializeAsync 前防御 var entityManager = _ecsWorld.EntityManager; var query = entityManager.CreateEntityQuery(typeof(EnemyData), typeof(LocalTransform), typeof(EnemyAliveTag)); using var entities = query.ToEntityArray(Allocator.Temp); - if (entities.Length == 0) return; + if (entities.Length == 0 && _pendingDeaths.Count == 0) return; - var snapshots = new SurvivorNetworkEnemyStateSnapshot[entities.Length]; - for (int i = 0; i < entities.Length; i++) + // L1-4: 事前確保バッファに直接書き込み（alloc 排除） + int activeFill = Mathf.Min(entities.Length, SyncBufferCapacity); + for (int i = 0; i < activeFill; i++) { var entity = entities[i]; var data = entityManager.GetComponentData(entity); @@ -333,7 +330,19 @@ private void SyncEnemyStatesToNetwork(SurvivorFusionEnemyBatchSync batchSync) } } - snapshots[i] = new SurvivorNetworkEnemyStateSnapshot + // CLAUDE.md 制約対応: 未送信 entity は Spawn 扱いで送信、以降 PositionUpdate + EnemySyncType syncType; + if (!_spawnedNetworkIds.Contains(netId)) + { + syncType = EnemySyncType.Spawn; + _spawnedNetworkIds.Add(netId); + } + else + { + syncType = EnemySyncType.PositionUpdate; + } + + _syncSnapshotBuffer[i] = new SurvivorNetworkEnemyStateSnapshot { NetworkId = netId, EnemyMasterId = data.EnemyId, @@ -344,10 +353,20 @@ private void SyncEnemyStatesToNetwork(SurvivorFusionEnemyBatchSync batchSync) VelocityY = velocityY, VelocityZ = velocityZ, CurrentHp = data.CurrentHp, - SyncType = EnemySyncType.PositionUpdate + SyncType = syncType }; } - batchSync.WriteEnemyStates(snapshots); + + // 保留中の Death を末尾に追加（バッファ余剰範囲のみ） + int deathFill = Mathf.Min(_pendingDeaths.Count, SyncBufferCapacity - activeFill); + for (int i = 0; i < deathFill; i++) + { + _syncSnapshotBuffer[activeFill + i] = _pendingDeaths[i]; + } + _pendingDeaths.Clear(); + + int totalCount = activeFill + deathFill; + batchSync.WriteEnemyStates(_syncSnapshotBuffer, totalCount); } private void SpawnNextEnemy() @@ -469,25 +488,22 @@ private void OnEnemyDied(EnemyDeathInfo deathInfo) bool isBoss = deathInfo.EnemyType == 3; _waveManager?.OnEnemyKilled(isBoss); - // Deathスナップショット送信 - if (_entityNetworkIds.TryGetValue(deathInfo.Entity, out var deadNetId) - && _runnerService.TryGet(out var deathBatchSync)) + // CLAUDE.md 制約対応: Death 通知は定期同期で統合する pending queue に追加 + if (_entityNetworkIds.TryGetValue(deathInfo.Entity, out var deadNetId)) { - deathBatchSync.WriteEnemyStates(new[] + _pendingDeaths.Add(new SurvivorNetworkEnemyStateSnapshot { - new SurvivorNetworkEnemyStateSnapshot - { - NetworkId = deadNetId, - EnemyMasterId = deathInfo.EnemyType, - PositionX = deathInfo.Position.x, - PositionY = deathInfo.Position.y, - PositionZ = deathInfo.Position.z, - VelocityX = 0f, - VelocityY = 0f, - VelocityZ = 0f, - SyncType = EnemySyncType.Death - } + NetworkId = deadNetId, + EnemyMasterId = deathInfo.EnemyType, + PositionX = deathInfo.Position.x, + PositionY = deathInfo.Position.y, + PositionZ = deathInfo.Position.z, + VelocityX = 0f, + VelocityY = 0f, + VelocityZ = 0f, + SyncType = EnemySyncType.Death }); + _spawnedNetworkIds.Remove(deadNetId); _entityNetworkIds.Remove(deathInfo.Entity); } diff --git a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/EnemyProxyTarget.cs b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/EnemyProxyTarget.cs index fc2e1b6a3..24e8841b7 100644 --- a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/EnemyProxyTarget.cs +++ b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/EnemyProxyTarget.cs @@ -10,10 +10,10 @@ namespace Game.MVP.Survivor.Enemy /// public class EnemyProxyTarget : MonoBehaviour, ICombatTarget { - public SurvivorEnemyView OwnerView { get; set; } + public IEnemyDeathQuery DeathQuery { get; set; } public int NetworkId { get; set; } public Vector3 CenterPosition => transform.position + Vector3.up; - public bool IsDead => OwnerView != null && OwnerView.IsProxyDead(NetworkId); + public bool IsDead => DeathQuery != null && DeathQuery.IsProxyDead(NetworkId); public void TakeDamage(int damage) { } public void ApplyKnockback(Vector3 knockback) { } } diff --git a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/IEnemyDeathQuery.cs b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/IEnemyDeathQuery.cs new file mode 100644 index 000000000..692163cf0 --- /dev/null +++ b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/IEnemyDeathQuery.cs @@ -0,0 +1,11 @@ +namespace Game.MVP.Survivor.Enemy +{ + /// + /// EnemyProxyTarget の IsDead lookup を抽象化。 + /// 本番は SurvivorEnemyView が実装、テスト時は Dictionary lookup コストを再現した Mock を差し替える。 + /// + public interface IEnemyDeathQuery + { + bool IsProxyDead(int networkId); + } +} diff --git a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/IEnemyDeathQuery.cs.meta b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/IEnemyDeathQuery.cs.meta new file mode 100644 index 000000000..1f6c21a8b --- /dev/null +++ b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/IEnemyDeathQuery.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: b73538e66e8989843ab58fb1e23e4e6a \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemySpawner.cs b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemySpawner.cs index 7e9876d16..7f1f8faea 100644 --- a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemySpawner.cs +++ b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemySpawner.cs @@ -86,6 +86,11 @@ public class SurvivorEnemySpawner : MonoBehaviour private float _enemySyncTimer; private int _nextNetworkId; + // 10Hz 同期での new[] alloc を排除するための事前確保バッファ。 + // SurvivorFusionEnemyBatchSync.MaxEnemies (= 512) と一致させる。 + private const int SyncBufferCapacity = 512; + private SurvivorNetworkEnemyStateSnapshot[] _syncSnapshotBuffer; + // 診断: 5 秒毎にサイズサマリー private const float DiagSummaryInterval = 5f; private float _diagLastSummaryTime; @@ -145,6 +150,12 @@ public async UniTask InitializeAsync(SurvivorStageWaveManager waveManager) _waveManager = waveManager; _runnerService.TryGet(out _gameState); + // L1-4: 同期スナップショットバッファを 1 度だけ確保（以降 new 不要） + if (_syncSnapshotBuffer == null) + { + _syncSnapshotBuffer = new SurvivorNetworkEnemyStateSnapshot[SyncBufferCapacity]; + } + // レイヤーマスクが未設定の場合、Structureレイヤーを使用 if (_obstacleLayerMask == 0) { @@ -334,11 +345,13 @@ public void FlushPendingSync() private void SyncEnemyStatesToNetwork(SurvivorFusionEnemyBatchSync batchSync) { + if (_syncSnapshotBuffer == null) return; // InitializeAsync 前防御 if (_activeEnemies.Count == 0 && _pendingDeaths.Count == 0) return; - var snapshots = new SurvivorNetworkEnemyStateSnapshot[_activeEnemies.Count + _pendingDeaths.Count]; - for (int i = 0; i < _activeEnemies.Count; i++) + // 事前確保バッファに直接書き込み、alloc を排除 + int activeFill = Mathf.Min(_activeEnemies.Count, SyncBufferCapacity); + for (int i = 0; i < activeFill; i++) { var enemy = _activeEnemies[i]; var networkId = _enemyNetworkIds.TryGetValue(enemy, out var id) ? id : -1; @@ -359,7 +372,7 @@ private void SyncEnemyStatesToNetwork(SurvivorFusionEnemyBatchSync batchSync) syncType = EnemySyncType.PositionUpdate; } - snapshots[i] = new SurvivorNetworkEnemyStateSnapshot + _syncSnapshotBuffer[i] = new SurvivorNetworkEnemyStateSnapshot { NetworkId = networkId, EnemyMasterId = enemy.EnemyId, @@ -374,14 +387,16 @@ private void SyncEnemyStatesToNetwork(SurvivorFusionEnemyBatchSync batchSync) }; } - // 保留中の Death を末尾に追加 - for (int i = 0; i < _pendingDeaths.Count; i++) + // 保留中の Death を末尾に追加（バッファ余剰範囲のみ） + int deathFill = Mathf.Min(_pendingDeaths.Count, SyncBufferCapacity - activeFill); + for (int i = 0; i < deathFill; i++) { - snapshots[_activeEnemies.Count + i] = _pendingDeaths[i]; + _syncSnapshotBuffer[activeFill + i] = _pendingDeaths[i]; } _pendingDeaths.Clear(); - batchSync.WriteEnemyStates(snapshots); + int totalCount = activeFill + deathFill; + batchSync.WriteEnemyStates(_syncSnapshotBuffer, totalCount); } private void SpawnNextEnemy() diff --git a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemyView.cs b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemyView.cs index 9217111ad..ba4ba8fb8 100644 --- a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemyView.cs +++ b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Enemy/SurvivorEnemyView.cs @@ -17,7 +17,7 @@ namespace Game.MVP.Survivor.Enemy /// クライアントモード時、バッチ ClientRpc からプロキシ敵オブジェクトを管理。 /// サーバーからの EnemyMasterId でAddressableプレハブをロードし、正式モデルで表示する。 /// - public class SurvivorEnemyView : MonoBehaviour + public class SurvivorEnemyView : MonoBehaviour, IEnemyDeathQuery { private const float InterpolationSpeed = 8f; private const float CorrectionDecayRate = 10f; @@ -143,7 +143,7 @@ private void SpawnProxy(SurvivorNetworkEnemyStateSnapshot e) // ICombatTarget実装を追加（ヒット報告用NetworkId + LockOn用CenterPosition） var proxyTarget = instance.AddComponent(); - proxyTarget.OwnerView = this; + proxyTarget.DeathQuery = this; proxyTarget.NetworkId = e.NetworkId; // Animator は Root に配置済み diff --git a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Scenes/SurvivorStageSelectScene.cs b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Scenes/SurvivorStageSelectScene.cs index 2a59723e6..ee2056d2d 100644 --- a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Scenes/SurvivorStageSelectScene.cs +++ b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Scenes/SurvivorStageSelectScene.cs @@ -69,11 +69,9 @@ private List BuildStageItems() private async UniTaskVoid OnStageSelected(int stageId) { - if (!_saveService.IsStageUnlocked(stageId)) - { - // ロック中のステージは選択不可 - return; - } + // TODO(アンロック機構の再設計): アンロック状態はサーバー (PostgreSQL) で管理すべきだが、 + // 現状ローカルセーブデータが源泉になっており不正操作で状態が壊れる構造的不具合がある。 + // StageSelectSceneViewModel.IsUnlocked=true と同じ理由で遷移ガードも一時無効化する。 SceneComponent.SetInteractables(false); diff --git a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Scenes/ViewModels/StageSelectSceneViewModel.cs b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Scenes/ViewModels/StageSelectSceneViewModel.cs index 9d8643fdd..7e021b94a 100644 --- a/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Scenes/ViewModels/StageSelectSceneViewModel.cs +++ b/src/Game.Client/Assets/Programs/Runtime/MVP/Survivor/Scenes/ViewModels/StageSelectSceneViewModel.cs @@ -24,7 +24,11 @@ public List BuildStageItems( Description = stage.Description, Difficulty = stage.Difficulty, TimeLimit = stage.TimeLimit, - IsUnlocked = saveData.UnlockedStageIds.Contains(stage.Id), + // TODO(アンロック機構の再設計): アンロック状態はサーバー (PostgreSQL) で管理すべきだが、 + // 現状ローカルセーブデータが源泉になっており、クライアント起点の不正操作で状態が壊れる + // 構造的不具合がある。現状のアンロック機構は障害でしかないため、サーバー側と同期する + // 正しい実装が入るまで全ステージを常にアンロック扱いとする。 + IsUnlocked = true, Record = saveData.StageRecords.GetValueOrDefault(stage.Id) }) .ToList(); diff --git a/src/Game.Client/Assets/Programs/Runtime/Shared/Multiplayer/MppmServerEnvBootstrap.cs b/src/Game.Client/Assets/Programs/Runtime/Shared/Multiplayer/MppmServerEnvBootstrap.cs new file mode 100644 index 000000000..b95ded4ea --- /dev/null +++ b/src/Game.Client/Assets/Programs/Runtime/Shared/Multiplayer/MppmServerEnvBootstrap.cs @@ -0,0 +1,47 @@ +#if UNITY_EDITOR +using Game.Shared.Environment; +using UnityEngine; + +namespace Game.Shared.Multiplayer +{ + /// + /// MPPM Server タグ付き Editor インスタンスに対して、.env から + /// UnityServerConfigFactory が参照する環境変数を現プロセスに注入する。 + /// DedicatedServerEditorMenu と同じ EnvVarHelper API を使い、 + /// スタンドアロン DS .exe と同じ .env 源を MPPM Server でも共有する。 + /// + internal static class MppmServerEnvBootstrap + { + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] + private static void ApplyEnvIfMppmServer() + { + if (!MppmHelper.IsServer()) return; + + var envFilePath = EnvVarHelper.FindDefaultEnvFile(); + if (envFilePath == null) + { + Debug.LogWarning("[MppmServerEnvBootstrap] .env が見つかりません。UnityServerConfigFactory はデフォルト値で起動します"); + return; + } + + var envVars = EnvVarHelper.Parse(envFilePath); + int applied = 0; + int skipped = 0; + foreach (var kv in envVars) + { + // shell 経由で既に注入されている値は尊重（上書きしない） + if (string.IsNullOrEmpty(System.Environment.GetEnvironmentVariable(kv.Key))) + { + System.Environment.SetEnvironmentVariable(kv.Key, kv.Value); + applied++; + } + else + { + skipped++; + } + } + Debug.Log($"[MppmServerEnvBootstrap] .env から {applied} 件を注入、{skipped} 件は shell 優先でスキップ: {envFilePath}"); + } + } +} +#endif diff --git a/src/Game.Client/Assets/Programs/Runtime/Shared/Multiplayer/MppmServerEnvBootstrap.cs.meta b/src/Game.Client/Assets/Programs/Runtime/Shared/Multiplayer/MppmServerEnvBootstrap.cs.meta new file mode 100644 index 000000000..6f5afdffa --- /dev/null +++ b/src/Game.Client/Assets/Programs/Runtime/Shared/Multiplayer/MppmServerEnvBootstrap.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8a6fdea3b581fc84d83e0376b5f9753c \ No newline at end of file diff --git a/src/Game.Client/Assets/Programs/Runtime/Shared/Network/Survivor/SurvivorFusionEnemyBatchSync.cs b/src/Game.Client/Assets/Programs/Runtime/Shared/Network/Survivor/SurvivorFusionEnemyBatchSync.cs index 452cd8b12..3b687ef5f 100644 --- a/src/Game.Client/Assets/Programs/Runtime/Shared/Network/Survivor/SurvivorFusionEnemyBatchSync.cs +++ b/src/Game.Client/Assets/Programs/Runtime/Shared/Network/Survivor/SurvivorFusionEnemyBatchSync.cs @@ -47,12 +47,22 @@ public override void Despawned(NetworkRunner runner, bool hasState) Destroy(gameObject); } - /// Server 側: スナップショット配列を NetworkArray に書き込む - public void WriteEnemyStates(SurvivorNetworkEnemyStateSnapshot[] snapshots) + /// + /// Server 側: スナップショット配列を NetworkArray に書き込む。 + /// 呼び出し側が事前確保バッファを再利用する場合は に有効要素数を指定する。 + /// -1 の場合は従来互換で snapshots.Length を使用する。 + /// + public void WriteEnemyStates(SurvivorNetworkEnemyStateSnapshot[] snapshots, int count = -1) { if (!HasStateAuthority) return; - ActiveCount = Mathf.Min(snapshots.Length, MaxEnemies); + int effective = count < 0 ? snapshots.Length : count; + if (effective > snapshots.Length) + { + Debug.LogError($"[SurvivorFusionEnemyBatchSync] count={effective} exceeds snapshots.Length={snapshots.Length}; clamping"); + effective = snapshots.Length; + } + ActiveCount = Mathf.Min(effective, MaxEnemies); #if UNITY_EDITOR || DEVELOPMENT_BUILD if (!_hasLoggedFirstWrite) { diff --git a/src/Game.Client/Assets/Settings/Build Profiles/Windows - Development.asset b/src/Game.Client/Assets/Settings/Build Profiles/Windows - Development.asset index ebf7f940c..0403c8b5a 100644 --- a/src/Game.Client/Assets/Settings/Build Profiles/Windows - Development.asset +++ b/src/Game.Client/Assets/Settings/Build Profiles/Windows - Development.asset @@ -887,7 +887,7 @@ MonoBehaviour: - line: '| PS4: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2' - line: '| PS5: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2' - line: '| QNX: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2' - - line: '| Standalone: DEVELOP;UNITY_PIPELINE_URP;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;UNITASK_DOTWEEN_SUPPORT;EDGEGAP_PLUGIN_SERVERS;FUSION_LOGLEVEL_INFO;FUSION_WEAVER;FUSION2;FUSION_2;FUSION_2_0;FUSION_2_0_11;FUSION_2_OR_NEWER;FUSION_2_0_OR_NEWER' + - line: '| Standalone: UNITY_PIPELINE_URP;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;UNITASK_DOTWEEN_SUPPORT;EDGEGAP_PLUGIN_SERVERS;FUSION_LOGLEVEL_INFO;FUSION_WEAVER;FUSION2;FUSION_2;FUSION_2_0;FUSION_2_0_11;FUSION_2_OR_NEWER;FUSION_2_0_OR_NEWER' - line: '| VisionOS: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2' - line: '| WebGL: DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;UNITY_PIPELINE_URP;UNITASK_DOTWEEN_SUPPORT' - line: '| Windows Store Apps: DOTWEEN' diff --git a/src/Game.Client/Packages/manifest.json b/src/Game.Client/Packages/manifest.json index f66f667f4..d8479ab04 100644 --- a/src/Game.Client/Packages/manifest.json +++ b/src/Game.Client/Packages/manifest.json @@ -35,11 +35,13 @@ "com.unity.inputsystem": "1.18.0", "com.unity.localization": "1.5.9", "com.unity.mathematics": "1.3.3", + "com.unity.memoryprofiler": "1.1.12", "com.unity.multiplayer.center": "1.0.1", "com.unity.multiplayer.playmode": "2.0.2", "com.unity.multiplayer.tools": "2.2.8", "com.unity.nuget.mono-cecil": "1.10.2", "com.unity.nuget.newtonsoft-json": "3.2.2", + "com.unity.performance.profile-analyzer": "1.3.4", "com.unity.postprocessing": "3.5.1", "com.unity.render-pipelines.universal": "17.3.0", "com.unity.sdk.linux-x86_64": "1.0.2", diff --git a/src/Game.Client/Packages/packages-lock.json b/src/Game.Client/Packages/packages-lock.json index c4231530f..c4c8984f5 100644 --- a/src/Game.Client/Packages/packages-lock.json +++ b/src/Game.Client/Packages/packages-lock.json @@ -168,6 +168,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.editorcoroutines": { + "version": "1.0.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.entities": { "version": "1.4.4", "depth": 0, @@ -262,6 +269,19 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.memoryprofiler": { + "version": "1.1.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.0", + "com.unity.collections": "1.2.3", + "com.unity.mathematics": "1.2.1", + "com.unity.profiling.core": "1.0.0", + "com.unity.editorcoroutines": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.multiplayer.center": { "version": "1.0.1", "depth": 0, @@ -308,6 +328,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.performance.profile-analyzer": { + "version": "1.3.4", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.postprocessing": { "version": "3.5.1", "depth": 0, diff --git a/src/Game.Shared/Runtime/Shared/Dto/UnityServerRegistrationDto.cs b/src/Game.Shared/Runtime/Shared/Dto/UnityServerRegistrationDto.cs index 0f0689ea9..26cee18f1 100644 --- a/src/Game.Shared/Runtime/Shared/Dto/UnityServerRegistrationDto.cs +++ b/src/Game.Shared/Runtime/Shared/Dto/UnityServerRegistrationDto.cs @@ -38,6 +38,6 @@ public class UnityServerRegistrationRequest /// 非 GCE 環境や環境変数未設定時は null。 /// [Key(4)] - public string InternalAddress { get; set; } + public string? InternalAddress { get; set; } } }