#30 Radar target ui timing and set active

BlueWater/Assets/02.Scripts/DataManager.cs

@@ -30,6 +30,12 @@ namespace BlueWaterProject
         public GameObject mouseSpot;
         public GameObject boat;
         public GameObject assaultCard;
+        public GameObject radarTargetUi;
+
+        [Title("DataBase", "Particle")] 
+        public GameObject nukeFire;
+        public GameObject grenadeFire;
+        
 
         [Title("DataBase", "Sprites")] 
         public Sprite[] cardType;

BlueWater/Assets/02.Scripts/Player/Canon.cs

@@ -0,0 +1,37 @@
+using System;
+using Blobcreate.ProjectileToolkit;
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class Canon : MonoBehaviour
+    {
+        public float power;
+        public float reloadTime;
+        public GameObject radarTargetUI;
+    
+        public Rigidbody projectilePrefab;
+        public Transform launchPoint;
+        public float timeOfFlight = 1f;
+        public Transform predictedPos;
+
+        private void Init()
+        {
+            projectilePrefab = DataManager.Inst.grenadeFire.GetComponent<Rigidbody>();
+            launchPoint = transform.Find("FirePoint");
+        }
+        
+        private void Awake()
+        {
+            Init();
+        }
+
+        public void Fire()
+        {
+            var myRigid = Instantiate(projectilePrefab, launchPoint.position, launchPoint.rotation);
+            var v = Projectile.VelocityByTime(myRigid.transform.position, predictedPos.position, timeOfFlight);
+            myRigid.AddForce(v, ForceMode.VelocityChange);
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Player/Canon.cs.meta

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

BlueWater/Assets/02.Scripts/Player/Player.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using Blobcreate.ProjectileToolkit;
 using Sirenix.OdinInspector;
 using UnityEngine;
@@ -14,9 +16,6 @@ namespace BlueWaterProject
         private Rigidbody rb;
         private Vector2 movementInput;
         
-        [Title("Child Object")]
-        private GameObject character;
-        
         [Title("쉽의 기본 설정")]
         [Tooltip("최대 스피드")]
         public float maxSpeed = 10f;
@@ -28,6 +27,7 @@ namespace BlueWaterProject
         public float turnSpeed = 10f;
         
         [Title("캐릭터의 기본 설정")]
+        private GameObject character;
         [Tooltip("캐릭터의 이동 속도")]
         public float characterSpeed = 10f;
         
@@ -36,6 +36,13 @@ namespace BlueWaterProject
         public Transform[] inCameraRadar = new Transform[10];
         public Transform target;
         
+        [Title("캐논")]
+        public Rigidbody projectilePrefab;
+        public Transform launchPoint;
+        public float timeOfFlight;
+        public Transform predictedPos;
+        public List<Canon> Canons { get; } = new (GlobalValue.MAX_CANON_COUNT);
+        
         public bool IsAssaultMode { get; set; }
         public bool IsInShipMode { get; set; }
         public bool IsDredgeMode { get; set; }
@@ -53,7 +60,12 @@ namespace BlueWaterProject
         {
             Init();
         }
-        
+
+        private void Start()
+        {
+            CanonInit();
+        }
+
         private void FixedUpdate()
         {
             if (IsInShipMode)
@@ -132,7 +144,7 @@ namespace BlueWaterProject
 
         private void OnInteractionE(InputValue value)
         {
-            Fire();
+            UiManager.Inst.CheckRadarOverlap();
         }
 
         private void OnInteraction(InputValue value) //F
@@ -168,7 +180,9 @@ namespace BlueWaterProject
         {
             UiManager.Inst.AddCard();
         }
-        
+
+        #region TakeAim & Fire
+
         private void OnTakeAim(InputValue value) // Space
         {
             SwitchTakeAim(!IsTakeAim);
@@ -195,16 +209,11 @@ namespace BlueWaterProject
             UiManager.Inst.AimOnOff(isOn);
         }
 
-        [SerializeField] Rigidbody projectilePrefab;
+        #endregion
-        [SerializeField] Transform launchPoint;
+
-        [SerializeField] float timeOfFlight;
+        private void CanonInit()
-        [SerializeField] Transform predictedPos;
-        
-        private void Fire()
         {
-            var myRigid = Instantiate(projectilePrefab, launchPoint.position, launchPoint.rotation);
+            GetComponentsInChildren(Canons);
-            var v = Projectile.VelocityByTime(myRigid.transform.position, predictedPos.position, timeOfFlight);
-            myRigid.AddForce(v, ForceMode.VelocityChange);
         }
     }
 }

BlueWater/Assets/02.Scripts/Ui.meta

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

BlueWater/Assets/02.Scripts/Ui/RadarNeedle.cs

@@ -0,0 +1,21 @@
+using System;
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class RadarNeedle : MonoBehaviour
+    {
+        [field: SerializeField]
+        [field: Tooltip("바늘 회전 속도 \n 360 = 1초에 1바퀴 \n 음수는 시계방향")]
+        public float RotationSpeed { get; set; }
+        private float currentRotationZ = 0f;
+
+        private void Update()
+        {
+            currentRotationZ += RotationSpeed * Time.deltaTime;
+            currentRotationZ = currentRotationZ % 360;  // 360을 초과하지 않도록
+            transform.eulerAngles = new Vector3(0, 0, currentRotationZ);
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Ui/RadarNeedle.cs.meta

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

BlueWater/Assets/02.Scripts/Ui/RadarTargetUI.cs

@@ -0,0 +1,33 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class RadarTargetUI : MonoBehaviour
+    {
+        public float RotationZ { get; private set; }
+        public Image Image { get; private set; }
+
+        private void OnEnable()
+        {
+            Image = GetComponent<Image>();
+        }
+
+        private void Update()
+        {
+            transform.rotation = Quaternion.Euler(0, 0, RotationZ + Image.fillAmount * -180);
+        }
+
+        /// <summary>
+        /// 레이더 타겟 초기화 (노란색 부분)
+        /// </summary>
+        /// <param name="rotation">위치 조절</param>
+        /// <param name="fillAmount">크기 조절 0.1 = 360의 10퍼센트</param>
+        public void RadarTargetInit(float rotation, float fillAmount)
+        {
+            RotationZ = rotation;
+            Image.fillAmount = fillAmount;
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Ui/RadarTargetUI.cs.meta

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

BlueWater/Assets/02.Scripts/Ui/UiManager.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using Doozy.Runtime.Reactor.Animators;
+using Sirenix.OdinInspector;
+using UnityEngine;
+using UnityEngine.UI;
+using Random = UnityEngine.Random;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class UiManager : Singleton<UiManager>
+    {
+        [Title("Card")]
+        private Transform cardLayoutGroup;
+        public UIAnimator CardLayoutGroupAnimator { get; set; }
+    
+        [Title("TakeAim")]
+        private GameObject takeAim;
+        private Texture2D cursorTexture;
+        private bool isTakeAim;
+        
+        [Title("Radar")]
+        private Transform radar;
+        private Transform radarTargets;
+        public List<RadarTargetUI> RadarTargetUis { get; } = new (GlobalValue.MAX_CANON_COUNT);
+        public RadarNeedle RadarNeedle { get; private set; }
+       
+
+        private void Init()
+        {
+            cardLayoutGroup = transform.Find("CardLayoutGroup");
+            CardLayoutGroupAnimator = cardLayoutGroup.GetComponent<UIAnimator>();
+            takeAim = transform.Find("Aim").gameObject;
+            
+            radar = transform.Find("Radar");
+            radarTargets = radar.Find("RadarTargets");
+
+            RadarNeedle = radar.Find("RadarNeedle").GetComponent<RadarNeedle>();
+        }
+    
+        protected override void OnAwake()
+        {
+            Init();
+        }
+
+        private void Start()
+        {
+            CursorTextureChange();
+            AssaultCardInit();
+            
+            for (var i = 0; i < GameManager.Inst.player.Canons.Count; i++)
+            {
+                RadarTargetInit();
+            }
+        }
+
+        public void AddCard() //TODO Test button and function, delete later
+        {
+            Instantiate(DataManager.Inst.assaultCard, cardLayoutGroup);
+        }
+    
+        public void AimOnOff(bool isOn)
+        {
+            takeAim.SetActive(isOn);
+            isTakeAim = isOn;
+        }
+    
+        private void CursorTextureChange()
+        {
+            cursorTexture = DataManager.Inst.cursorTexture;
+            //var hotSpot = new Vector2(cursorTexture.width / 2f, cursorTexture.height / 2f);
+            var hotSpot = Vector2.zero;
+            Cursor.SetCursor(cursorTexture, hotSpot, CursorMode.Auto);
+        }
+
+        private void AssaultCardInit()
+        {
+            for (int i = 0; i < DataManager.Inst.CardList.Count; i++)
+            {
+                var obj = Instantiate(DataManager.Inst.assaultCard, cardLayoutGroup);
+                var draggableCard = obj.GetComponent<DraggableCard>();
+                draggableCard.card = DataManager.Inst.GetCardDictionaryFromKey(DataManager.Inst.CardList[i]);
+                draggableCard.CardInit();
+            }
+        }
+        
+        public void RadarTargetInit()
+        {
+            var obj = Instantiate(DataManager.Inst.radarTargetUi, radarTargets);
+            var radarTargetUi = obj.GetComponent<RadarTargetUI>();
+            radarTargetUi.RadarTargetInit(Random.Range(0f, 360f), Random.Range(0.1f, 0.2f));
+            RadarTargetUis.Add(radarTargetUi);
+        }
+        
+        public void CheckRadarOverlap()
+        {
+            var needleRotationZ = RadarNeedle.transform.eulerAngles.z;
+    
+            for (var i = 0; i < RadarTargetUis.Count; i++)
+            {
+                var radarTargetUI = RadarTargetUis[i];
+                var startAngle = radarTargetUI.RotationZ;
+                var endAngle = radarTargetUI.RotationZ + radarTargetUI.Image.fillAmount * 360f;
+
+                // 각도 비교 및 허용 오차 추가
+                if (IsOverlap(needleRotationZ, startAngle, endAngle, GlobalValue.RADAR_OVERLAP_TOLERANCE)) // 5도의 오차 허용
+                {
+                    radarTargetUI.gameObject.SetActive(false);
+                }
+            }
+        }
+        
+        private bool IsOverlap(float needleRotation, float startAngle, float endAngle, float tolerance = 0)
+        {
+            // 오프셋 보정 예시
+            var correctedNeedleRotation = needleRotation + 36;
+
+            return correctedNeedleRotation >= (startAngle - tolerance) && correctedNeedleRotation <= (endAngle + tolerance);
+        }
+
+    }
+}

BlueWater/Assets/02.Scripts/UiManager.cs

@@ -1,67 +0,0 @@
-using Doozy.Runtime.Reactor.Animators;
-using Sirenix.OdinInspector;
-using UnityEngine;
-
-// ReSharper disable once CheckNamespace
-namespace BlueWaterProject
-{
-    public class UiManager : Singleton<UiManager>
-    {
-        [Title("Card")]
-        private Transform cardLayoutGroup;
-        public UIAnimator CardLayoutGroupAnimator { get; set; }
-    
-        [Title("TakeAim")]
-        private GameObject takeAim;
-        private Texture2D cursorTexture;
-        private bool isTakeAim;
-
-        private void Init()
-        {
-            cardLayoutGroup = transform.Find("CardLayoutGroup");
-            CardLayoutGroupAnimator = cardLayoutGroup.GetComponent<UIAnimator>();
-            takeAim = transform.Find("Aim").gameObject;
-        }
-    
-        protected override void OnAwake()
-        {
-            Init();
-        }
-
-        private void Start()
-        {
-            CursorTextureChange();
-            AssaultCardInit();
-        }
-
-        public void AddCard() //TODO Test button and function, delete later
-        {
-            Instantiate(DataManager.Inst.assaultCard, cardLayoutGroup);
-        }
-    
-        public void AimOnOff(bool isOn)
-        {
-            takeAim.SetActive(isOn);
-            isTakeAim = isOn;
-        }
-    
-        private void CursorTextureChange()
-        {
-            cursorTexture = DataManager.Inst.cursorTexture;
-            //var hotSpot = new Vector2(cursorTexture.width / 2f, cursorTexture.height / 2f);
-            var hotSpot = Vector2.zero;
-            Cursor.SetCursor(cursorTexture, hotSpot, CursorMode.Auto);
-        }
-
-        private void AssaultCardInit()
-        {
-            for (int i = 0; i < DataManager.Inst.CardList.Count; i++)
-            {
-                var obj = Instantiate(DataManager.Inst.assaultCard, cardLayoutGroup);
-                var draggableCard = obj.GetComponent<DraggableCard>();
-                draggableCard.card = DataManager.Inst.GetCardDictionaryFromKey(DataManager.Inst.CardList[i]);
-                draggableCard.CardInit();
-            }
-        }
-    }
-}

BlueWater/Assets/02.Scripts/Utility/GlobalValue.cs

@@ -10,7 +10,12 @@ namespace BlueWaterProject
         public const int ISLAND_DATA_CAPACITY = 50;
         public const int ONE_UNIT_CAPACITY = 16;
         public const int AI_ANIMATOR_CAPACITY = 10;
-    
+        
+        public const int MAX_CANON_COUNT = 5;
+        
+        /// <summary> Radar 바늘이 레이더에 겹치는 허용 범위 </summary>
+        public const float RADAR_OVERLAP_TOLERANCE = 5f;
+        
         public enum UnitType
         {
             NONE = -1,

BlueWater/Assets/05.Prefabs/Particles/ShadowMissileOBJ.prefab

@@ -0,0 +1,102 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &128572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 450904}
+  - component: {fileID: 13576440}
+  - component: {fileID: 5479992}
+  - component: {fileID: 11464288}
+  m_Layer: 0
+  m_Name: ShadowMissileOBJ
+  m_TagString: Missile
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &450904
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128572}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 8.313633, y: 5.892903, z: -13.319157}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &13576440
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128572}
+  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_Radius: 0.15
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &5479992
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128572}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 1
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!114 &11464288
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: acd27932048c3254597a02078fa2cb26, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  impactParticle: {fileID: 1282100793984216, guid: 41aeb961c68cf3d49be047342faf77b8,
+    type: 3}
+  projectileParticle: {fileID: 150356, guid: a9286d9ebf8c6b947917ec3f20e96819, type: 3}
+  muzzleParticle: {fileID: 150312, guid: da454a5cc69c9464aa8eae6b8492536e, type: 3}
+  colliderRadius: 0.1
+  collideOffset: 0.1

BlueWater/Assets/05.Prefabs/Particles/ShadowMissileOBJ.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 38edcd2a0a09548ecbfe4d1a0c129002
+timeCreated: 1552177093
+licenseType: Store
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Player.meta

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

BlueWater/Assets/05.Prefabs/Player/SM_Prop_Cannon_01 (3).prefab

@@ -0,0 +1,136 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1552059112848199257
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1055643547297219040}
+  - component: {fileID: 2556788256821959539}
+  m_Layer: 7
+  m_Name: FirePoint
+  m_TagString: Untagged
+  m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1055643547297219040
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1552059112848199257}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.23903932, y: 0.67399514, z: 0.21174636, w: 0.6661488}
+  m_LocalPosition: {x: -0.012, y: 0.818, z: 1.822}
+  m_LocalScale: {x: 1.4093482, y: 1.4093485, z: 1.4093487}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2155776711209515616}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2556788256821959539
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1552059112848199257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3e8c36fe9172849798f9c4fd87b77ec7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  power: 0
+  reloadTime: 0
+  projectilePrefab: {fileID: 0}
+  launchPoint: {fileID: 0}
+  timeOfFlight: 1
+  predictedPos: {fileID: 0}
+--- !u!1 &4836829392273355565
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2155776711209515616}
+  - component: {fileID: 244436262679622758}
+  - component: {fileID: 1460342609431344591}
+  m_Layer: 7
+  m_Name: SM_Prop_Cannon_01 (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2155776711209515616
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4836829392273355565}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.23903932, y: -0.67399514, z: -0.21174636, w: 0.6661488}
+  m_LocalPosition: {x: -0.8625002, y: 2.4082499, z: 0.795002}
+  m_LocalScale: {x: 0.7095477, y: 0.7095476, z: 0.70954806}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1055643547297219040}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: -37.15, y: -811.641, z: 2.885}
+--- !u!33 &244436262679622758
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4836829392273355565}
+  m_Mesh: {fileID: 4300000, guid: 762ed5390269c4c4185e61661508264a, type: 3}
+--- !u!23 &1460342609431344591
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4836829392273355565}
+  m_Enabled: 1
+  m_CastShadows: 2
+  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: 5e1235b2e417983469723d36f05de88d, 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: 0
+  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}

BlueWater/Assets/05.Prefabs/Player/SM_Prop_Cannon_01 (3).prefab.meta

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

BlueWater/Assets/05.Prefabs/Ui/RadarTarget.prefab

@@ -0,0 +1,90 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1435528194207525114
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8499389445738743036}
+  - component: {fileID: 2577121006411424412}
+  - component: {fileID: 6371986274854545812}
+  - component: {fileID: 508809779548629235}
+  m_Layer: 5
+  m_Name: RadarTarget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8499389445738743036
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1435528194207525114}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 300, y: 300}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2577121006411424412
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1435528194207525114}
+  m_CullTransparentMesh: 1
+--- !u!114 &6371986274854545812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1435528194207525114}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.9263606, b: 0, a: 0.39215687}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 679b53e1abc3d4686ad690aa88542b77, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 0.1
+  m_FillClockwise: 0
+  m_FillOrigin: 2
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &508809779548629235
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1435528194207525114}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2318ac00dd2af443a8f5b7d0960ce541, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

BlueWater/Assets/05.Prefabs/Ui/RadarTarget.prefab.meta

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

BlueWater/Assets/GolemiteGames/GridBuilder2/Demo/DemoMaterials/Satellite_Demo.mat

@@ -53,7 +53,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 52f14bdab023a934bb5bbf70ef53ee52, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap: