From 8f500c8726cc84740ee03f667341d955cc1e1c99 Mon Sep 17 00:00:00 2001
From: dal4segno <dal4segno@gmail.com>
Date: Tue, 17 Mar 2026 15:10:27 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B3=B4=EC=8A=A4=20=EC=A0=90=ED=94=84?=
 =?UTF-8?q?=20=EC=8A=A4=ED=82=AC=20Y=20=EB=A3=A8=ED=8A=B8=EB=AA=A8?=
 =?UTF-8?q?=EC=85=98=20=EB=AF=B8=EC=A0=81=EC=9A=A9=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- NavMeshAgent.Move()가 NavMesh 표면에 고정되어 Y 이동을 무시하던 문제 해결
- IgnoreRootMotionY=false 스킬 실행 중 NavMeshAgent 비활성화 후 transform 직접 이동
- 스킬 종료 시 NavMeshAgent.Warp()로 NavMesh에 재고정
- isAirborne 상태 중 LateUpdate 충돌 보정 로직 스킵

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 Assets/_Game/Scripts/Enemy/EnemyBase.cs | 35 +++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/Assets/_Game/Scripts/Enemy/EnemyBase.cs b/Assets/_Game/Scripts/Enemy/EnemyBase.cs
index faf2a5f0..723417c4 100644
--- a/Assets/_Game/Scripts/Enemy/EnemyBase.cs
+++ b/Assets/_Game/Scripts/Enemy/EnemyBase.cs
@@ -33,6 +33,9 @@ namespace Colosseum.Enemy
         // 플레이어 분리용 (레이어 의존 없이 CharacterController로 식별)
         private readonly Collider[] overlapBuffer = new Collider[8];
 
+        // 점프 등 Y 루트모션 스킬 중 NavMeshAgent 비활성화 상태 추적
+        private bool isAirborne = false;
+
         // 이벤트
         public event Action<float, float> OnHealthChanged; // currentHealth, maxHealth
         public event Action<float> OnDamageTaken; // damage
@@ -88,7 +91,7 @@ namespace Colosseum.Enemy
         /// </summary>
         private void LateUpdate()
         {
-            if (!IsServer || IsDead || navMeshAgent == null) return;
+            if (!IsServer || IsDead || navMeshAgent == null || isAirborne) return;
 
             // stoppingDistance가 0이면 radius 기반 fallback 사용
             float stopDist = navMeshAgent.stoppingDistance > 0f
@@ -119,13 +122,21 @@ namespace Colosseum.Enemy
 
         /// <summary>
         /// 보스 스킬 루트모션이 플레이어 방향으로 진입하는 것을 차단합니다.
+        /// Y 루트모션이 필요한 스킬(점프 등)은 NavMeshAgent를 비활성화하고 직접 이동합니다.
         /// </summary>
         private void OnAnimatorMove()
         {
             if (!IsServer || animator == null || navMeshAgent == null) return;
 
+            var skillCtrl = GetComponent<Colosseum.Skills.SkillController>();
+            bool needsYMotion = skillCtrl != null
+                && skillCtrl.IsPlayingAnimation
+                && skillCtrl.UsesRootMotion
+                && !skillCtrl.IgnoreRootMotionY;
+
             Vector3 deltaPosition = animator.deltaPosition;
 
+            // XZ 차단: 플레이어 방향으로의 이동 방지
             float blockRadius = Mathf.Max(navMeshAgent.stoppingDistance, navMeshAgent.radius + 0.5f);
             int count = Physics.OverlapSphereNonAlloc(transform.position, blockRadius, overlapBuffer);
             for (int i = 0; i < count; i++)
@@ -144,7 +155,27 @@ namespace Colosseum.Enemy
                 }
             }
 
-            navMeshAgent.Move(deltaPosition);
+            if (needsYMotion)
+            {
+                // Y 루트모션 필요: NavMeshAgent 비활성화 후 transform 직접 이동
+                if (navMeshAgent.enabled)
+                {
+                    navMeshAgent.enabled = false;
+                    isAirborne = true;
+                }
+                transform.position += deltaPosition;
+            }
+            else
+            {
+                // 착지 후 NavMeshAgent 복원
+                if (isAirborne)
+                {
+                    isAirborne = false;
+                    navMeshAgent.enabled = true;
+                    navMeshAgent.Warp(transform.position);
+                }
+                navMeshAgent.Move(deltaPosition);
+            }
 
             if (animator.deltaRotation != Quaternion.identity)
                 transform.rotation *= animator.deltaRotation;