diff --git a/Code/Editor/Utility/AssetVersionData.cs b/Code/Editor/Utility/AssetVersionData.cs index a890a85..ad0d812 100644 --- a/Code/Editor/Utility/AssetVersionData.cs +++ b/Code/Editor/Utility/AssetVersionData.cs @@ -31,7 +31,7 @@ public static class AssetVersionData /// /// The version number of the asset. /// - public static string VersionNumber => "2.0.9"; + public static string VersionNumber => "2.0.10"; /// @@ -40,6 +40,6 @@ public static class AssetVersionData /// /// Asset owner is in the UK, so its D/M/Y format. /// - public static string ReleaseDate => "30/07/2023"; + public static string ReleaseDate => "03/08/2023"; } } \ No newline at end of file diff --git a/Code/Editor/Utility/Scriptable Assets/FileEditorUtil.cs b/Code/Editor/Utility/Scriptable Assets/FileEditorUtilSM.cs similarity index 99% rename from Code/Editor/Utility/Scriptable Assets/FileEditorUtil.cs rename to Code/Editor/Utility/Scriptable Assets/FileEditorUtilSM.cs index 0562005..3c0ed7d 100644 --- a/Code/Editor/Utility/Scriptable Assets/FileEditorUtil.cs +++ b/Code/Editor/Utility/Scriptable Assets/FileEditorUtilSM.cs @@ -31,7 +31,7 @@ namespace CarterGames.Assets.SaveManager.Editor /// /// Handles finding assets in the project in editor space and creating/referencing/caching them for use. /// - public static class FileEditorUtil + public static class FileEditorUtilSM { /* ───────────────────────────────────────────────────────────────────────────────────────────────────────────── | Fields diff --git a/Code/Editor/Utility/Scriptable Assets/FileEditorUtil.cs.meta b/Code/Editor/Utility/Scriptable Assets/FileEditorUtilSM.cs.meta similarity index 100% rename from Code/Editor/Utility/Scriptable Assets/FileEditorUtil.cs.meta rename to Code/Editor/Utility/Scriptable Assets/FileEditorUtilSM.cs.meta diff --git a/Code/Editor/Utility/Scriptable Assets/ScriptableRef.cs b/Code/Editor/Utility/Scriptable Assets/ScriptableRefSM.cs similarity index 74% rename from Code/Editor/Utility/Scriptable Assets/ScriptableRef.cs rename to Code/Editor/Utility/Scriptable Assets/ScriptableRefSM.cs index aa8df53..a3a46ed 100644 --- a/Code/Editor/Utility/Scriptable Assets/ScriptableRef.cs +++ b/Code/Editor/Utility/Scriptable Assets/ScriptableRefSM.cs @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2018-Present Carter Games * * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -29,7 +29,7 @@ namespace CarterGames.Assets.SaveManager.Editor /// /// Handles references to scriptable objects in the asset that need generating without user input etc. /// - public static class ScriptableRef + public static class ScriptableRefSM { /* ───────────────────────────────────────────────────────────────────────────────────────────────────────────── | Fields @@ -47,22 +47,22 @@ public static class ScriptableRef // Asset Filters /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */ - private static readonly string RuntimeSettingsFilter = $"t:{typeof(SettingsAssetRuntime).FullName}"; - private static readonly string EditorSettingsFilter = $"t:{typeof(SettingsAssetEditor).FullName}"; - private static readonly string AssetIndexFilter = $"t:{typeof(AssetIndex).FullName}"; - private static readonly string SaveProfilesStoreFilter = $"t:{typeof(SaveProfilesStore).FullName}"; - private static readonly string SaveDataFilter = $"t:{typeof(SaveData).FullName}"; - private static readonly string SaveDataEncryptionKeyFilter = $"t:{typeof(EncryptionKeyAsset).FullName}"; + private static readonly string RuntimeSettingsFilter = $"t:{typeof(CarterGames.Assets.SaveManager.SettingsAssetRuntime).FullName}"; + private static readonly string EditorSettingsFilter = $"t:{typeof(CarterGames.Assets.SaveManager.Editor.SettingsAssetEditor).FullName}"; + private static readonly string AssetIndexFilter = $"t:{typeof(CarterGames.Assets.SaveManager.AssetIndex).FullName}"; + private static readonly string SaveProfilesStoreFilter = $"t:{typeof(CarterGames.Assets.SaveManager.Editor.SaveProfilesStore).FullName}"; + private static readonly string SaveDataFilter = $"t:{typeof(CarterGames.Assets.SaveManager.SaveData).FullName}"; + private static readonly string SaveDataEncryptionKeyFilter = $"t:{typeof(CarterGames.Assets.SaveManager.EncryptionKeyAsset).FullName}"; // Asset Caches /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */ - private static SettingsAssetRuntime settingsAssetRuntimeCache; - private static SettingsAssetEditor settingsAssetEditorCache; - private static AssetIndex assetIndexCache; - private static SaveProfilesStore saveProfilesStoreCache; - private static SaveData saveDataCache; - private static EncryptionKeyAsset encryptionKeyAssetCache; + private static CarterGames.Assets.SaveManager.SettingsAssetRuntime settingsAssetRuntimeCache; + private static CarterGames.Assets.SaveManager.Editor.SettingsAssetEditor settingsAssetEditorCache; + private static CarterGames.Assets.SaveManager.AssetIndex assetIndexCache; + private static CarterGames.Assets.SaveManager.Editor.SaveProfilesStore saveProfilesStoreCache; + private static CarterGames.Assets.SaveManager.SaveData saveDataCache; + private static CarterGames.Assets.SaveManager.EncryptionKeyAsset encryptionKeyAssetCache; // SerializedObject Caches @@ -80,13 +80,13 @@ public static class ScriptableRef /// /// Gets the path where the asset code is located. /// - private static string AssetBasePath => FileEditorUtil.AssetBasePath; + private static string AssetBasePath => FileEditorUtilSM.AssetBasePath; /// /// Gets the asset name stored in the file util editor class. /// - private static string AssetName => FileEditorUtil.AssetName; + private static string AssetName => FileEditorUtilSM.AssetName; // Asset Properties @@ -95,43 +95,43 @@ public static class ScriptableRef /// /// The asset index for the asset. /// - public static AssetIndex AssetIndex => - FileEditorUtil.CreateSoGetOrAssignAssetCache(ref assetIndexCache, AssetIndexFilter, AssetIndexPath, AssetName, $"{AssetName}/Resources/Asset Index.asset"); + public static CarterGames.Assets.SaveManager.AssetIndex AssetIndex => + FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref assetIndexCache, AssetIndexFilter, AssetIndexPath, AssetName, $"{AssetName}/Resources/Asset Index.asset"); /// /// The editor settings for the asset. /// - public static SettingsAssetEditor EditorSettings => - FileEditorUtil.CreateSoGetOrAssignAssetCache(ref settingsAssetEditorCache, EditorSettingsFilter, EditorSettingsAssetPath, AssetName, $"{AssetName}/Data/Editor Settings.asset"); + public static CarterGames.Assets.SaveManager.Editor.SettingsAssetEditor EditorSettings => + FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref settingsAssetEditorCache, EditorSettingsFilter, EditorSettingsAssetPath, AssetName, $"{AssetName}/Data/Editor Settings.asset"); /// /// The runtime settings for the asset. /// - public static SettingsAssetRuntime RuntimeSettings => - FileEditorUtil.CreateSoGetOrAssignAssetCache(ref settingsAssetRuntimeCache, RuntimeSettingsFilter, SettingsAssetPath, AssetName, $"{AssetName}/Data/Runtime Settings.asset"); + public static CarterGames.Assets.SaveManager.SettingsAssetRuntime RuntimeSettings => + FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref settingsAssetRuntimeCache, RuntimeSettingsFilter, SettingsAssetPath, AssetName, $"{AssetName}/Data/Runtime Settings.asset"); /// /// The save profiles for the asset. /// - public static SaveProfilesStore SaveProfiles => - FileEditorUtil.CreateSoGetOrAssignAssetCache(ref saveProfilesStoreCache, SaveProfilesStoreFilter, CapturesObjectAssetPath, AssetName, $"{AssetName}/Data/Save Profiles Container.asset"); + public static CarterGames.Assets.SaveManager.Editor.SaveProfilesStore SaveProfiles => + FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref saveProfilesStoreCache, SaveProfilesStoreFilter, CapturesObjectAssetPath, AssetName, $"{AssetName}/Data/Save Profiles Container.asset"); /// /// The save data for the asset. /// - public static SaveData SaveData => - FileEditorUtil.CreateSoGetOrAssignAssetCache(ref saveDataCache, SaveDataFilter, SaveDataPath, AssetName, $"{AssetName}/Data/Save Data.asset"); + public static CarterGames.Assets.SaveManager.SaveData SaveData => + FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref saveDataCache, SaveDataFilter, SaveDataPath, AssetName, $"{AssetName}/Data/Save Data.asset"); /// /// The encryption key asset for the asset. /// - public static EncryptionKeyAsset EncryptionKey => - FileEditorUtil.CreateSoGetOrAssignAssetCache(ref encryptionKeyAssetCache, SaveDataEncryptionKeyFilter, EncryptionKeyAssetPath, AssetName, $"{AssetName}/Data/Encryption Key.asset"); + public static CarterGames.Assets.SaveManager.EncryptionKeyAsset EncryptionKey => + FileEditorUtilSM.CreateSoGetOrAssignAssetCache(ref encryptionKeyAssetCache, SaveDataEncryptionKeyFilter, EncryptionKeyAssetPath, AssetName, $"{AssetName}/Data/Encryption Key.asset"); // Object Properties /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */ @@ -140,14 +140,14 @@ public static class ScriptableRef /// The editor SerializedObject for the asset. /// public static SerializedObject EditorSettingsObject => - FileEditorUtil.CreateGetOrAssignSerializedObjectCache(ref settingsAssetEditorObjectCache, EditorSettings); + FileEditorUtilSM.CreateGetOrAssignSerializedObjectCache(ref settingsAssetEditorObjectCache, EditorSettings); /// /// The runtime SerializedObject for the asset. /// public static SerializedObject RuntimeSettingsObject => - FileEditorUtil.CreateGetOrAssignSerializedObjectCache(ref settingsAssetRuntimeObjectCache, RuntimeSettings); + FileEditorUtilSM.CreateGetOrAssignSerializedObjectCache(ref settingsAssetRuntimeObjectCache, RuntimeSettings); // Assets Initialized Check /* ────────────────────────────────────────────────────────────────────────────────────────────────────────── */ diff --git a/Code/Editor/Utility/Scriptable Assets/ScriptableRef.cs.meta b/Code/Editor/Utility/Scriptable Assets/ScriptableRefSM.cs.meta similarity index 100% rename from Code/Editor/Utility/Scriptable Assets/ScriptableRef.cs.meta rename to Code/Editor/Utility/Scriptable Assets/ScriptableRefSM.cs.meta diff --git a/Code/Editor/Utility/UtilEditor.cs b/Code/Editor/Utility/UtilEditor.cs index 92d49eb..ea2fc7c 100644 --- a/Code/Editor/Utility/UtilEditor.cs +++ b/Code/Editor/Utility/UtilEditor.cs @@ -147,7 +147,7 @@ public static class UtilEditor /// /// Gets the path where the asset code is located. /// - private static string AssetBasePath => FileEditorUtil.AssetBasePath; + private static string AssetBasePath => FileEditorUtilSM.AssetBasePath; // Textures/Graphics @@ -156,72 +156,72 @@ public static class UtilEditor /// /// Gets the save manager logo. /// - public static Texture2D SaveManagerLogo => FileEditorUtil.GetOrAssignCache(ref saveManagerLogoCache, SaveManagerLogoFilter); + public static Texture2D SaveManagerLogo => FileEditorUtilSM.GetOrAssignCache(ref saveManagerLogoCache, SaveManagerLogoFilter); /// /// Gets the save manager banner. /// public static Texture2D SaveManagerBanner => - FileEditorUtil.GetOrAssignCache(ref saveManagerBannerCache, SaveManagerBannerFilter); + FileEditorUtilSM.GetOrAssignCache(ref saveManagerBannerCache, SaveManagerBannerFilter); /// /// Gets the save manager banner. /// public static Texture2D SaveManagerBannerTextOnly => - FileEditorUtil.GetOrAssignCache(ref saveManagerTitleBannerCache, SaveManagerTitleBannerFilter); + FileEditorUtilSM.GetOrAssignCache(ref saveManagerTitleBannerCache, SaveManagerTitleBannerFilter); /// /// Gets the carter games banner. /// public static Texture2D CarterGamesBanner => - FileEditorUtil.GetOrAssignCache(ref carterGamesBannerCache, CarterGamesBannerFilter); + FileEditorUtilSM.GetOrAssignCache(ref carterGamesBannerCache, CarterGamesBannerFilter); /// /// Gets the cog icon. /// - public static Texture2D CogIcon => FileEditorUtil.GetOrAssignCache(ref cogIconCache, CogIconFilter); + public static Texture2D CogIcon => FileEditorUtilSM.GetOrAssignCache(ref cogIconCache, CogIconFilter); /// /// Gets the key icon. /// - public static Texture2D KeyIcon => FileEditorUtil.GetOrAssignCache(ref keyIconCache, KeyIconFilter); + public static Texture2D KeyIcon => FileEditorUtilSM.GetOrAssignCache(ref keyIconCache, KeyIconFilter); /// /// Gets the book icon. /// - public static Texture2D BookIcon => FileEditorUtil.GetOrAssignCache(ref bookIconCache, BookIconFilter); + public static Texture2D BookIcon => FileEditorUtilSM.GetOrAssignCache(ref bookIconCache, BookIconFilter); /// /// Gets the data icon. /// - public static Texture2D DataIcon => FileEditorUtil.GetOrAssignCache(ref dataIconCache, DataIconFilter); + public static Texture2D DataIcon => FileEditorUtilSM.GetOrAssignCache(ref dataIconCache, DataIconFilter); /// /// Gets the white save icon. /// - public static Texture2D SaveIconWhite => FileEditorUtil.GetOrAssignCache(ref saveIconWhite, SaveWhiteIconFilter); + public static Texture2D SaveIconWhite => FileEditorUtilSM.GetOrAssignCache(ref saveIconWhite, SaveWhiteIconFilter); /// /// Gets the title text for the editor tab in the save manager editor window. /// public static Texture2D EditorWindowTitleEditor => - FileEditorUtil.GetOrAssignCache(ref editorWindowTitleEditor, EditorWindowTitleEditorFilter); + FileEditorUtilSM.GetOrAssignCache(ref editorWindowTitleEditor, EditorWindowTitleEditorFilter); /// /// Gets the title text for the profiles tab in the save manager editor window. /// public static Texture2D EditorWindowTitleProfiles => - FileEditorUtil.GetOrAssignCache(ref editorWindowTitleProfiles, EditorWindowTitleProfilesFilter); + FileEditorUtilSM.GetOrAssignCache(ref editorWindowTitleProfiles, EditorWindowTitleProfilesFilter); @@ -236,7 +236,7 @@ public static bool HasInitialized get { AssetIndexHandler.UpdateIndex(); - return ScriptableRef.HasAllAssets; + return ScriptableRefSM.HasAllAssets; } } @@ -244,50 +244,50 @@ public static bool HasInitialized /// /// Gets/Sets the save manager settings asset. /// - public static SettingsAssetRuntime Settings => ScriptableRef.RuntimeSettings; + public static CarterGames.Assets.SaveManager.SettingsAssetRuntime Settings => ScriptableRefSM.RuntimeSettings; /// /// Gets/Sets the save manager editor settings asset. /// - public static SerializedObject SettingsObject => ScriptableRef.RuntimeSettingsObject; + public static SerializedObject SettingsObject => ScriptableRefSM.RuntimeSettingsObject; /// /// Gets/Sets the save manager editor settings asset. /// - public static SettingsAssetEditor SettingsAssetEditor => ScriptableRef.EditorSettings; + public static CarterGames.Assets.SaveManager.Editor.SettingsAssetEditor SettingsAssetEditor => ScriptableRefSM.EditorSettings; /// /// Gets/Sets the save manager editor settings asset. /// - public static SerializedObject EditorSettingsObject => ScriptableRef.EditorSettingsObject; + public static SerializedObject EditorSettingsObject => ScriptableRefSM.EditorSettingsObject; /// /// Gets/Sets the save manager save profiles asset. /// - public static SaveProfilesStore SaveProfiles => ScriptableRef.SaveProfiles; + public static CarterGames.Assets.SaveManager.Editor.SaveProfilesStore SaveProfiles => ScriptableRefSM.SaveProfiles; /// /// Gets/Sets the save manager save data asset. /// - public static SaveData SaveData => ScriptableRef.SaveData; + public static CarterGames.Assets.SaveManager.SaveData SaveData => ScriptableRefSM.SaveData; /// /// Gets/Sets the save manager save data asset. /// - public static EncryptionKeyAsset EncryptionKeyAsset => ScriptableRef.EncryptionKey; + public static CarterGames.Assets.SaveManager.EncryptionKeyAsset EncryptionKeyAsset => ScriptableRefSM.EncryptionKey; /// /// Gets/Sets the save manager save data asset. /// - public static AssetIndex AssetIndex => ScriptableRef.AssetIndex; + public static CarterGames.Assets.SaveManager.AssetIndex AssetIndex => ScriptableRefSM.AssetIndex; /* ───────────────────────────────────────────────────────────────────────────────────────────────────────────── | Draw Methods diff --git a/Code/Runtime/Common/CarterGames.Common.asmdef b/Code/Runtime/Common/CarterGames.Common.asmdef deleted file mode 100644 index 5e9b21d..0000000 --- a/Code/Runtime/Common/CarterGames.Common.asmdef +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "CarterGames.Common" -} diff --git a/Code/Runtime/Common/CarterGames.SaveManager.Common.asmdef b/Code/Runtime/Common/CarterGames.SaveManager.Common.asmdef new file mode 100644 index 0000000..7f17adf --- /dev/null +++ b/Code/Runtime/Common/CarterGames.SaveManager.Common.asmdef @@ -0,0 +1,14 @@ +{ + "name": "CarterGames.SaveManager.Common", + "rootNamespace": "", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Code/Runtime/Common/CarterGames.Common.asmdef.meta b/Code/Runtime/Common/CarterGames.SaveManager.Common.asmdef.meta similarity index 100% rename from Code/Runtime/Common/CarterGames.Common.asmdef.meta rename to Code/Runtime/Common/CarterGames.SaveManager.Common.asmdef.meta