diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai.meta b/BlueWater/Assets/02.Scripts/Ai.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai.meta rename to BlueWater/Assets/02.Scripts/Ai.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs b/BlueWater/Assets/02.Scripts/Ai/AiController.cs similarity index 98% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs rename to BlueWater/Assets/02.Scripts/Ai/AiController.cs index 7dafb37d1..d69ecfdb7 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs +++ b/BlueWater/Assets/02.Scripts/Ai/AiController.cs @@ -3,7 +3,7 @@ using UnityEngine; using Random = UnityEngine.Random; // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { [Serializable] public abstract class AiController : MonoBehaviour, IDamageable diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs.meta b/BlueWater/Assets/02.Scripts/Ai/AiController.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs.meta rename to BlueWater/Assets/02.Scripts/Ai/AiController.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs b/BlueWater/Assets/02.Scripts/Ai/AiStat.cs similarity index 97% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs rename to BlueWater/Assets/02.Scripts/Ai/AiStat.cs index ece6bcb5f..d86da2ee9 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs +++ b/BlueWater/Assets/02.Scripts/Ai/AiStat.cs @@ -2,7 +2,7 @@ using System; using UnityEngine; // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { [Serializable] public class AiStat diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs.meta b/BlueWater/Assets/02.Scripts/Ai/AiStat.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs.meta rename to BlueWater/Assets/02.Scripts/Ai/AiStat.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs b/BlueWater/Assets/02.Scripts/Ai/AiWeight.cs similarity index 99% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs rename to BlueWater/Assets/02.Scripts/Ai/AiWeight.cs index a04d59fae..4fad541e0 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs +++ b/BlueWater/Assets/02.Scripts/Ai/AiWeight.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.AI; // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public class AiWeight : MonoBehaviour { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs.meta b/BlueWater/Assets/02.Scripts/Ai/AiWeight.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs.meta rename to BlueWater/Assets/02.Scripts/Ai/AiWeight.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type.meta b/BlueWater/Assets/02.Scripts/Ai/Type.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type.meta rename to BlueWater/Assets/02.Scripts/Ai/Type.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs b/BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs similarity index 94% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs rename to BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs index ad376d372..7dc576c20 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs +++ b/BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs @@ -2,7 +2,7 @@ using System.Collections; using UnityEngine; // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public class Archer : AiController { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs.meta b/BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs.meta rename to BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs b/BlueWater/Assets/02.Scripts/Ai/Type/Axeman.cs similarity index 88% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs rename to BlueWater/Assets/02.Scripts/Ai/Type/Axeman.cs index 5eb83f0ac..93ab9695c 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs +++ b/BlueWater/Assets/02.Scripts/Ai/Type/Axeman.cs @@ -1,5 +1,5 @@ // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public class Axeman : AiController { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs.meta b/BlueWater/Assets/02.Scripts/Ai/Type/Axeman.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs.meta rename to BlueWater/Assets/02.Scripts/Ai/Type/Axeman.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs b/BlueWater/Assets/02.Scripts/Ai/Type/SpearKnight.cs similarity index 88% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs rename to BlueWater/Assets/02.Scripts/Ai/Type/SpearKnight.cs index 72b89e522..a304b0d74 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs +++ b/BlueWater/Assets/02.Scripts/Ai/Type/SpearKnight.cs @@ -1,5 +1,5 @@ // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public class SpearKnight : AiController { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs.meta b/BlueWater/Assets/02.Scripts/Ai/Type/SpearKnight.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs.meta rename to BlueWater/Assets/02.Scripts/Ai/Type/SpearKnight.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs b/BlueWater/Assets/02.Scripts/Ai/Type/Spearman.cs similarity index 88% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs rename to BlueWater/Assets/02.Scripts/Ai/Type/Spearman.cs index dd29d114e..a94afb155 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs +++ b/BlueWater/Assets/02.Scripts/Ai/Type/Spearman.cs @@ -1,5 +1,5 @@ // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public class Spearman : AiController { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs.meta b/BlueWater/Assets/02.Scripts/Ai/Type/Spearman.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs.meta rename to BlueWater/Assets/02.Scripts/Ai/Type/Spearman.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs b/BlueWater/Assets/02.Scripts/Ai/Type/SwordKnight.cs similarity index 88% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs rename to BlueWater/Assets/02.Scripts/Ai/Type/SwordKnight.cs index 4a45b2435..bbd2f505f 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs +++ b/BlueWater/Assets/02.Scripts/Ai/Type/SwordKnight.cs @@ -1,5 +1,5 @@ // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public class SwordKnight : AiController { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs.meta b/BlueWater/Assets/02.Scripts/Ai/Type/SwordKnight.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs.meta rename to BlueWater/Assets/02.Scripts/Ai/Type/SwordKnight.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs b/BlueWater/Assets/02.Scripts/Ai/Type/Swordman.cs similarity index 88% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs rename to BlueWater/Assets/02.Scripts/Ai/Type/Swordman.cs index 616962099..d61505423 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs +++ b/BlueWater/Assets/02.Scripts/Ai/Type/Swordman.cs @@ -1,5 +1,5 @@ // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public class Swordman : AiController { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs.meta b/BlueWater/Assets/02.Scripts/Ai/Type/Swordman.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs.meta rename to BlueWater/Assets/02.Scripts/Ai/Type/Swordman.cs.meta diff --git a/BlueWater/Assets/02.Scripts/BlueWater.cs b/BlueWater/Assets/02.Scripts/BlueWater.cs index 05599fb6d..1445f4bae 100644 --- a/BlueWater/Assets/02.Scripts/BlueWater.cs +++ b/BlueWater/Assets/02.Scripts/BlueWater.cs @@ -2,7 +2,7 @@ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator // version 1.6.3 -// from Assets/02.Scritps/BlueWater.inputactions +// from Assets/02.Scripts/BlueWater.inputactions // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface.meta b/BlueWater/Assets/02.Scripts/Interface.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface.meta rename to BlueWater/Assets/02.Scripts/Interface.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs b/BlueWater/Assets/02.Scripts/Interface/IAiBase.cs similarity index 77% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs rename to BlueWater/Assets/02.Scripts/Interface/IAiBase.cs index f468306aa..2a3ef87e6 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs +++ b/BlueWater/Assets/02.Scripts/Interface/IAiBase.cs @@ -1,5 +1,5 @@ // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public interface IAiBase { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs.meta b/BlueWater/Assets/02.Scripts/Interface/IAiBase.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs.meta rename to BlueWater/Assets/02.Scripts/Interface/IAiBase.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs b/BlueWater/Assets/02.Scripts/Interface/IAiStat.cs similarity index 83% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs rename to BlueWater/Assets/02.Scripts/Interface/IAiStat.cs index a0928a68b..265cde5fa 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs +++ b/BlueWater/Assets/02.Scripts/Interface/IAiStat.cs @@ -1,5 +1,5 @@ // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public interface IAiStat : IAiBase { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs.meta b/BlueWater/Assets/02.Scripts/Interface/IAiStat.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs.meta rename to BlueWater/Assets/02.Scripts/Interface/IAiStat.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs b/BlueWater/Assets/02.Scripts/Interface/IDamageable.cs similarity index 85% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs rename to BlueWater/Assets/02.Scripts/Interface/IDamageable.cs index 347f6618e..4700a9dc0 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs +++ b/BlueWater/Assets/02.Scripts/Interface/IDamageable.cs @@ -1,5 +1,5 @@ // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public interface IDamageable : IAiStat { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs.meta b/BlueWater/Assets/02.Scripts/Interface/IDamageable.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs.meta rename to BlueWater/Assets/02.Scripts/Interface/IDamageable.cs.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility.meta b/BlueWater/Assets/02.Scripts/Utility.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility.meta rename to BlueWater/Assets/02.Scripts/Utility.meta diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs b/BlueWater/Assets/02.Scripts/Utility/Utils.cs similarity index 99% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs rename to BlueWater/Assets/02.Scripts/Utility/Utils.cs index 17bc908a9..b05366522 100644 --- a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs +++ b/BlueWater/Assets/02.Scripts/Utility/Utils.cs @@ -4,7 +4,7 @@ using UnityEngine.AI; using UnityEngine.Assertions; // ReSharper disable once CheckNamespace -namespace BlueWater +namespace BlueWaterProject { public class Utils { diff --git a/BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs.meta b/BlueWater/Assets/02.Scripts/Utility/Utils.cs.meta similarity index 100% rename from BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs.meta rename to BlueWater/Assets/02.Scripts/Utility/Utils.cs.meta 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/ToonyTinyPeople/TT_RTS/TT_RTS_Standard/models/materials/TT_RTS_Units.mat b/BlueWater/Assets/ToonyTinyPeople/TT_RTS/TT_RTS_Standard/models/materials/TT_RTS_Units.mat index 90288da75..e7aeab0f5 100644 --- a/BlueWater/Assets/ToonyTinyPeople/TT_RTS/TT_RTS_Standard/models/materials/TT_RTS_Units.mat +++ b/BlueWater/Assets/ToonyTinyPeople/TT_RTS/TT_RTS_Standard/models/materials/TT_RTS_Units.mat @@ -8,16 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TT_RTS_Units - m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Shader: {fileID: 4800000, guid: 2a230514c860643f69b6a4d1871d3825, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - DR_OUTLINE_ON + - _DETAILMAPBLENDINGMODE_MULTIPLY - _EMISSION + - _TEXTUREBLENDINGMODE_MULTIPLY + - _UNITYSHADOW_OCCLUSION m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -25,6 +29,10 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BakedGIRamp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BaseMap: m_Texture: {fileID: 2800000, guid: cfe610aa65730394298159382447706b, type: 3} m_Scale: {x: 1, y: 1} @@ -37,6 +45,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} @@ -49,6 +61,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _GradientRamp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: cfe610aa65730394298159382447706b, type: 3} m_Scale: {x: 1, y: 1} @@ -88,33 +104,71 @@ Material: - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0.5 - _Cull: 2 - _Cutoff: 0.5 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 - _Glossiness: 0.5 - _GlossinessSource: 0 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 1 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 1 + - _OutlineScale: 1 + - _OutlineWidth: 1.5 + - _OverrideBakedGi: 0 + - _OverrideLightAttenuation: 0 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0 - _Shininess: 0 - _Smoothness: 0.5 - _SmoothnessSource: 1 - _SpecSource: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowOcclusion: 1 + - _VertexColorsEnabled: 0 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.8504499, 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} + - _LightAttenuation: {r: 0, g: 1, b: 0, a: 0} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] --- !u!114 &8523542518157162783