유닛 배치 오류 수정

BlueWater/Assets/02.Scripts/Ai/AiController.cs

@@ -132,11 +132,11 @@ namespace BlueWaterProject
         {
             aiAnimator.SetFloat(SpeedHash, navMeshAgent.velocity.normalized.magnitude);
             
-            if (!TargetTransform || !navMeshAgent.enabled) return;
+            // if (!TargetTransform || !navMeshAgent.enabled) return;
-
+            //
-            var distanceToTarget = Vector3.Distance(transform.position, TargetTransform.position);
+            // var distanceToTarget = Vector3.Distance(transform.position, TargetTransform.position);
-
+            //
-            navMeshAgent.isStopped = distanceToTarget <= navMeshAgent.stoppingDistance;
+            // navMeshAgent.isStopped = distanceToTarget <= navMeshAgent.stoppingDistance;
 
             // switch (AiStat.AttackerType)
             // {
@@ -364,24 +364,12 @@ namespace BlueWaterProject
                         break;
                     case EDefenseType.STRIKER:
                         SetNearestTargetInDefense(transform.position, AiStat.ViewRange);
-                        // if (TargetTransform)
-                        // {
-                        //     Utils.SetCloseDestination(navMeshAgent, TargetTransform.position, AiStat.AtkRange - 0.5f, AiStat.AtkRange);
-                        // }
                         break;
                     case EDefenseType.MIDFIELDER:
                         SetNearestTargetInDefense(transform.position, AiStat.ViewRange);
-                        // if (TargetTransform)
-                        // {
-                        //     Utils.SetCloseDestination(navMeshAgent, TargetTransform.position, AiStat.AtkRange - 0.5f, AiStat.AtkRange);
-                        // }
                         break;
                     case EDefenseType.DEFENDER:
                         SetNearestTargetInDefense(defensePos, AiStat.DefenseRange);
-                        // if (TargetTransform)
-                        // {
-                        //     Utils.SetCloseDestination(navMeshAgent, TargetTransform.position, AiStat.AtkRange - 0.5f, AiStat.AtkRange);
-                        // }
                         break;
                     case EDefenseType.KEEPER:
                         SetNearestTargetInDefense(transform.position, AiStat.ViewRange);
@@ -676,12 +664,13 @@ namespace BlueWaterProject
             StartCoroutine(nameof(AttackAnimation));
         }
         
-        private IEnumerator AttackAnimation()
+        protected virtual IEnumerator AttackAnimation()
         {
             while (true)
             {
                 if (!CanAttack())
                 {
+                    isAttacking = false;
                     yield return FindTargetWaitTime;
                     continue;
                 }

BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs

@@ -132,7 +132,7 @@ namespace BlueWaterProject
 
         protected override void Attack()
         {
-            StartCoroutine(nameof(ShootArrowAnimation));
+            StartCoroutine(nameof(AttackAnimation));
         }
         
         public override void SetNearestTargetInOffense<T>(List<T> targetList)
@@ -221,7 +221,7 @@ namespace BlueWaterProject
         //     return targetInAttackRange && raycastHitTarget;
         // }
         
-        private IEnumerator ShootArrowAnimation()
+        protected override IEnumerator AttackAnimation()
         {
             while (true)
             {

BlueWater/Assets/02.Scripts/Ai/Unit/UnitController.cs

@@ -20,45 +20,14 @@ namespace BlueWaterProject
 
         private void OnDrawGizmosSelected()
         {
-            if (unit == null || unit.SailorCount <= 0) return;
+            if (!Application.isPlaying || unit == null || unit.SailorCount <= 0) return;
-            
-            var gridSize = 0;
 
-            switch (unit.SailorCount)
+            foreach (var item in unit.UnitList)
             {
-                case 0:
+                var unitPos = item.transform.position;
-                    gridSize = 1;
+                var ray = new Ray(unitPos + Vector3.up, Vector3.down);
-                    break;
+                Gizmos.color = Physics.Raycast(ray, UnitManager.Inst.MaxGroundDistance, UnitManager.Inst.GroundLayer) ? Color.blue : Color.red;
-                case <= 3:
+                Gizmos.DrawRay(ray.origin, ray.direction * UnitManager.Inst.MaxGroundDistance);
-                    gridSize = 2;
-                    break;
-                case <= 8:
-                    gridSize = 3;
-                    break;
-                case <= 15:
-                    gridSize = 4;
-                    break;
-                default:
-                    print("유닛의 병사 숫자 설정 에러");
-                    break;
-            }
-            
-            for (var i = 0; i < gridSize; i++)
-            {
-                for (var j = 0; j < gridSize; j++)
-                {
-                    var currentPos = i * gridSize + j;
-
-                    if (currentPos > unit.SailorCount) break;
-                    
-                    var xOffset = (i - (gridSize - 1) / 2.0f) * UnitManager.Inst.UnitSpacing;
-                    var zOffset = (j - (gridSize - 1) / 2.0f) * UnitManager.Inst.UnitSpacing;
-                    var spawnPosition = transform.position + new Vector3(xOffset, 0, zOffset);
-
-                    var ray = new Ray(spawnPosition + Vector3.up, Vector3.down);
-                    Gizmos.color = Physics.Raycast(ray, UnitManager.Inst.MaxGroundDistance, UnitManager.Inst.GroundLayer) ? Color.blue : Color.red;
-                    Gizmos.DrawRay(ray.origin, ray.direction * UnitManager.Inst.MaxGroundDistance);
-                }
             }
         }
 

BlueWater/Assets/02.Scripts/Ai/Unit/UnitManager.cs

@@ -442,11 +442,11 @@ namespace BlueWaterProject
 
             for (var i = 0; i < unitController.unit.SailorCount; i++)
             {
-                var soldierPos = unitController.unit.UnitList[i].transform.position;
+                var unitPos = unitController.unit.UnitList[i].transform.position;
-                var ray = new Ray(soldierPos + Vector3.up, Vector3.down);
+                var ray = new Ray(unitPos + Vector3.up, Vector3.down);
                 if (Physics.Raycast(ray, out var hit, MaxGroundDistance, GroundLayer))
                 {
-                    soldierPos.y = hit.point.y;
+                    unitPos.y = hit.point.y;
                 }
                 else
                 {

BlueWater/Assets/02.Scripts/Data/So/EnemyUnitDataSo.asset

@@ -28,7 +28,7 @@ MonoBehaviour:
     <SailorStatIdx>k__BackingField: ai_stat_sailor_e_004
     <UnitName>k__BackingField: EnemySwordKnight001
     <UnitType>k__BackingField: -1
-    <SailorCount>k__BackingField: 3
+    <SailorCount>k__BackingField: 11
     <AttackerType>k__BackingField: 1
     <OffenseType>k__BackingField: -1
     <DefenseType>k__BackingField: 2

BlueWater/Assets/02.Scripts/IslandInfo.cs

@@ -104,6 +104,20 @@ namespace BlueWaterProject
             {
                 TargetAllList.Remove(element);
             }
+            
+            CleanupList(list);
+            CleanupList(TargetAllList);
+        }
+        
+        private void CleanupList(List<Transform> list)
+        {
+            for (var i = list.Count - 1; i >= 0; i--)
+            {
+                if (list[i] == null || list[i].gameObject == null)
+                {
+                    list.RemoveAt(i);
+                }
+            }
         }
 
         #endregion

BlueWater/Assets/05.Prefabs/Character/BaseCharacter.prefab

@@ -8920,7 +8920,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 155132}
   serializedVersion: 4
-  m_Mass: 1
+  m_Mass: 100
   m_Drag: 0
   m_AngularDrag: 0.05
   m_CenterOfMass: {x: 0, y: 0, z: 0}