diff --git a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs b/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs index b98a6b0dc..353be92bf 100644 --- a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs +++ b/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(); diff --git a/BlueWater/Assets/02.Scripts/CameraController.cs b/BlueWater/Assets/02.Scripts/CameraController.cs index a12e42f32..9928fa879 100644 --- a/BlueWater/Assets/02.Scripts/CameraController.cs +++ b/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.z = GameManager.Inst.player.transform.position.z; + newPosition.x = GameManager.Inst.shipPlayer.transform.position.x; + newPosition.z = GameManager.Inst.shipPlayer.transform.position.z; takeAimCam.transform.position = newPosition; diff --git a/BlueWater/Assets/02.Scripts/Character2D.meta b/BlueWater/Assets/02.Scripts/Character.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D.meta rename to BlueWater/Assets/02.Scripts/Character.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/BaseCharacter2D.cs b/BlueWater/Assets/02.Scripts/Character/BaseCharacter.cs similarity index 85% rename from BlueWater/Assets/02.Scripts/Character2D/BaseCharacter2D.cs rename to BlueWater/Assets/02.Scripts/Character/BaseCharacter.cs index 839c872a9..405b81f6f 100644 --- a/BlueWater/Assets/02.Scripts/Character2D/BaseCharacter2D.cs +++ b/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() { diff --git a/BlueWater/Assets/02.Scripts/Character2D/BaseCharacter2D.cs.meta b/BlueWater/Assets/02.Scripts/Character/BaseCharacter.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/BaseCharacter2D.cs.meta rename to BlueWater/Assets/02.Scripts/Character/BaseCharacter.cs.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Enemy2D.meta b/BlueWater/Assets/02.Scripts/Character/Enemy.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Enemy2D.meta rename to BlueWater/Assets/02.Scripts/Character/Enemy.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Player2D/Player2D.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs similarity index 70% rename from BlueWater/Assets/02.Scripts/Character2D/Player2D/Player2D.cs rename to BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs index ae342a97b..f9d4be228 100644 --- a/BlueWater/Assets/02.Scripts/Character2D/Player2D/Player2D.cs +++ b/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 { } diff --git a/BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Enemy2D.cs.meta b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Enemy2D.cs.meta rename to BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Type.meta b/BlueWater/Assets/02.Scripts/Character/Enemy/Type.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Type.meta rename to BlueWater/Assets/02.Scripts/Character/Enemy/Type.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Npc2D/Type/EmptyNpc2D.cs b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/Archer.cs similarity index 76% rename from BlueWater/Assets/02.Scripts/Character2D/Npc2D/Type/EmptyNpc2D.cs rename to BlueWater/Assets/02.Scripts/Character/Enemy/Type/Archer.cs index 5597c8792..f2e665297 100644 --- a/BlueWater/Assets/02.Scripts/Character2D/Npc2D/Type/EmptyNpc2D.cs +++ b/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 { } diff --git a/BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Type/Archer2D.cs.meta b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/Archer.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Type/Archer2D.cs.meta rename to BlueWater/Assets/02.Scripts/Character/Enemy/Type/Archer.cs.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Npc2D.meta b/BlueWater/Assets/02.Scripts/Character/Npc.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Npc2D.meta rename to BlueWater/Assets/02.Scripts/Character/Npc.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Npc2D/Npc2D.cs b/BlueWater/Assets/02.Scripts/Character/Npc/Npc.cs similarity index 73% rename from BlueWater/Assets/02.Scripts/Character2D/Npc2D/Npc2D.cs rename to BlueWater/Assets/02.Scripts/Character/Npc/Npc.cs index 8d51c7b47..416286b1c 100644 --- a/BlueWater/Assets/02.Scripts/Character2D/Npc2D/Npc2D.cs +++ b/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 { } diff --git a/BlueWater/Assets/02.Scripts/Character2D/Npc2D/Npc2D.cs.meta b/BlueWater/Assets/02.Scripts/Character/Npc/Npc.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Npc2D/Npc2D.cs.meta rename to BlueWater/Assets/02.Scripts/Character/Npc/Npc.cs.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Npc2D/Type.meta b/BlueWater/Assets/02.Scripts/Character/Npc/Type.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Npc2D/Type.meta rename to BlueWater/Assets/02.Scripts/Character/Npc/Type.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Type/Archer2D.cs b/BlueWater/Assets/02.Scripts/Character/Npc/Type/EmptyNpc.cs similarity index 75% rename from BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Type/Archer2D.cs rename to BlueWater/Assets/02.Scripts/Character/Npc/Type/EmptyNpc.cs index a127fafff..1c27a1be2 100644 --- a/BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Type/Archer2D.cs +++ b/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 { } diff --git a/BlueWater/Assets/02.Scripts/Character2D/Npc2D/Type/EmptyNpc2D.cs.meta b/BlueWater/Assets/02.Scripts/Character/Npc/Type/EmptyNpc.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Npc2D/Type/EmptyNpc2D.cs.meta rename to BlueWater/Assets/02.Scripts/Character/Npc/Type/EmptyNpc.cs.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Player2D.meta b/BlueWater/Assets/02.Scripts/Character/Player.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Player2D.meta rename to BlueWater/Assets/02.Scripts/Character/Player.meta diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Player.cs b/BlueWater/Assets/02.Scripts/Character/Player/Player.cs new file mode 100644 index 000000000..120326fea --- /dev/null +++ b/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(); + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Character2D/Player2D/Player2D.cs.meta b/BlueWater/Assets/02.Scripts/Character/Player/Player.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Player2D/Player2D.cs.meta rename to BlueWater/Assets/02.Scripts/Character/Player/Player.cs.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Player2D/Type.meta b/BlueWater/Assets/02.Scripts/Character/Player/Type.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Player2D/Type.meta rename to BlueWater/Assets/02.Scripts/Character/Player/Type.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Player2D/Type/InShip2D.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/InShipPlayer.cs similarity index 73% rename from BlueWater/Assets/02.Scripts/Character2D/Player2D/Type/InShip2D.cs rename to BlueWater/Assets/02.Scripts/Character/Player/Type/InShipPlayer.cs index b1659f0be..b7c91a8d2 100644 --- a/BlueWater/Assets/02.Scripts/Character2D/Player2D/Type/InShip2D.cs +++ b/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 { } diff --git a/BlueWater/Assets/02.Scripts/Character2D/Player2D/Type/InShip2D.cs.meta b/BlueWater/Assets/02.Scripts/Character/Player/Type/InShipPlayer.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Character2D/Player2D/Type/InShip2D.cs.meta rename to BlueWater/Assets/02.Scripts/Character/Player/Type/InShipPlayer.cs.meta diff --git a/BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Enemy2D.cs b/BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Enemy2D.cs deleted file mode 100644 index 3e097f8bb..000000000 --- a/BlueWater/Assets/02.Scripts/Character2D/Enemy2D/Enemy2D.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UnityEngine; - -// ReSharper disable once CheckNamespace -namespace BlueWaterProject -{ - public abstract class Enemy2D : BaseCharacter2D - { - - } -} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/GameManager.cs b/BlueWater/Assets/02.Scripts/GameManager.cs index 32fb42ae0..0c685d2d1 100644 --- a/BlueWater/Assets/02.Scripts/GameManager.cs +++ b/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 boats = new List(10); [Range(0f, 1f)] @@ -20,7 +20,7 @@ namespace BlueWaterProject private void Init() { CameraController = FindAnyObjectByType(); - player = FindAnyObjectByType(); + shipPlayer = FindAnyObjectByType(); } protected override void OnAwake() { diff --git a/BlueWater/Assets/02.Scripts/Player/Canon.cs b/BlueWater/Assets/02.Scripts/Player/Canon.cs index 889d22b2f..9b92f79a2 100644 --- a/BlueWater/Assets/02.Scripts/Player/Canon.cs +++ b/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()); } diff --git a/BlueWater/Assets/02.Scripts/Player/Player.cs b/BlueWater/Assets/02.Scripts/Player/ShipPlayer.cs similarity index 98% rename from BlueWater/Assets/02.Scripts/Player/Player.cs rename to BlueWater/Assets/02.Scripts/Player/ShipPlayer.cs index 233f073fe..096dbd709 100644 --- a/BlueWater/Assets/02.Scripts/Player/Player.cs +++ b/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 + + } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Player/Player.cs.meta b/BlueWater/Assets/02.Scripts/Player/ShipPlayer.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scripts/Player/Player.cs.meta rename to BlueWater/Assets/02.Scripts/Player/ShipPlayer.cs.meta diff --git a/BlueWater/Assets/02.Scripts/Ui/UiManager.cs b/BlueWater/Assets/02.Scripts/Ui/UiManager.cs index 0af57b131..9e7733772 100644 --- a/BlueWater/Assets/02.Scripts/Ui/UiManager.cs +++ b/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.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); diff --git a/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner wave/Floater.cs b/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner wave/Floater.cs index 58192a35e..d8905616c 100644 --- a/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner wave/Floater.cs +++ b/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner wave/Floater.cs @@ -18,7 +18,7 @@ namespace BlueWaterProject rb = GetComponent(); } - void FixedUpdate() + private void FixedUpdate() { var waveNumber = 2.0f * Mathf.PI / waveGenerator.waveLength; var phaseConstant = waveGenerator.speed * waveNumber; diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta b/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta deleted file mode 100644 index 384510c7b..000000000 --- a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3643c0d76ec153646b1203880bfb64ed -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta b/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta deleted file mode 100644 index a9c2e2131..000000000 --- a/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3d7c4217783978e4abe6496ac71eee94 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta deleted file mode 100644 index 508065e3b..000000000 --- a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta deleted file mode 100644 index b4ec97874..000000000 --- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 078b8f13a17171b49892ad10426d5af0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta deleted file mode 100644 index 2ac65e5d2..000000000 --- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f9406a33814af9c47b352e77f079d798 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta deleted file mode 100644 index 69d7b56dd..000000000 --- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9aacf6f3043624194bb6f6fe9a580786 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta deleted file mode 100644 index be555027e..000000000 --- a/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f4227764308e84f89a765fbf315e2945 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta deleted file mode 100644 index 350ee4c64..000000000 --- a/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 41e59f562b69648719f2424c438758f3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta deleted file mode 100644 index d7e559c52..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b044a2387a61dac41bdf204adffdce9d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta deleted file mode 100644 index 8ac8bbf10..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cd287c84e887ea24a8679e67aac7c074 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta deleted file mode 100644 index 589ee74d0..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta deleted file mode 100644 index e22c323d5..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f211254f5bfad224ba88868f2c75432c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta deleted file mode 100644 index ea9dafacc..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4368c9be31b3c174dbfd80f2caf98889 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta b/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta deleted file mode 100644 index 614e98f98..000000000 --- a/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 617b3f1032a08c14ebfedfa340767cdf -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta deleted file mode 100644 index 1eadf09a3..000000000 --- a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f597f19f656ba56eae4f6a3a7cc528f4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta deleted file mode 100644 index f073d2ab4..000000000 --- a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 48e08dc33330d11e9d4a1b246c52e4f6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta deleted file mode 100644 index 130722af7..000000000 --- a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed09910c0094cb27be8f3ca264680da3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta deleted file mode 100644 index f9b8ed82b..000000000 --- a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cc355dd4cf1e6173beaeb22c2858cbe1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta b/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta deleted file mode 100644 index e9dcfd405..000000000 --- a/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 832dbc378edad8d48b8e07b932ada0d2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta b/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta index ace61d623..cdb770faa 100644 --- a/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta +++ b/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: dc634df5fdff31d42b22d62f458a30c8 -folderAsset: yes +guid: 4ff1f29eab234cf4490d9bb383892c44 DefaultImporter: externalObjects: {} userData: diff --git a/BlueWater/Assets/Screen Space Cavity Curvature/SRP/HDRP.unitypackage.meta b/BlueWater/Assets/Screen Space Cavity Curvature/SRP/HDRP.unitypackage.meta deleted file mode 100644 index 38ab4bd44..000000000 --- a/BlueWater/Assets/Screen Space Cavity Curvature/SRP/HDRP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7dd73fb2fec8fb642be983cf08cfd6b1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Screen Space Cavity Curvature/SRP/URP.unitypackage.meta b/BlueWater/Assets/Screen Space Cavity Curvature/SRP/URP.unitypackage.meta deleted file mode 100644 index 541c1f1ad..000000000 --- a/BlueWater/Assets/Screen Space Cavity Curvature/SRP/URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1c45d0aac2834f14db81b11cdbcec705 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage.meta b/BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage.meta deleted file mode 100644 index 9266b1970..000000000 --- a/BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/Builtin _SSCCTexture Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0e83bea63c06f674eb5018b4edaaa234 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage.meta b/BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage.meta deleted file mode 100644 index df746c987..000000000 --- a/BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2020 _SSCCTexture Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c2a3494b77a23b54aa8b5ad80b580749 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage.meta b/BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage.meta deleted file mode 100644 index 6b34f54ee..000000000 --- a/BlueWater/Assets/Screen Space Cavity Curvature/_SSCCTexture Examples/URP2021+ _SSCCTexture Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 63fa4c6385d5807478747f832fef4a20 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: