Merge remote-tracking branch 'origin/main'

BlueWater/Assets/02.Scripts/Ai/Human/Combat/Enemy/Type/EnemyArcher.cs

@@ -84,11 +84,11 @@ namespace BlueWaterProject
             }
 
             combatAnimator.runtimeAnimatorController = archerController;
-            arrowsPoolLocation = GameObject.Find("ObjectPoolData/Arrows").transform;
-
+            
+            arrowsPoolLocation = GameObject.Find("ObjectPoolData/Arrows")?.transform;
             if (!arrowsPoolLocation)
             {
-                var objectPoolData = GameObject.Find("ObjectPoolData").transform;
+                var objectPoolData = GameObject.Find("ObjectPoolData")?.transform;
                 if (!objectPoolData)
                 {
                     objectPoolData = new GameObject("ObjectPoolData").transform;

BlueWater/Assets/02.Scripts/Ai/Human/Combat/Pirate/Type/PirateArcher.cs

@@ -85,11 +85,11 @@ namespace BlueWaterProject
             }
 
             combatAnimator.runtimeAnimatorController = archerController;
-            arrowsPoolLocation = GameObject.Find("ObjectPoolData/Arrows").transform;
-
+            
+            arrowsPoolLocation = GameObject.Find("ObjectPoolData/Arrows")?.transform;
             if (!arrowsPoolLocation)
             {
-                var objectPoolData = GameObject.Find("ObjectPoolData").transform;
+                var objectPoolData = GameObject.Find("ObjectPoolData")?.transform;
                 if (!objectPoolData)
                 {
                     objectPoolData = new GameObject("ObjectPoolData").transform;

BlueWater/Assets/02.Scripts/Ai/Tower.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d834347f4033f5a4895d848e658d8d76
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/02.Scripts/Ai/Tower/TowerAi.cs

@@ -0,0 +1,8 @@
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class TowerAi : BaseAi
+    {
+    
+    }
+}

BlueWater/Assets/02.Scripts/Ai/Tower/TowerAi.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c3edcdb980004df49baa002cf4b18860
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/02.Scripts/Ai/Tower/Type.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6ee066f60c2e44dda2859804ac4ecdb4
+timeCreated: 1695134020

BlueWater/Assets/02.Scripts/Ai/Tower/Type/ArrowTower.cs

@@ -0,0 +1,242 @@
+using System;
+using System.Collections;
+using Sirenix.OdinInspector;
+using UnityEngine;
+using UnityEngine.AI;
+using UnityEngine.Pool;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class ArrowTower : TowerAi, IDamageable
+    {
+        #region Property and variable
+
+        [Title("Tower Stat")]
+        [SerializeField] private bool isDrawGizmosInFieldOfView = true;
+        [SerializeField] private bool isPredictAttack = true;
+        
+        [OnValueChanged(nameof(SetLayer))]
+        [SerializeField] private EAiType aiType;
+        [SerializeField] private float maxHp;
+        [SerializeField] private float currentHp;
+        [SerializeField] private float atk;
+        [SerializeField] private float atkRange;
+        [SerializeField] private float atkCooldown;
+        [SerializeField] private float shieldPenetrationRate;
+        [SerializeField] private float inaccuracy;
+        
+        [Title("실시간 타겟 정보")]
+        [SerializeField] private LayerMask targetLayer;
+        [SerializeField] private LayerMask arrowLayer;
+        [SerializeField] private Collider[] colliderWithinRange;
+        [SerializeField] private Collider targetCollider;
+        
+        [Title("화살 오브젝트 관리")]
+        [Tooltip("화살 오브젝트 풀링할 최대 갯수")]
+        [SerializeField] private int arrowMaxSize = 100;
+        
+        private Transform arrowsPoolLocation;
+        private IObjectPool<Arrow> arrowPool;
+        private Transform shootLocation;
+
+        private const int TARGET_MAX_SIZE = 20;
+        
+        #endregion
+
+        #region Unity built-in Methods
+        
+        private void OnDrawGizmosSelected()
+        {
+            if (!isDrawGizmosInFieldOfView) return;
+
+            Gizmos.color = Color.blue;
+            Gizmos.DrawWireSphere(transform.position, atkRange);
+                
+            if (!targetCollider) return;
+                
+            Gizmos.color = Color.red;
+            Gizmos.DrawLine(shootLocation.position, targetCollider.bounds.center);
+        }
+
+        private void Awake()
+        {
+            InitComponent();
+        }
+
+        private void Start()
+        {
+            SetCurrentHp(maxHp);
+            
+            StartCoroutine(nameof(Attack));
+        }
+
+        #endregion
+        
+        #region IDamageable interface
+
+        public void TakeDamage(float attackerPower, float attackerShieldPenetrationRate = default, Vector3? attackPos = null)
+        {
+            var changeHp = Mathf.Max(currentHp - attackerPower, 0);
+            SetCurrentHp(changeHp);
+
+            // 건물 파괴
+            if (changeHp == 0f)
+            {
+                Die();
+                // RemoveIslandInfo();
+            }
+        }
+
+        #endregion
+
+        #region Custom methods
+
+        private void InitComponent()
+        {
+            shootLocation = transform.Find("ShootLocation");
+            
+            arrowsPoolLocation = GameObject.Find("ObjectPoolData/Arrows")?.transform;
+            if (!arrowsPoolLocation)
+            {
+                var objectPoolData = GameObject.Find("ObjectPoolData")?.transform;
+                if (!objectPoolData)
+                {
+                    objectPoolData = new GameObject("ObjectPoolData").transform;
+                }
+                
+                if (!objectPoolData.Find("Arrows"))
+                {
+                    Instantiate(new GameObject("Arrows"), Vector3.zero, Quaternion.identity, objectPoolData);
+                }
+            }
+            arrowPool = new ObjectPool<Arrow>(CreateArrow, OnGetArrow, OnReleaseArrow, OnDestroyArrow, maxSize:arrowMaxSize);
+
+            colliderWithinRange = new Collider[TARGET_MAX_SIZE];
+        }
+
+        private void SetLayer()
+        {
+            switch (aiType)
+            {
+                case EAiType.NONE:
+                    targetLayer = 0;
+                    break;
+                case EAiType.PLAYER:
+                case EAiType.PIRATE:
+                    targetLayer = LayerMask.GetMask("Enemy");
+                    break;
+                case EAiType.ENEMY:
+                    targetLayer = LayerMask.GetMask("Player") | LayerMask.GetMask("Pirate");
+                    break;
+                default:
+                    targetLayer = 0;
+                    arrowLayer = 0;
+                    throw new ArgumentOutOfRangeException();
+            }
+
+            arrowLayer = targetLayer | LayerMask.GetMask("Ground") | LayerMask.GetMask("Water") |
+                         LayerMask.GetMask("Props");
+        }
+
+        private IEnumerator Attack()
+        {
+            while (true)
+            {
+                FindNearestTargetInRange(atkRange);
+
+                if (!targetCollider)
+                {
+                    yield return new WaitForSeconds(atkCooldown);
+                    continue;
+                }
+                var arrow = arrowPool.Get();
+                var targetPos = isPredictAttack ? PredictTargetPosition(shootLocation, targetCollider, arrow.GetArrowSpeed()) : targetCollider.bounds.center;
+
+                arrow.SetShootingArrow(shootLocation.position, transform.position,
+                    targetPos, aiType, atk, shieldPenetrationRate, inaccuracy, false);
+                arrow.ShootArrowCoroutine();
+                
+                yield return new WaitForSeconds(atkCooldown);
+            }
+        }
+        
+        private void FindNearestTargetInRange(float range)
+        {
+            Array.Clear(colliderWithinRange, 0, TARGET_MAX_SIZE);
+            
+            var maxColliderCount = Physics.OverlapSphereNonAlloc(transform.position, range, colliderWithinRange, 
+                targetLayer, QueryTriggerInteraction.Collide);
+
+            if (maxColliderCount <= 0)
+            {
+                SetTargetCollider(null);
+                return;
+            }
+
+            var nearestDistance = Mathf.Infinity;
+            Collider nearestTargetTransform = null;
+            
+            for (var i = 0; i < maxColliderCount; i++)
+            {
+                var distanceToTarget = Vector3.Distance(shootLocation.position, colliderWithinRange[i].bounds.center);
+                
+                if (!IsRaycastHitTarget(shootLocation.position, colliderWithinRange[i]) || distanceToTarget >= nearestDistance) continue;
+
+                if (distanceToTarget >= nearestDistance) continue;
+                    
+                nearestDistance = distanceToTarget;
+                nearestTargetTransform = colliderWithinRange[i];
+            }
+
+            SetTargetCollider(nearestTargetTransform);
+        }
+        
+        private bool IsRaycastHitTarget(Vector3 startPos, Collider target)
+        {
+            var direction = ((target.bounds.center) - (startPos)).normalized;
+            var raycastHitTarget = Physics.Raycast(startPos, direction, out var hit, atkRange, arrowLayer, QueryTriggerInteraction.Collide);
+
+            return raycastHitTarget && target == hit.collider;
+        }
+        
+        private Vector3 PredictTargetPosition(Transform shooter, Collider target, float arrowSpeed)
+        {
+            var targetVelocity = target.GetComponent<NavMeshAgent>().velocity;
+            
+            var targetPos = target.bounds.center;
+            var directionToTarget = targetPos - shooter.position;
+            var distanceToTarget = directionToTarget.magnitude;
+            var timeToImpact = distanceToTarget / arrowSpeed;
+            var predictedPosition = targetPos + targetVelocity * timeToImpact;
+
+            return predictedPosition;
+        }
+
+        private void Die()
+        {
+            StopAllCoroutines();
+            Destroy(gameObject);
+        }
+        
+        private void SetCurrentHp(float value) => currentHp = value;
+        private void SetTargetCollider(Collider value) => targetCollider = value;
+
+        #endregion
+        
+        #region ObjectPool Function
+
+        private Arrow CreateArrow()
+        {
+            var arrow = Instantiate(UnitManager.Inst.ArrowPrefab, shootLocation.position, Quaternion.identity, arrowsPoolLocation).GetComponent<Arrow>();
+            arrow.SetManagedPool(arrowPool);
+            return arrow;
+        }
+
+        private void OnGetArrow(Arrow arrow) => arrow.gameObject.SetActive(true);
+        private void OnReleaseArrow(Arrow arrow) => arrow.ReleaseArrowSetting();
+        private void OnDestroyArrow(Arrow arrow) => Destroy(arrow.gameObject);
+
+        #endregion
+    }
+}

BlueWater/Assets/02.Scripts/Ai/Tower/Type/ArrowTower.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bd421891d0204bc5a748862f0ac9c0f1
+timeCreated: 1695134049

BlueWater/Assets/02.Scripts/HouseInfo.cs

@@ -41,6 +41,7 @@ namespace BlueWaterProject
             // 건물 파괴
             if (changeHp == 0f)
             {
+                Destroy(gameObject);
                 RemoveIslandInfo();
             }
         }

BlueWater/Assets/02.Scripts/Weapon/Arrow.cs

@@ -222,6 +222,8 @@ namespace BlueWaterProject
             gameObject.SetActive(false);
         }
 
+        public float GetArrowSpeed() => arrowSpeed;
+
         #endregion
     }
 }

BlueWater/Assets/05.Prefabs/Ai/Tower.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3085f74cbac6afc42a29da983ebfdecc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Ai/Tower/ArrowTower.prefab

@@ -0,0 +1,171 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &487125058940353845
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2838228105937795849}
+  m_Layer: 16
+  m_Name: ShootLocation
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2838228105937795849
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 487125058940353845}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0, z: 4.452}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9031747955947254101}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8848616787261608530
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9031747955947254101}
+  - component: {fileID: 8726458248037506361}
+  - component: {fileID: 8190100621632311398}
+  - component: {fileID: 3766443407819787020}
+  - component: {fileID: 9087576015726480415}
+  m_Layer: 16
+  m_Name: ArrowTower
+  m_TagString: Tower
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &9031747955947254101
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848616787261608530}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2838228105937795849}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8726458248037506361
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848616787261608530}
+  m_Mesh: {fileID: 4300004, guid: 5921e45280d702e44ad0fb582ac16d26, type: 3}
+--- !u!23 &8190100621632311398
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848616787261608530}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: ee90f878377271b4fbbf915249f24476, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &3766443407819787020
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848616787261608530}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 2.930729, y: 3.065148, z: 3.854234}
+  m_Center: {x: 0.07538414, y: -0.21270323, z: 0.4423293}
+--- !u!114 &9087576015726480415
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848616787261608530}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bd421891d0204bc5a748862f0ac9c0f1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isDrawGizmosInFieldOfView: 1
+  isPredictAttack: 1
+  aiType: 2
+  maxHp: 500
+  currentHp: 0
+  atk: 20
+  atkRange: 30
+  atkCooldown: 1
+  shieldPenetrationRate: 50
+  inaccuracy: 0
+  targetLayer:
+    serializedVersion: 2
+    m_Bits: 768
+  arrowLayer:
+    serializedVersion: 2
+    m_Bits: 66328
+  colliderWithinRange: []
+  targetCollider: {fileID: 0}
+  arrowMaxSize: 100

BlueWater/Assets/05.Prefabs/Ai/Tower/ArrowTower.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cc1c55d3cd2748146bcca57b19069c12
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/RayFire/Tutorial/Material/concrete_exterior.mat

@@ -116,7 +116,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.9433962, g: 0.9433962, b: 0.9433962, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.9433962, g: 0.9433962, b: 0.9433962, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []

BlueWater/Assets/RayFire/Tutorial/Material/metal.mat

@@ -49,7 +49,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 10305, guid: 0000000000000000f000000000000000, type: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

BlueWater/Assets/ToonyTinyPeople/TT_RTS/TT_RTS_Standard/models/materials/TT_RTS_Buildings.mat

@@ -14,6 +14,7 @@ Material:
   m_ValidKeywords:
   - DR_OUTLINE_ON
   - _CELPRIMARYMODE_SINGLE
+  - _DETAILMAPBLENDINGMODE_MULTIPLY
   - _TEXTUREBLENDINGMODE_MULTIPLY
   m_InvalidKeywords:
   - _UNITYSHADOWMODE_NONE
@@ -47,6 +48,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -95,6 +100,7 @@ Material:
     m_Floats:
     - _AlphaClip: 0
     - _AlphaToMask: 0
+    - _BaseMapPremultiply: 0
     - _Blend: 0
     - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
@@ -104,6 +110,8 @@ Material:
     - _CelPrimaryMode: 1
     - _Cull: 2
     - _Cutoff: 0.5
+    - _DetailMapBlendingMode: 0
+    - _DetailMapImpact: 0
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _DstBlendAlpha: 0
@@ -167,6 +175,7 @@ Material:
     - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}
     - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}
     - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
+    - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
     - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}

BlueWater/ProjectSettings/TagManager.asset

@@ -13,6 +13,7 @@ TagManager:
   - Unit
   - Missile
   - Area
+  - Tower
   layers:
   - Default
   - TransparentFX