Merge pull request 'work_branch' (#7) from work_branch into main

Reviewed-on: #7

Assets/Darkmatter/Code/App/LifetimeScopes/ColorBookLifetimeScope.cs

@@ -0,0 +1,5 @@
+using Darkmatter.App.LifetimeScopes;
+
+public class ColorBookLifetimeScope : BaseLifetimeScope
+{
+}

Assets/Darkmatter/Code/App/LifetimeScopes/ColorBookLifetimeScope.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 8bbdb0f5cdf25c34086f816c59836c9d

Assets/Darkmatter/Code/Core/Contracts/Features/DrawingCatalog/IDrawingCatalogController.cs

@@ -11,4 +11,6 @@ public interface IDrawingCatalogController
     event Action ListChanged;
     UniTask InitializeAsync(CancellationToken ct);
     void OnTemplateSelected(string id);
+    void PublishBackBtnClickedSignal();
+    void PublishOpenArtBookSignal();
 }

Assets/Darkmatter/Code/Core/Data/Signals/Features/DrawingCatalog/BackBtnClickedSignal.cs

@@ -0,0 +1,7 @@
+using UnityEngine;
+
+namespace Darkmatter.Core
+{
+    public record struct BackBtnClickedSignal;
+    
+}

Assets/Darkmatter/Code/Core/Data/Signals/Features/DrawingCatalog/BackBtnClickedSignal.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fdd1f5bd7186d6244b2311e9f5b18a95

Assets/Darkmatter/Code/Core/Data/Signals/Features/DrawingCatalog/OpenArtBookSignal.cs

@@ -0,0 +1,6 @@
+using UnityEngine;
+
+namespace Darkmatter.Core
+{
+    public record struct OpenArtBookSignal;
+}

Assets/Darkmatter/Code/Core/Data/Signals/Features/DrawingCatalog/OpenArtBookSignal.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: cf8582ced90151445a9fa7b610f59ce9

Assets/Darkmatter/Code/Features/DrawingCatalog/Systems/DrawingCatalogController.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using Cysharp.Threading.Tasks;
+using Darkmatter.Core;
 using Darkmatter.Core.Contracts.Features.DrawingCatalog;
 using Darkmatter.Core.Contracts.Features.Progression;
 using Darkmatter.Core.Data.Signals.Features.Drawing;
@@ -40,6 +41,14 @@ public sealed class DrawingCatalogController : IDrawingCatalogController
     {
         _bus.Publish(new DrawingSelectedSignal(id));
     }
+    public void PublishBackBtnClickedSignal()
+    {
+        _bus.Publish(new BackBtnClickedSignal());
+    }
+    public void PublishOpenArtBookSignal()
+    {
+        _bus.Publish(new OpenArtBookSignal());
+    }
 
     private void Refresh()
     {

Assets/Darkmatter/Code/Features/DrawingCatalog/UI/DrawingCatalogButton.cs

@@ -1,8 +1,8 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Darkmatter.Features.DrawingCatalog;
+namespace Darkmatter.Features.DrawingCatalog
-
+{
     public class DrawingCatalogButton : MonoBehaviour
     {
         public string Id { get; private set; }
@@ -16,3 +16,5 @@ public class DrawingCatalogButton : MonoBehaviour
             button.onClick.AddListener(onClick);
         }
     }
+}
+

Assets/Darkmatter/Code/Features/DrawingCatalog/UI/DrawingCatalogPresenter.cs

@@ -26,9 +26,22 @@ namespace Darkmatter.Features.DrawingCatalog
         public void Start()
         {
             _view.OnItemClicked += OnItemClicked;
+            _view.OnBackClicked += OnBackBtnClicked;
+            _view.OnArtBookClicked += OnArtBookBtnClicked;
+
             _controller.ListChanged += OnListChanged;
         }
 
+        private void OnArtBookBtnClicked()
+        {
+           _controller.PublishOpenArtBookSignal();
+        }
+
+        private void OnBackBtnClicked()
+        {
+            _controller.PublishBackBtnClickedSignal();
+        }
+
         private void OnItemClicked(string id) =>
             _controller.OnTemplateSelected(id);
 

Assets/Darkmatter/Code/Features/DrawingCatalog/UI/DrawingCatalogView.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Darkmatter.Libs.Observer;
 using UnityEngine;
 using UnityEngine.Pool;
+using UnityEngine.UI;
 
 namespace Darkmatter.Features.DrawingCatalog
 {
@@ -9,9 +11,21 @@ namespace Darkmatter.Features.DrawingCatalog
     {
         [SerializeField] private RectTransform content;
         [SerializeField] private DrawingCatalogButton buttonPrefab;
+
+        [Header("Buttons")]
+        [SerializeField] private Button backButton;
+        [SerializeField] private Button artBookButton;
         private readonly List<DrawingCatalogButton> _buttons = new();
 
         public event Action<string> OnItemClicked;
+        public event Action OnBackClicked;
+        public event Action OnArtBookClicked;
+
+        public void Start()
+        {
+            backButton.onClick.AddListener(() => OnBackClicked?.Invoke());
+            artBookButton.onClick.AddListener(() => OnArtBookClicked?.Invoke());
+        }
 
         public void SetItems(IReadOnlyList<CatalogItemVM> items)
         {

Assets/Darkmatter/Code/Features/MainMenu/Features.Mainmenu.asmdef

@@ -7,7 +7,8 @@
         "GUID:b0214a6008ed146ff8f122a6a9c2f6cc",
         "GUID:68765d262e2128e4ab49c983f3411946",
         "GUID:80ecb87cae9c44d19824e70ea7229748",
-        "GUID:f51ebe6a0ceec4240a699833d6309b23"
+        "GUID:f51ebe6a0ceec4240a699833d6309b23",
+        "GUID:b4c9f7fbf1e144933a1797dc208ece5f"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuPresenter.cs

@@ -1,4 +1,6 @@
 using System;
+using Darkmatter.Core.Data.Signals.Features.AppBoot;
+using Darkmatter.Libs.Observer;
 using UnityEngine;
 using VContainer.Unity;
 
@@ -6,16 +8,26 @@ namespace Darkmatter.Features.Mainmenu
 {
     public class MainMenuPresenter : IStartable, IDisposable
     {
+        private readonly IEventBus _eventBus;
         private readonly MainMenuView _view;
 
-        public MainMenuPresenter(MainMenuView view)
+
+
+        public MainMenuPresenter(MainMenuView view, IEventBus eventBus)
         {
             _view = view;
+            _eventBus = eventBus;
         }
 
         public void Start()
         {
             _view.OnPlayBtnClickedEvent += OnPlayBtnClicked;
+            _eventBus.Subscribe<IntroCompletedSignal>(OnIntroComplete);
+        }
+
+        private void OnIntroComplete(IntroCompletedSignal signal)
+        {
+            _view.PlayMascotIntro();
         }
 
         private void OnPlayBtnClicked()

Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuView.cs

@@ -10,10 +10,8 @@ namespace Darkmatter.Features.Mainmenu
     public class MainMenuView : MonoBehaviour
     {
         [Header("UI Elements")]
-        [SerializeField] private Button playBtn;
+        //[SerializeField] private Button playBtn;
-        [SerializeField] private ParticleSystem playBtnParticle;
+        [SerializeField] private PlayButtonView playBtn;
-        [SerializeField] private Animator playBtnAnimator;
-
         [SerializeField] private SkeletonGraphic mascotSkeletonGraphic;
 
         [Header("Mascot Animations")]
@@ -28,8 +26,7 @@ namespace Darkmatter.Features.Mainmenu
 
         private void Start()
         {
-            playBtn.onClick.AddListener(OnPlayBtnClicked);
+            playBtn.OnPlayBtnClickedEvent += () => OnPlayBtnClickedEvent?.Invoke();
-            PlayMascotIntro();
         }
 
         private void OnDisable()
@@ -39,7 +36,7 @@ namespace Darkmatter.Features.Mainmenu
             helloCts = null;
         }
 
-        private void PlayMascotIntro()
+        public void PlayMascotIntro()
         {
             var state = mascotSkeletonGraphic.AnimationState;
             state.SetAnimation(0, jumpAnimation, false);
@@ -59,19 +56,5 @@ namespace Darkmatter.Features.Mainmenu
                 state.AddAnimation(0, idleAnimation, true, 0f);
             }
         }
-
-        private void OnPlayBtnClicked()
-        {
-            playBtn.interactable = false;
-            playBtnAnimator.enabled = false;
-            PlayBtnSequenceAsync(this.GetCancellationTokenOnDestroy()).Forget();
-        }
-
-        private async UniTaskVoid PlayBtnSequenceAsync(CancellationToken token)
-        {
-            playBtnParticle.Play();
-            await UniTask.WaitUntil(() => !playBtnParticle.IsAlive(true), cancellationToken: token);
-            OnPlayBtnClickedEvent?.Invoke();
-        }
     }
 }

Assets/Darkmatter/Code/Features/MainMenu/UI/PlayButtonView.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Darkmatter.Features.Mainmenu
+{
+    public class PlayButtonView : MonoBehaviour
+    {
+        private Button playBtn;
+        private Animator playBtnAnimator;
+        [SerializeField] private ParticleSystem playBtnParticle;
+
+        public event Action OnPlayBtnClickedEvent;
+
+        private void Awake()
+        {
+            playBtnAnimator = GetComponent<Animator>();
+            playBtn = GetComponent<Button>();
+        }
+
+        private void Start()
+        {
+            playBtn.onClick.AddListener(OnPlayBtnClicked);
+        }
+
+        private void OnPlayBtnClicked()
+        {
+            playBtn.interactable = false;
+            playBtnAnimator.enabled = false;
+            PlayBtnSequenceAsync(this.GetCancellationTokenOnDestroy()).Forget();
+        }
+
+        private async UniTaskVoid PlayBtnSequenceAsync(CancellationToken token)
+        {
+            playBtnParticle.Play();
+            await UniTask.WaitUntil(() => !playBtnParticle.IsAlive(true), cancellationToken: token);
+            OnPlayBtnClickedEvent?.Invoke();
+        }
+
+    }
+}

Assets/Darkmatter/Code/Features/MainMenu/UI/PlayButtonView.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 26f12f86a29f25046a03d5f29e123beb

Assets/Darkmatter/Content/Colorbook UI/Screenshot 2026-05-28 102838.png.meta

@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 146efcadf377295449a2f9fb4c59750a
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: -3612900073174345336
+    second: Screenshot 2026-05-28 102838_0
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Screenshot 2026-05-28 102838_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 1578
+        height: 884
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 889d57186866cddc0800000000000000
+      internalID: -3612900073174345336
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      Screenshot 2026-05-28 102838_0: -3612900073174345336
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Darkmatter/Content/Colorbook UI/Screenshot 2026-05-28 135543.png.meta

@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 023f8d651c927ec4ebc47feb990d5293
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: -1581424723844487289
+    second: Screenshot 2026-05-28 135543_0
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Screenshot 2026-05-28 135543_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 1578
+        height: 883
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 787aa38a796ad0ae0800000000000000
+      internalID: -1581424723844487289
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      Screenshot 2026-05-28 135543_0: -1581424723844487289
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Darkmatter/Content/DrawingItems/Ball/Ball Outline.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
+    wrapU: 1
-    wrapV: 0
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -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,15 +123,18 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0

Assets/Darkmatter/Content/DrawingItems/Bus1/Scroll View.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2215b6bec6046724ca51bf715c8bdbc1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Darkmatter/Content/Prefabs.meta

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

Assets/Darkmatter/Content/Prefabs/Level.prefab

@@ -0,0 +1,213 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1002787829030344513
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7165608992005527048}
+  - component: {fileID: 2204428333153858863}
+  - component: {fileID: 6571484247851016867}
+  - component: {fileID: 1375717659554091244}
+  - component: {fileID: 8659485863005789524}
+  m_Layer: 5
+  m_Name: Level
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7165608992005527048
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002787829030344513}
+  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:
+  - {fileID: 1848291166980498350}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2204428333153858863
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002787829030344513}
+  m_CullTransparentMesh: 1
+--- !u!114 &6571484247851016867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002787829030344513}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c32e75a5c9f8a654f816db8016b43f4a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1375717659554091244
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002787829030344513}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6571484247851016867}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &8659485863005789524
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002787829030344513}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: da23f33bd6fc4bf99f251714180406f1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Features.DrawingCatalog::Darkmatter.Features.DrawingCatalog.DrawingCatalogButton
+  thumbnail: {fileID: 3052182449713955122}
+  button: {fileID: 1375717659554091244}
+--- !u!1 &7483212002805005001
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1848291166980498350}
+  - component: {fileID: 4252515989583821464}
+  - component: {fileID: 3052182449713955122}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1848291166980498350
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7483212002805005001}
+  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: 7165608992005527048}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1.6053, y: 7.2107}
+  m_SizeDelta: {x: 178.8338, y: 199.2152}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4252515989583821464
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7483212002805005001}
+  m_CullTransparentMesh: 1
+--- !u!114 &3052182449713955122
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7483212002805005001}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: f6db270b00fab4f4b9c4f2002451b690, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/Darkmatter/Content/Prefabs/Level.prefab.meta

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

Assets/Darkmatter/Content/Sprites/Coloring Lobby UI Sprites/Image_Border.png.meta

@@ -49,7 +49,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 279, y: 200, z: 310, w: 212}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -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,15 +123,18 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0

Assets/Darkmatter/Content/Sprites/common/Btn Blue Small.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

Assets/Darkmatter/Scenes/ColorBookScene.unity.meta

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

Assets/Darkmatter/Scenes/MainMenu.unity

@@ -5547,9 +5547,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b2e90f858cdbce54abda9b9150c05a27, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Features.Mainmenu::Darkmatter.Features.Mainmenu.MainmenuView
-  playBtn: {fileID: 944146709}
+  playBtn: {fileID: 944146713}
-  playBtnParticle: {fileID: 247050072}
-  playBtnAnimator: {fileID: 944146712}
   mascotSkeletonGraphic: {fileID: 1313981500}
   jumpAnimation: jump
   idleAnimation: Idle
@@ -5944,6 +5942,7 @@ GameObject:
   - component: {fileID: 944146710}
   - component: {fileID: 944146709}
   - component: {fileID: 944146712}
+  - component: {fileID: 944146713}
   m_Layer: 5
   m_Name: PlayBtn
   m_TagString: Untagged
@@ -6074,6 +6073,19 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &944146713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 944146707}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 26f12f86a29f25046a03d5f29e123beb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Features.Mainmenu::Darkmatter.Features.Mainmenu.PlayBtnEffector
+  playBtnParticle: {fileID: 247050072}
 --- !u!1 &1027389573
 GameObject:
   m_ObjectHideFlags: 0
@@ -6206,7 +6218,7 @@ GameObject:
   - component: {fileID: 1102850748}
   - component: {fileID: 1102850749}
   m_Layer: 0
-  m_Name: MainmenuServiceModule
+  m_Name: MainmenuFeatureModule
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -6239,86 +6251,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 11551a88f8a7aed4ea3d9b1333736a95, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Features.Mainmenu::Darkmatter.Features.Mainmenu.MainmenuInstallers
-  mainmenuView: {fileID: 710324176}
+  mainMenuView: {fileID: 710324176}
---- !u!1 &1141530807
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1141530810}
-  - component: {fileID: 1141530809}
-  - component: {fileID: 1141530808}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1141530808
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1141530807}
-  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 &1141530809
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1141530807}
-  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 &1141530810
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1141530807}
-  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 &1313981498
 GameObject:
   m_ObjectHideFlags: 0
@@ -6468,7 +6401,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: Darkmatter.App::MainmenuLifetimeScope
   parentReference:
-    TypeName: Darkmatter.App.LifetimeScopes.GameLifetimeScope
+    TypeName: Darkmatter.App.LifetimeScopes.RootLifetimeScope
   autoRun: 1
   autoInjectGameObjects: []
   serviceModules:
@@ -26676,4 +26609,3 @@ SceneRoots:
   - {fileID: 1407834210}
   - {fileID: 619394802}
   - {fileID: 2069155641}
-  - {fileID: 1141530810}