Merge remote-tracking branch 'origin/main'

# Conflicts:
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc.meta
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/2_Cloth.meta

BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs

@@ -95,7 +95,7 @@ namespace BlueWaterProject
             if (!Physics.Raycast(ray, out hit)) return false;
             if (!hit.collider.CompareTag("Ground")) return false;
             Destroy(gameObject);
-            var obj = Instantiate(DataManager.Inst.boat, GameManager.Inst.player.transform.position,
+            var obj = Instantiate(DataManager.Inst.boat, GameManager.Inst.shipPlayer.transform.position,
                 Quaternion.identity);
                 
             var boat = obj.GetComponent<Boat>();

BlueWater/Assets/02.Scripts/CameraController.cs

@@ -76,8 +76,8 @@ namespace BlueWaterProject
             Vector3 newPosition = takeAimCam.transform.position;
             newPosition.y += mouseDelta.y * sensitivity;
             newPosition.y = Mathf.Clamp(newPosition.y, heightLimits.x, heightLimits.y);
-            newPosition.x = GameManager.Inst.player.transform.position.x;
+            newPosition.x = GameManager.Inst.shipPlayer.transform.position.x;
-            newPosition.z = GameManager.Inst.player.transform.position.z;
+            newPosition.z = GameManager.Inst.shipPlayer.transform.position.z;
             takeAimCam.transform.position = newPosition;
 
 

BlueWater/Assets/02.Scripts/Character/BaseCharacter.cs

@@ -3,10 +3,15 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public class BaseCharacter2D : MonoBehaviour
+    public class BaseCharacter : MonoBehaviour
     {
         #region Built-in Methods
 
+        protected void OnDrawGizmosSelected()
+        {
+            
+        }
+
         protected virtual void Awake()
         {
             

BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public class Player2D : BaseCharacter2D
+    public abstract class Enemy : BaseCharacter
     {
         
     }

BlueWater/Assets/02.Scripts/Character/Enemy/Type/Archer.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public class EmptyNpc : Npc2D
+    public class Archer : Enemy
     {
     
     }

BlueWater/Assets/02.Scripts/Character/Npc/Npc.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public class Npc2D : BaseCharacter2D
+    public class Npc : BaseCharacter
     {
         
     }

BlueWater/Assets/02.Scripts/Character/Npc/Type/EmptyNpc.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public class Archer2D : Enemy2D
+    public class EmptyNpc : Npc
     {
     
     }

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

@@ -0,0 +1,13 @@
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class Player : BaseCharacter, IDamageable
+    {
+        public void TakeDamage(float attackerPower, float attackerShieldPenetrationRate = default, Vector3? attackPos = null)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Character/Player/Type/InShipPlayer.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public class InShip2D : Player2D
+    public class InShipPlayer : Player
     {
     
     }

BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Enemy2D.cs

@@ -1,10 +0,0 @@
-using UnityEngine;
-
-// ReSharper disable once CheckNamespace
-namespace BlueWaterProject
-{
-    public abstract class Enemy2D : BaseCharacter2D
-    {
-        
-    }
-}

BlueWater/Assets/02.Scripts/GameManager.cs

@@ -11,7 +11,7 @@ namespace BlueWaterProject
     {
         [Title("Controller")]
         public CameraController CameraController { get; private set; }
-        public Player player;
+        public ShipPlayer shipPlayer;
         public List<Boat> boats = new List<Boat>(10);
 
         [Range(0f, 1f)]
@@ -20,7 +20,7 @@ namespace BlueWaterProject
         private void Init()
         {
             CameraController = FindAnyObjectByType<CameraController>();
-            player = FindAnyObjectByType<Player>();
+            shipPlayer = FindAnyObjectByType<ShipPlayer>();
         }
         protected override void OnAwake()
         {

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

@@ -36,7 +36,7 @@ namespace BlueWaterProject
 
         private void Update()
         {
-            if (!GameManager.Inst.player.IsTargeting) return;
+            if (!GameManager.Inst.shipPlayer.IsTargeting) return;
             if(!radarTargetUI.gameObject.activeInHierarchy && !isReloading)
                 StartCoroutine(ReloadCoroutine());
         }

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

@@ -11,7 +11,7 @@ namespace BlueWaterProject
     [RequireComponent(typeof(Rigidbody))]
     [RequireComponent(typeof(PlayerInput))]
     [SelectionBase]
-    public class Player : MonoBehaviour
+    public class ShipPlayer : Player
     {
         [Title("Component")] 
         private Rigidbody rb;
@@ -86,22 +86,22 @@ namespace BlueWaterProject
             Raycast8DrawGizmo();
         }
 
-        private void Awake()
+        protected override void Awake()
         {
             Init();
         }
 
-        private void Start()
+        protected override void Start()
         {
             SwitchDredgeMode(true);
         }
 
-        private void FixedUpdate()
+        protected override void FixedUpdate()
         {
             HandleMovement();
         }
 
-        private void Update()
+        protected override void Update()
         {
             FindInRadarRange();
             FilterInCameraObjects();
@@ -423,5 +423,7 @@ namespace BlueWaterProject
         }
 
     #endregion
+    
+    
     }
 }

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

@@ -98,13 +98,13 @@ namespace BlueWaterProject
         {
             if (RadarTargetUis.Count == 0)
             {
-                for (var i = 0; i < GameManager.Inst.player.Canons.Count; i++)
+                for (var i = 0; i < GameManager.Inst.shipPlayer.Canons.Count; i++)
                 {
                     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);
-                    GameManager.Inst.player.Canons[i].radarTargetUI = radarTargetUi;
+                    GameManager.Inst.shipPlayer.Canons[i].radarTargetUI = radarTargetUi;
                 }
             }
             else
@@ -123,7 +123,7 @@ namespace BlueWaterProject
             for (var i = 0; i < RadarTargetUis.Count; i++)
             {
                 var radarTargetUI = RadarTargetUis[i];
-                var canon = GameManager.Inst.player.Canons[i];
+                var canon = GameManager.Inst.shipPlayer.Canons[i];
                 var startAngle = radarTargetUI.RotationZ - radarTargetUI.Image.fillAmount * 180f;
                 var endAngle = radarTargetUI.RotationZ + radarTargetUI.Image.fillAmount * 180f;
 
@@ -144,7 +144,7 @@ namespace BlueWaterProject
         {
             enemyTarget = target;
 
-            if (enemyTarget != null && GameManager.Inst.player.IsTargeting)
+            if (enemyTarget != null && GameManager.Inst.shipPlayer.IsTargeting)
             {
                 Vector3 screenPos = GameManager.Inst.CameraController.MainCam.WorldToScreenPoint(enemyTarget.position);
 

BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner wave/Floater.cs

@@ -18,7 +18,7 @@ namespace BlueWaterProject
             rb = GetComponent<Rigidbody>();
         }
 
-        void FixedUpdate()
+        private void FixedUpdate()
         {
             var waveNumber = 2.0f * Mathf.PI / waveGenerator.waveLength;
             var phaseConstant = waveGenerator.speed * waveNumber;

BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3643c0d76ec153646b1203880bfb64ed
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3d7c4217783978e4abe6496ac71eee94
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 078b8f13a17171b49892ad10426d5af0
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta

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

BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9aacf6f3043624194bb6f6fe9a580786
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta

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

BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 41e59f562b69648719f2424c438758f3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta

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

BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta

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

BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta

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

BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4368c9be31b3c174dbfd80f2caf98889
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 617b3f1032a08c14ebfedfa340767cdf
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta

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

BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 48e08dc33330d11e9d4a1b246c52e4f6
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta

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

BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta

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

BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta

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

BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: dc634df5fdff31d42b22d62f458a30c8
+guid: 4ff1f29eab234cf4490d9bb383892c44
-folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/Screen Space Cavity Curvature/SRP/HDRP.unitypackage.meta

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

BlueWater/Assets/Screen Space Cavity Curvature/SRP/URP.unitypackage.meta

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

BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage.meta

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

BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage.meta

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

BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 63fa4c6385d5807478747f832fef4a20
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: