diff --git a/Assets/Darkmatter/Code/Features/ColorbookFlow/Installers/ColorbookFlowFeatureModule.cs b/Assets/Darkmatter/Code/Features/ColorbookFlow/Installers/ColorbookFlowFeatureModule.cs index f79690d..4d37639 100644 --- a/Assets/Darkmatter/Code/Features/ColorbookFlow/Installers/ColorbookFlowFeatureModule.cs +++ b/Assets/Darkmatter/Code/Features/ColorbookFlow/Installers/ColorbookFlowFeatureModule.cs @@ -10,7 +10,7 @@ namespace Darkmatter.Features.Colorbook.Installers { public void Register(IContainerBuilder builder) { - builder.RegisterEntryPoint(Lifetime.Singleton); + builder.RegisterEntryPoint(); } } } \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Features/ColorbookFlow/System/ColorbookFlowController.cs b/Assets/Darkmatter/Code/Features/ColorbookFlow/System/ColorbookFlowController.cs index 36a342e..0055772 100644 --- a/Assets/Darkmatter/Code/Features/ColorbookFlow/System/ColorbookFlowController.cs +++ b/Assets/Darkmatter/Code/Features/ColorbookFlow/System/ColorbookFlowController.cs @@ -1,6 +1,7 @@ using System.Threading; using Cysharp.Threading.Tasks; using Darkmatter.Core.Contracts.Features.DrawingCatalog; +using Darkmatter.Core.Contracts.Features.Loading; using VContainer.Unity; namespace Darkmatter.Features.Colorbook.System; @@ -8,9 +9,18 @@ namespace Darkmatter.Features.Colorbook.System; public class ColorbookFlowController : IAsyncStartable { private readonly IDrawingCatalogController _drawingCatalog; + private readonly ILoadingScreen _loadingScreen; + public ColorbookFlowController(IDrawingCatalogController drawingCatalog, ILoadingScreen loadingScreen) + { + _drawingCatalog = drawingCatalog; + _loadingScreen = loadingScreen; + } + public async UniTask StartAsync(CancellationToken cancellation = new CancellationToken()) { + _loadingScreen.SetProgress(1f); await _drawingCatalog.InitializeAsync(cancellation); + _loadingScreen.Hide(); } } \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Features/DrawingCatalog/UI/DrawingCatalogPresenter.cs b/Assets/Darkmatter/Code/Features/DrawingCatalog/UI/DrawingCatalogPresenter.cs index 2fee84c..e36d24a 100644 --- a/Assets/Darkmatter/Code/Features/DrawingCatalog/UI/DrawingCatalogPresenter.cs +++ b/Assets/Darkmatter/Code/Features/DrawingCatalog/UI/DrawingCatalogPresenter.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Threading; using Cysharp.Threading.Tasks; using Darkmatter.Core.Contracts.Features.DrawingCatalog; -using Darkmatter.Features.DrawingCatalog.Systems; using VContainer.Unity; namespace Darkmatter.Features.DrawingCatalog @@ -15,7 +14,7 @@ namespace Darkmatter.Features.DrawingCatalog private readonly IDrawingTemplateCatalog _catalog; private readonly CancellationTokenSource _cts = new(); - public DrawingCatalogPresenter(DrawingCatalogView view, DrawingCatalogController controller, + public DrawingCatalogPresenter(DrawingCatalogView view, IDrawingCatalogController controller, IDrawingTemplateCatalog catalog) { _view = view; diff --git a/Assets/Darkmatter/Code/Features/MainMenuFlow/Flow/MainMenuFlow.cs b/Assets/Darkmatter/Code/Features/MainMenuFlow/Flow/MainMenuFlow.cs index f92a3eb..dff89e0 100644 --- a/Assets/Darkmatter/Code/Features/MainMenuFlow/Flow/MainMenuFlow.cs +++ b/Assets/Darkmatter/Code/Features/MainMenuFlow/Flow/MainMenuFlow.cs @@ -41,6 +41,8 @@ namespace Darkmatter.Features.MainMenuFlow.Flow _loadingScreen.Show(); var progress = new Progress(p => _loadingScreen.SetProgress(p * 0.5f)); await _sceneService.LoadSceneAsync(nameof(GameScene.Colorbook), progress, ct); + var mappedProgress = new Progress(p => _loadingScreen.SetProgress(0.5f + p * 0.25f)); + await _sceneService.UnloadSceneAsync(nameof(GameScene.MainMenu),mappedProgress, ct); } public void Dispose() diff --git a/Assets/Darkmatter/Code/Services/Assets/Installers.meta b/Assets/Darkmatter/Code/Services/Assets/Installers.meta new file mode 100644 index 0000000..23d40b4 --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Assets/Installers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a06e8e44cb2363746a89c231e5be6509 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Code/Services/Assets/Installers/AssetsServiceModule.cs b/Assets/Darkmatter/Code/Services/Assets/Installers/AssetsServiceModule.cs new file mode 100644 index 0000000..d9308c4 --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Assets/Installers/AssetsServiceModule.cs @@ -0,0 +1,15 @@ +using Darkmatter.Core.Contracts.Services.Assets; +using Darkmatter.Libs.Installers; +using UnityEngine; +using VContainer; + +namespace Darkmatter.Services.Assets.Installers +{ + public class AssetsServiceModule : MonoBehaviour, IModule + { + public void Register(IContainerBuilder builder) + { + builder.Register(Lifetime.Singleton); + } + } +} diff --git a/Assets/Darkmatter/Code/Services/Assets/Installers/AssetsServiceModule.cs.meta b/Assets/Darkmatter/Code/Services/Assets/Installers/AssetsServiceModule.cs.meta new file mode 100644 index 0000000..2ad0840 --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Assets/Installers/AssetsServiceModule.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2e3baad744699014dba6885dfec20d9f \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Services/Assets/Services.Assets.asmdef b/Assets/Darkmatter/Code/Services/Assets/Services.Assets.asmdef index 354ca47..a00847f 100644 --- a/Assets/Darkmatter/Code/Services/Assets/Services.Assets.asmdef +++ b/Assets/Darkmatter/Code/Services/Assets/Services.Assets.asmdef @@ -6,7 +6,9 @@ "GUID:f51ebe6a0ceec4240a699833d6309b23", "GUID:593a5b492d29ac6448b1ebf7f035ef33", "GUID:9e24947de15b9834991c9d8411ea37cf", - "GUID:84651a3751eca9349aac36a66bba901b" + "GUID:84651a3751eca9349aac36a66bba901b", + "GUID:b0214a6008ed146ff8f122a6a9c2f6cc", + "GUID:c1c03c0e5b2f4412b9f2be1c20d6a9b1" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI.meta new file mode 100644 index 0000000..36caa1f --- /dev/null +++ b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c1308cdd3f6a9c4bb92d3dde93cb92b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Arrow.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Arrow.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Arrow.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Arrow.png diff --git a/Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Arrow.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Arrow.png.meta similarity index 95% rename from Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Arrow.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Arrow.png.meta index 6c02cbd..ea88d90 100644 --- a/Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Arrow.png.meta +++ b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Arrow.png.meta @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +93,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,7 +106,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -123,6 +123,7 @@ TextureImporter: serializedVersion: 2 sprites: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -132,6 +133,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Artbook Topic.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Artbook Topic.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Artbook Topic.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Artbook Topic.png diff --git a/Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Artbook Topic.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Artbook Topic.png.meta similarity index 95% rename from Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Artbook Topic.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Artbook Topic.png.meta index 668ca22..2b49f60 100644 --- a/Assets/Darkmatter/Content/Sprites/MiniGame/DrawingGame/Artbook UI Sprites/Artbook Topic.png.meta +++ b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Artbook Topic.png.meta @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +93,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,7 +106,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -123,6 +123,7 @@ TextureImporter: serializedVersion: 2 sprites: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -132,6 +133,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Background.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Background.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Background.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Background.png diff --git a/Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Background.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Background.png.meta similarity index 95% rename from Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Background.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Background.png.meta index c3b863f..08f0eed 100644 --- a/Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Background.png.meta +++ b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Background.png.meta @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 512 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +93,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,7 +106,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -123,6 +123,7 @@ TextureImporter: serializedVersion: 2 sprites: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -132,6 +133,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Darkmatter/Content/Sprites/Shared/Generic/Btn Blue Small.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn Blue Small 1.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/Shared/Generic/Btn Blue Small.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn Blue Small 1.png diff --git a/Assets/Darkmatter/Content/Sprites/Shared/Generic/Btn Blue Small.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn Blue Small 1.png.meta similarity index 92% rename from Assets/Darkmatter/Content/Sprites/Shared/Generic/Btn Blue Small.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn Blue Small 1.png.meta index cd80ffd..54f6899 100644 --- a/Assets/Darkmatter/Content/Sprites/Shared/Generic/Btn Blue Small.png.meta +++ b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn Blue Small 1.png.meta @@ -3,7 +3,7 @@ guid: 221451c6f463b3948bc7b6fcb05b438b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 512 resizeAlgorithm: 0 @@ -93,7 +93,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,7 +106,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 @@ -119,8 +119,8 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone + - serializedVersion: 4 + buildTarget: iOS maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -132,7 +132,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -145,8 +145,8 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps + - serializedVersion: 4 + buildTarget: WindowsStoreApps maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -162,6 +162,7 @@ TextureImporter: serializedVersion: 2 sprites: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -171,6 +172,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Darkmatter/Content/Sprites/common/Btn Blue Small.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn Blue Small.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/common/Btn Blue Small.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn Blue Small.png diff --git a/Assets/Darkmatter/Content/Sprites/common/Btn Blue Small.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn Blue Small.png.meta similarity index 100% rename from Assets/Darkmatter/Content/Sprites/common/Btn Blue Small.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn Blue Small.png.meta diff --git a/Assets/Darkmatter/Content/Sprites/Shared/setting/Btn_Green_9Slice.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn_Green_9Slice.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/Shared/setting/Btn_Green_9Slice.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn_Green_9Slice.png diff --git a/Assets/Darkmatter/Content/Sprites/Shared/setting/Btn_Green_9Slice.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn_Green_9Slice.png.meta similarity index 93% rename from Assets/Darkmatter/Content/Sprites/Shared/setting/Btn_Green_9Slice.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn_Green_9Slice.png.meta index d1c9343..dfa90d6 100644 --- a/Assets/Darkmatter/Content/Sprites/Shared/setting/Btn_Green_9Slice.png.meta +++ b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Btn_Green_9Slice.png.meta @@ -3,7 +3,7 @@ guid: 92ebe032cf7d85244b615d51f371796b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 256 resizeAlgorithm: 0 @@ -93,7 +93,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,8 +106,8 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone + - serializedVersion: 4 + buildTarget: iOS maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -119,7 +119,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -132,7 +132,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Server maxTextureSize: 2048 resizeAlgorithm: 0 @@ -145,8 +145,8 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps + - serializedVersion: 4 + buildTarget: WindowsStoreApps maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -172,6 +172,7 @@ TextureImporter: alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 102, y: 0, z: 118, w: 0} + customData: outline: [] physicsShape: [] tessellationDetail: 0 @@ -183,6 +184,7 @@ TextureImporter: edges: [] weights: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -192,6 +194,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: Btn_Green_9Slice_0: 981159874 mipmapLimitGroupName: diff --git a/Assets/Darkmatter/Content/Sprites/Coloring Lobby UI Sprites/Image_Border.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Image_Border.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/Coloring Lobby UI Sprites/Image_Border.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Image_Border.png diff --git a/Assets/Darkmatter/Content/Sprites/Coloring Lobby UI Sprites/Image_Border.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Image_Border.png.meta similarity index 100% rename from Assets/Darkmatter/Content/Sprites/Coloring Lobby UI Sprites/Image_Border.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Image_Border.png.meta diff --git a/Assets/Darkmatter/Content/Sprites/Rectangle 5.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Rectangle 5.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/Rectangle 5.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Rectangle 5.png diff --git a/Assets/Darkmatter/Content/Sprites/Rectangle 5.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Rectangle 5.png.meta similarity index 94% rename from Assets/Darkmatter/Content/Sprites/Rectangle 5.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Rectangle 5.png.meta index c7760c4..3f01b9a 100644 --- a/Assets/Darkmatter/Content/Sprites/Rectangle 5.png.meta +++ b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Rectangle 5.png.meta @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,8 +93,8 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone + - serializedVersion: 4 + buildTarget: iOS maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -106,7 +106,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -119,7 +119,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -136,6 +136,7 @@ TextureImporter: serializedVersion: 2 sprites: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -145,6 +146,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Topic.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Topic.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Topic.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Topic.png diff --git a/Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Topic.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Topic.png.meta similarity index 95% rename from Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Topic.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Topic.png.meta index 64eaea1..dc03a16 100644 --- a/Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/Topic.png.meta +++ b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/Topic.png.meta @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +93,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,7 +106,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -123,6 +123,7 @@ TextureImporter: serializedVersion: 2 sprites: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -132,6 +133,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/paper.png b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/paper.png similarity index 100% rename from Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/paper.png rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/paper.png diff --git a/Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/paper.png.meta b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/paper.png.meta similarity index 94% rename from Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/paper.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/paper.png.meta index 61c0e0e..5bcf06f 100644 --- a/Assets/Darkmatter/Content/Sprites/Coloring Mode UI Sprites/paper.png.meta +++ b/Assets/Darkmatter/Content/Colorbook UI/ColorBookUI/paper.png.meta @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,7 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +93,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,7 +106,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -119,8 +119,8 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone + - serializedVersion: 4 + buildTarget: iOS maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -136,6 +136,7 @@ TextureImporter: serializedVersion: 2 sprites: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -145,6 +146,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Darkmatter/Content/DrawingItems.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplae Wing back 2.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplae Wing back 2.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplae Wing back 2.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplae Wing back 2.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplae Wing back 2.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplae Wing back 2.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplae Wing back 2.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplae Wing back 2.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane Outline.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane Outline.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane Outline.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane Outline.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane Outline.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane Outline.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane Outline.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane Outline.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane tail.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane tail.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane tail.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane tail.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane tail.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane tail.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane tail.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane tail.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane window.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane window.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane window.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane window.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane window.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane window.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane window.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane window.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane wing 1.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane wing 1.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane wing 1.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane wing 1.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane wing 1.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane wing 1.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Aeroplane wing 1.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Aeroplane wing 1.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Areroblane Body.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Areroblane Body.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Areroblane Body.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Areroblane Body.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Areroblane Body.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Areroblane Body.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Areroblane Body.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Areroblane Body.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Areroplane Reference.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Areroplane Reference.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Areroplane Reference.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Areroplane Reference.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/Areroplane Reference.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Areroplane Reference.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/Areroplane Reference.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/Areroplane Reference.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/areoplane front screen.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/areoplane front screen.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/areoplane front screen.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/areoplane front screen.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Aeroplane/areoplane front screen.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/areoplane front screen.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Aeroplane/areoplane front screen.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Aeroplane/areoplane front screen.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/Apple Leaf.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple Leaf.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/Apple Leaf.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple Leaf.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/Apple Leaf.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple Leaf.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/Apple Leaf.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple Leaf.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/Apple body.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple body.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/Apple body.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple body.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/Apple body.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple body.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/Apple body.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple body.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/Apple outline.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple outline.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/Apple outline.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple outline.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/Apple outline.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple outline.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/Apple outline.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple outline.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/Apple steam.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple steam.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/Apple steam.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple steam.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/Apple steam.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple steam.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/Apple steam.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/Apple steam.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/apple reference.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/apple reference.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/apple reference.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/apple reference.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Apple/apple reference.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/apple reference.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Apple/apple reference.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Apple/apple reference.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Ball.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Ball.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Ball/Ball Body.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Body.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Ball/Ball Body.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Body.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Ball/Ball Body.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Body.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Ball/Ball Body.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Body.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Ball/Ball Outline.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Outline.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Ball/Ball Outline.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Outline.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Ball/Ball Outline.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Outline.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Ball/Ball Outline.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Outline.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Ball/Ball Reference.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Reference.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Ball/Ball Reference.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Reference.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Ball/Ball Reference.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Reference.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Ball/Ball Reference.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Ball/Ball Reference.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Body.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Body.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Body.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Body.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Body.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Body.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Body.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Body.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Headlight.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Headlight.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Headlight.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Headlight.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Headlight.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Headlight.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Headlight.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Headlight.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Outline.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Outline.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Outline.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Outline.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Outline.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Outline.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Outline.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Outline.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Stirp.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Stirp.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Stirp.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Stirp.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Stirp.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Stirp.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Stirp.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Stirp.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Window middle.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Window middle.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Window middle.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Window middle.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Window middle.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Window middle.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus Window middle.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus Window middle.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus wheel.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus wheel.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus wheel.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus wheel.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus wheel.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus wheel.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus wheel.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus wheel.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus window Left.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus window Left.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus window Left.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus window Left.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Bus window Left.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus window Left.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Bus window Left.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Bus window Left.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Scroll View.prefab b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Scroll View.prefab similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Scroll View.prefab rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Scroll View.prefab diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/Scroll View.prefab.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Scroll View.prefab.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/Scroll View.prefab.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/Scroll View.prefab.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/bus reference.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/bus reference.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/bus reference.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/bus reference.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/bus reference.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/bus reference.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/bus reference.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/bus reference.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/busw Window Right.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/busw Window Right.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/busw Window Right.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/busw Window Right.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Bus1/busw Window Right.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/busw Window Right.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Bus1/busw Window Right.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Bus1/busw Window Right.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Body(1).png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Body(1).png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Body(1).png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Body(1).png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Body(1).png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Body(1).png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Body(1).png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Body(1).png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Body.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Body.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Body.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Body.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Body.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Body.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Body.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Body.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper Middle(1).png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper Middle(1).png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper Middle(1).png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper Middle(1).png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper Middle(1).png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper Middle(1).png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper Middle(1).png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper Middle(1).png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper Middle.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper Middle.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper Middle.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper Middle.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper Middle.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper Middle.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper Middle.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper Middle.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper(1).png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper(1).png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper(1).png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper(1).png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper(1).png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper(1).png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper(1).png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper(1).png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Bumper.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Bumper.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Front window(1).png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Front window(1).png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Front window(1).png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Front window(1).png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Front window(1).png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Front window(1).png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Front window(1).png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Front window(1).png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Front window.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Front window.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Front window.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Front window.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Front window.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Front window.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Front window.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Front window.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Inner wheel(1).png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Inner wheel(1).png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Inner wheel(1).png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Inner wheel(1).png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Inner wheel(1).png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Inner wheel(1).png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Inner wheel(1).png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Inner wheel(1).png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Inner wheel.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Inner wheel.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Inner wheel.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Inner wheel.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Inner wheel.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Inner wheel.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Inner wheel.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Inner wheel.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outer wheel(1).png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outer wheel(1).png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outer wheel(1).png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outer wheel(1).png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outer wheel(1).png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outer wheel(1).png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outer wheel(1).png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outer wheel(1).png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outer wheel.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outer wheel.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outer wheel.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outer wheel.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outer wheel.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outer wheel.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outer wheel.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outer wheel.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outline(1).png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outline(1).png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outline(1).png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outline(1).png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outline(1).png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outline(1).png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outline(1).png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outline(1).png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outline.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outline.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outline.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outline.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outline.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outline.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Outline.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Outline.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Rear window(1).png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Rear window(1).png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Rear window(1).png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Rear window(1).png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Rear window(1).png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Rear window(1).png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Rear window(1).png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Rear window(1).png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Rear window.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Rear window.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Rear window.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Rear window.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Rear window.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Rear window.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Rear window.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Rear window.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Reference(1).png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Reference(1).png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Reference(1).png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Reference(1).png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Reference(1).png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Reference(1).png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Reference(1).png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Reference(1).png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Reference.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Reference.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Reference.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Reference.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Reference.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Reference.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Car1/Car1_Reference.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Car1/Car1_Reference.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Dolphin.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Dolphin.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Dolphin.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Dolphin.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Dolphin/Dolphin.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Dolphin/Dolphin.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Dolphin/Dolphin.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Dolphin/Dolphin.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Dolphin/Dolphin.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Dolphin/Dolphin.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Dolphin/Dolphin.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Dolphin/Dolphin.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Donut.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Donut.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Donut.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Donut.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Donut/Donut.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Donut/Donut.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Donut/Donut.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Donut/Donut.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Donut/Donut.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Donut/Donut.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Donut/Donut.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Donut/Donut.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Earphone.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Earphone.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Earphone.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Earphone.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Earphone/Earphone.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Earphone/Earphone.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Earphone/Earphone.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Earphone/Earphone.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Earphone/Earphone.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Earphone/Earphone.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Earphone/Earphone.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Earphone/Earphone.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Elephant.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Elephant.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Elephant/Elephant Reference.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant/Elephant Reference.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Elephant/Elephant Reference.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant/Elephant Reference.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Elephant/Elephant Reference.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant/Elephant Reference.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Elephant/Elephant Reference.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant/Elephant Reference.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Elephant/Elephant.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant/Elephant.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Elephant/Elephant.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant/Elephant.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Elephant/Elephant.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant/Elephant.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Elephant/Elephant.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Elephant/Elephant.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Fish'.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Fish'.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Fish'.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Fish'.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Fish'/Fish.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Fish'/Fish.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Fish'/Fish.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Fish'/Fish.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Fish'/Fish.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Fish'/Fish.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Fish'/Fish.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Fish'/Fish.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Five.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Five.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Five.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Five.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Five/five.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Five/five.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Five/five.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Five/five.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Five/five.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Five/five.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Five/five.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Five/five.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Frog.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Frog.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Frog/Frog Refrerence 1.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog Refrerence 1.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Frog/Frog Refrerence 1.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog Refrerence 1.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Frog/Frog Refrerence 1.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog Refrerence 1.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Frog/Frog Refrerence 1.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog Refrerence 1.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Frog/Frog Refrerence.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog Refrerence.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Frog/Frog Refrerence.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog Refrerence.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Frog/Frog Refrerence.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog Refrerence.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Frog/Frog Refrerence.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog Refrerence.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Frog/Frog_1.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog_1.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Frog/Frog_1.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog_1.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Frog/Frog_1.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog_1.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Frog/Frog_1.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Frog/Frog_1.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Giraffe.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Giraffe.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Giraffe/Giraffe 1.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe/Giraffe 1.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Giraffe/Giraffe 1.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe/Giraffe 1.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Giraffe/Giraffe 1.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe/Giraffe 1.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Giraffe/Giraffe 1.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe/Giraffe 1.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Giraffe/Giraffe.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe/Giraffe.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Giraffe/Giraffe.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe/Giraffe.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Giraffe/Giraffe.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe/Giraffe.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Giraffe/Giraffe.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Giraffe/Giraffe.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi circle.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi circle.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi circle.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi circle.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi circle.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi circle.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi circle.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi circle.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi oval.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi oval.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi oval.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi oval.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi oval.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi oval.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi oval.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/semi oval.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/square.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/square.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/square.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/square.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/square.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/square.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/square.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/HalfOBJ/square.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/REAL rectangle.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/REAL rectangle.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/REAL rectangle.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/REAL rectangle.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/REAL rectangle.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/REAL rectangle.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/REAL rectangle.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/REAL rectangle.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real Oval.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real Oval.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real Oval.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real Oval.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real Oval.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real Oval.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real Oval.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real Oval.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real circle.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real circle.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real circle.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real circle.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real circle.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real circle.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real circle.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real circle.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real right angled triangle.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real right angled triangle.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real right angled triangle.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real right angled triangle.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real right angled triangle.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real right angled triangle.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real right angled triangle.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/Real right angled triangle.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/square.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/square.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/square.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/square.png diff --git a/Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/square.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/square.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/Shapes-20240915T101909Z-001/Shapes/square.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/Shapes-20240915T101909Z-001/Shapes/square.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/dog.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog body.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog body.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog body.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog body.png diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog body.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog body.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog body.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog body.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog ear 2.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog ear 2.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog ear 2.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog ear 2.png diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog ear 2.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog ear 2.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog ear 2.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog ear 2.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog ear1.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog ear1.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog ear1.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog ear1.png diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog ear1.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog ear1.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog ear1.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog ear1.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog outline.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog outline.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog outline.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog outline.png diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog outline.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog outline.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog outline.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog outline.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog reference.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog reference.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog reference.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog reference.png diff --git a/Assets/Darkmatter/Content/DrawingItems/dog/dog reference.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog reference.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/dog/dog reference.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/dog/dog reference.png.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/envelope.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/envelope.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/envelope.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/envelope.meta diff --git a/Assets/Darkmatter/Content/DrawingItems/envelope/Envelope.png b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/envelope/Envelope.png similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/envelope/Envelope.png rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/envelope/Envelope.png diff --git a/Assets/Darkmatter/Content/DrawingItems/envelope/Envelope.png.meta b/Assets/Darkmatter/Content/Colorbook UI/DrawingItems/envelope/Envelope.png.meta similarity index 100% rename from Assets/Darkmatter/Content/DrawingItems/envelope/Envelope.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/DrawingItems/envelope/Envelope.png.meta diff --git a/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI.meta b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI.meta new file mode 100644 index 0000000..c596d4e --- /dev/null +++ b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 81c9438166e1d6d4e9880b38f3760fd3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Content/Colorbook UI/BG.png b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/BG.png similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/BG.png rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/BG.png diff --git a/Assets/Darkmatter/Content/Colorbook UI/BG.png.meta b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/BG.png.meta similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/BG.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/BG.png.meta diff --git a/Assets/Darkmatter/Content/Colorbook UI/Colorbook Logo Final-stroke.png b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Colorbook Logo Final-stroke.png similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/Colorbook Logo Final-stroke.png rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Colorbook Logo Final-stroke.png diff --git a/Assets/Darkmatter/Content/Colorbook UI/Colorbook Logo Final-stroke.png.meta b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Colorbook Logo Final-stroke.png.meta similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/Colorbook Logo Final-stroke.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Colorbook Logo Final-stroke.png.meta diff --git a/Assets/Darkmatter/Content/Colorbook UI/Colorbook_Playstore_graphics.png b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Colorbook_Playstore_graphics.png similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/Colorbook_Playstore_graphics.png rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Colorbook_Playstore_graphics.png diff --git a/Assets/Darkmatter/Content/Colorbook UI/Colorbook_Playstore_graphics.png.meta b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Colorbook_Playstore_graphics.png.meta similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/Colorbook_Playstore_graphics.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Colorbook_Playstore_graphics.png.meta diff --git a/Assets/Darkmatter/Content/Colorbook UI/Grass.png b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Grass.png similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/Grass.png rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Grass.png diff --git a/Assets/Darkmatter/Content/Colorbook UI/Grass.png.meta b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Grass.png.meta similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/Grass.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Grass.png.meta diff --git a/Assets/Darkmatter/Content/Colorbook UI/Turn_Left_Arrow.png b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Turn_Left_Arrow.png similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/Turn_Left_Arrow.png rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Turn_Left_Arrow.png diff --git a/Assets/Darkmatter/Content/Colorbook UI/Turn_Left_Arrow.png.meta b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Turn_Left_Arrow.png.meta similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/Turn_Left_Arrow.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/Turn_Left_Arrow.png.meta diff --git a/Assets/Darkmatter/Content/Colorbook UI/board.png b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/board.png similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/board.png rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/board.png diff --git a/Assets/Darkmatter/Content/Colorbook UI/board.png.meta b/Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/board.png.meta similarity index 100% rename from Assets/Darkmatter/Content/Colorbook UI/board.png.meta rename to Assets/Darkmatter/Content/Colorbook UI/MainmenuUI/board.png.meta diff --git a/Assets/Darkmatter/Scenes/Boot.unity b/Assets/Darkmatter/Scenes/Boot.unity index b640b05..538a67e 100644 --- a/Assets/Darkmatter/Scenes/Boot.unity +++ b/Assets/Darkmatter/Scenes/Boot.unity @@ -1324,6 +1324,50 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &978572231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 978572232} + - component: {fileID: 978572233} + m_Layer: 0 + m_Name: AssetServiceModule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &978572232 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978572231} + serializedVersion: 2 + 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: 1050564725} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &978572233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978572231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2e3baad744699014dba6885dfec20d9f, type: 3} + m_Name: + m_EditorClassIdentifier: Services.Assets::Darkmatter.Services.Assets.Installers.AssetsServiceModule --- !u!1 &1043308345 GameObject: m_ObjectHideFlags: 0 @@ -1402,6 +1446,7 @@ Transform: - {fileID: 1239449675} - {fileID: 1776076871} - {fileID: 97140292} + - {fileID: 978572232} m_Father: {fileID: 1798580248} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1239449674 @@ -1885,6 +1930,7 @@ MonoBehaviour: - {fileID: 1776076872} - {fileID: 97140291} - {fileID: 789049883} + - {fileID: 978572233} --- !u!1 &1890425864 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Darkmatter/Scenes/Colorbook.unity b/Assets/Darkmatter/Scenes/Colorbook.unity index 35c50ca..e7ca879 100644 --- a/Assets/Darkmatter/Scenes/Colorbook.unity +++ b/Assets/Darkmatter/Scenes/Colorbook.unity @@ -645,7 +645,7 @@ GameObject: - component: {fileID: 314471319} - component: {fileID: 314471318} m_Layer: 5 - m_Name: Title (1) + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1551,85 +1551,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573520469} m_CullTransparentMesh: 1 ---- !u!1 &590523272 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 590523275} - - component: {fileID: 590523274} - - component: {fileID: 590523273} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &590523273 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590523272} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule - m_SendPointerHoverToParent: 1 - m_MoveRepeatDelay: 0.5 - m_MoveRepeatRate: 0.1 - m_XRTrackingOrigin: {fileID: 0} - m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_DeselectOnBackgroundClick: 1 - m_PointerBehavior: 0 - m_CursorLockBehavior: 0 - m_ScrollDeltaPerTick: 6 ---- !u!114 &590523274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590523272} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &590523275 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590523272} - serializedVersion: 2 - 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} --- !u!1 &603975484 GameObject: m_ObjectHideFlags: 0 @@ -2247,7 +2168,7 @@ GameObject: - component: {fileID: 774469004} - component: {fileID: 774469005} m_Layer: 0 - m_Name: DrawingFeatureServiceModule + m_Name: DrawingCatalogFeatureServiceModule m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3779,10 +3700,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Darkmatter.App::ColorBookLifetimeScope parentReference: - TypeName: + TypeName: Darkmatter.App.LifetimeScopes.RootLifetimeScope autoRun: 1 autoInjectGameObjects: [] - serviceModules: [] + serviceModules: + - {fileID: 774469005} + - {fileID: 686016131} --- !u!1 &1345816099 GameObject: m_ObjectHideFlags: 0 @@ -5532,7 +5455,7 @@ GameObject: m_Component: - component: {fileID: 2022724980} m_Layer: 5 - m_Name: GameObject + m_Name: Header m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6304,4 +6227,3 @@ SceneRoots: m_Roots: - {fileID: 1273192410} - {fileID: 2069155641} - - {fileID: 590523275}