fixes, improvements. firebase

Assets/Darkmatter/Code/Features/ArtBook/UI/ArtbookPresenter.cs

@@ -151,7 +151,7 @@ namespace Darkmatter.Features.Artbook
         {
             if (!entry.HasValue || entry.Value.Thumbnail == null) return;
             var ct = _cts?.Token ?? CancellationToken.None;
-            await _gallery.SaveImageAsync(entry.Value.Thumbnail, entry.Value.Id, ct);
+            await _gallery.SaveImageAsync(entry.Value.Thumbnail, entry.Value.Name, ct);
         }
 
         private void HandleLeftEditClicked() => OpenForEdit(GetLeftEntry());

Assets/Darkmatter/Code/Features/Capture/Systems/CaptureSystem.cs

@@ -1,8 +1,9 @@
-using System;
 using System.Threading;
 using Cysharp.Threading.Tasks;
 using Darkmatter.Core.Contracts.Features.Capture;
+using Darkmatter.Core.Contracts.Features.DrawingCatalog;
 using Darkmatter.Core.Contracts.Features.GameplayFlow;
+using Darkmatter.Core.Contracts.Features.Progression;
 using Darkmatter.Core.Contracts.Services.Capture;
 using Darkmatter.Core.Contracts.Services.Gallery;
 using Darkmatter.Core.Data.Signals.Features.Capture;
@@ -18,19 +19,25 @@ namespace Darkmatter.Features.Capture
         private readonly IGameplaySceneRefs _refs;
         private readonly IEventBus _bus;
         private readonly CaptureConfig _config;
+        private readonly IProgressionSystem _progression;
+        private readonly IDrawingTemplateCatalog _catalog;
 
         public CaptureSystem(
             ICaptureService captureService,
             IGalleryService galleryService,
             IGameplaySceneRefs refs,
             IEventBus bus,
-            CaptureConfig config)
+            CaptureConfig config,
+            IProgressionSystem progression,
+            IDrawingTemplateCatalog catalog)
         {
             _captureService = captureService;
             _galleryService = galleryService;
             _refs = refs;
             _bus = bus;
             _config = config;
+            _progression = progression;
+            _catalog = catalog;
         }
 
         public async UniTask<byte[]> CapturePngAsync(bool saveToGallery = false, CancellationToken ct = default)
@@ -44,9 +51,9 @@ namespace Darkmatter.Features.Capture
             {
                 if (tex.LoadImage(png))
                 {
+                    var fileName = await BuildFileNameAsync();
                     _bus.Publish(new GallerySaveStartedSignal());
-                    await _galleryService.SaveImageAsync(tex,
-                        $"colorbook_{DateTime.UtcNow:yyyyMMdd_HHmmss}.png", ct);
+                    await _galleryService.SaveImageAsync(tex, fileName, ct);
                     success = true;
                 }
             }
@@ -57,5 +64,20 @@ namespace Darkmatter.Features.Capture
             }
             return png;
         }
+
+        private async UniTask<string> BuildFileNameAsync()
+        {
+            var id = _progression.LastOpenedTemplateId;
+            if (string.IsNullOrEmpty(id)) return null;
+            try
+            {
+                var template = await _catalog.LoadAsync(id);
+                return template?.DisplayName;
+            }
+            catch
+            {
+                return null;
+            }
+        }
     }
 }

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

@@ -2,12 +2,9 @@ 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;
 using Darkmatter.Libs.Observer;
-using ZLinq;
 
 namespace Darkmatter.Features.DrawingCatalog.Systems;
 
@@ -15,7 +12,6 @@ public sealed class DrawingCatalogController : IDrawingCatalogController
 {
     private readonly IDrawingTemplateCatalog _catalog;
     private readonly IEventBus _bus;
-    private readonly IProgressionSystem _progression;
 
     private readonly List<string> _visible = new();
     public IReadOnlyList<string> VisibleIds => _visible;
@@ -23,11 +19,9 @@ public sealed class DrawingCatalogController : IDrawingCatalogController
 
     public DrawingCatalogController(
         IDrawingTemplateCatalog catalog,
-        IProgressionSystem progression,
         IEventBus bus)
     {
         _catalog = catalog;
-        _progression = progression;
         _bus = bus;
     }
 
@@ -45,13 +39,8 @@ public sealed class DrawingCatalogController : IDrawingCatalogController
     private void Refresh()
     {
         _visible.Clear();
-        var all = _catalog.AllTemplateIds;
-        foreach (var id in all)
-            if (!_progression.CompletedTemplateIds.AsValueEnumerable().Contains(id))
-                _visible.Add(id);
-        foreach (var id in all)
-            if (_progression.CompletedTemplateIds.AsValueEnumerable().Contains(id))
-                _visible.Add(id);
+        _visible.AddRange(_catalog.AllTemplateIds);
+        _visible.Sort(StringComparer.OrdinalIgnoreCase);
         ListChanged?.Invoke();
     }
 }

Assets/Darkmatter/Code/Libs/UnityUtils/Editor/Windows/OpenEditorGalleryMenu.cs

@@ -0,0 +1,19 @@
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace Darkmatter.Libs.UnityUtils.Editor
+{
+    public static class OpenEditorGalleryMenu
+    {
+        private const string MenuPath = "Tools/Colorbook/Open Editor Gallery";
+
+        [MenuItem(MenuPath)]
+        private static void Open()
+        {
+            var dir = Path.Combine(Application.persistentDataPath, "Colorbook-Gallery");
+            Directory.CreateDirectory(dir);
+            EditorUtility.RevealInFinder(dir);
+        }
+    }
+}

Assets/Darkmatter/Code/Libs/UnityUtils/Editor/Windows/OpenEditorGalleryMenu.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 55aad6d59cbf04999877c8c4b2f55836

Assets/Darkmatter/Code/Services/Ads/Systems/AdMobAdService.cs

@@ -21,6 +21,8 @@ namespace Darkmatter.Services.Ads
         [SerializeField] private bool autoReload = true;
         [Tooltip("Seconds between auto-reload retries on failure.")]
         [SerializeField, Min(1f)] private float reloadDelaySeconds = 5f;
+        [Tooltip("Max reload attempts before giving up.")]
+        [SerializeField, Min(1)] private int reloadMaxAttempts = 6;
 
         public bool IsInitialized => _initialized;
         public event Action<AdFormat, AdLoadState> LoadStateChanged;
@@ -495,8 +497,14 @@ namespace Darkmatter.Services.Ads
         {
             try
             {
-                await UniTask.Delay(TimeSpan.FromSeconds(reloadDelaySeconds), cancellationToken: cancellationToken);
-                await LoadAsync(format, cancellationToken);
+                for (int attempt = 0; attempt < reloadMaxAttempts; attempt++)
+                {
+                    await UniTask.Delay(TimeSpan.FromSeconds(reloadDelaySeconds), cancellationToken: cancellationToken);
+                    if (cancellationToken.IsCancellationRequested) return;
+                    if (IsReady(format)) return;
+                    if (await LoadAsync(format, cancellationToken)) return;
+                }
+                Debug.LogWarning($"[AdMobAdService] {format} reload gave up after {reloadMaxAttempts} attempts.");
             }
             catch (OperationCanceledException) { }
         }

Assets/Darkmatter/Code/Services/Analytics/Installers/AnalyticsModule.cs

@@ -9,9 +9,7 @@ namespace Darkmatter.Services.Analytics
     {
         public void Register(IContainerBuilder builder)
         {
-#if FIREBASE_ANALYTICS_PRESENT
             builder.RegisterEntryPoint<FirebaseAnalyticsSystem>();
-#endif
         }
     }
 }

Assets/Darkmatter/Code/Services/Analytics/Systems/FirebaseAnalyticsSystem.cs

@@ -1,4 +1,3 @@
-#if FIREBASE_ANALYTICS
 using System.Threading;
 using Cysharp.Threading.Tasks;
 using Firebase.Crashlytics;
@@ -10,7 +9,6 @@ namespace Darkmatter.Services.Analytics
     {
         public async UniTask StartAsync(CancellationToken cancellation = new CancellationToken())
         {
-#if !UNITY_EDITOR
             await Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWith(task =>
             {
                 var dependencyStatus = task.Result;
@@ -39,8 +37,6 @@ namespace Darkmatter.Services.Analytics
                     // Firebase Unity SDK is not safe to use here.
                 }
             }, cancellation);
-#endif
         }
     }
-}
-#endif
+}

Assets/Darkmatter/Code/Services/Gallery/Core/GalleryConfig.cs

@@ -0,0 +1,16 @@
+using System;
+using UnityEngine;
+
+namespace Darkmatter.Services.Gallery
+{
+    [Serializable]
+    public struct GalleryConfig
+    {
+        public Texture2D Background { get; }
+
+        public GalleryConfig(Texture2D background)
+        {
+            Background = background;
+        }
+    }
+}

Assets/Darkmatter/Code/Services/Gallery/Core/GalleryConfig.cs.meta

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

Assets/Darkmatter/Code/Services/Gallery/Core/GalleryService.cs

@@ -1,4 +1,6 @@
 using System;
+using System.IO;
+using System.Text;
 using System.Threading;
 using Cysharp.Threading.Tasks;
 using Darkmatter.Core.Contracts.Services.Gallery;
@@ -8,36 +10,123 @@ namespace Darkmatter.Services.Gallery
 {
     public class GalleryService : IGalleryService
     {
+        private readonly GalleryConfig _config;
+
+        public GalleryService(GalleryConfig config) => _config = config;
+
         public async UniTask SaveImageAsync(Texture2D image, string fileName, CancellationToken cancellationToken)
         {
-            var permission = await NativeGallery.RequestPermissionAsync(NativeGallery.PermissionType.Write,
-                NativeGallery.MediaType.Image);
-
-            if (permission != NativeGallery.Permission.Granted)
+            Texture2D composited = null;
+            Texture2D toSave = image;
+            if (_config.Background != null)
             {
-                return;
+                composited = CompositeOverBackground(image, _config.Background);
+                toSave = composited;
             }
 
-            var tcs = new UniTaskCompletionSource();
-            var registration = cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken));
+            var resolvedName = BuildUniqueFileName(fileName);
 
-            NativeGallery.SaveImageToGallery(image, "Colorbook",
-                filename: $"colorbook_{DateTime.UtcNow:yyyyMMdd_HHmmss}.png", callback: (success, path) =>
+            try
+            {
+#if UNITY_EDITOR
+                var bytes = toSave.EncodeToPNG();
+                var dir = Path.Combine(Application.persistentDataPath, "Colorbook-Gallery");
+                Directory.CreateDirectory(dir);
+                var path = Path.Combine(dir, resolvedName);
+                await File.WriteAllBytesAsync(path, bytes, cancellationToken);
+                Debug.Log($"[GalleryService] (Editor) Image saved to: {path}");
+#else
+                var permission = await NativeGallery.RequestPermissionAsync(NativeGallery.PermissionType.Write,
+                    NativeGallery.MediaType.Image);
+
+                if (permission != NativeGallery.Permission.Granted)
                 {
-                    registration.Dispose();
-                    if (!success)
-                    {
-                        Debug.LogError("Failed to save image to gallery.");
-                    }
-                    else
-                    {
-                        Debug.Log($"Image saved to gallery at: {path}");
-                    }
+                    return;
+                }
 
-                    tcs.TrySetResult();
-                });
+                var tcs = new UniTaskCompletionSource();
+                var registration = cancellationToken.Register(() => tcs.TrySetCanceled(cancellationToken));
 
-            await tcs.Task;
+                NativeGallery.SaveImageToGallery(toSave, "Colorbook",
+                    filename: resolvedName, callback: (success, path) =>
+                    {
+                        registration.Dispose();
+                        if (!success)
+                        {
+                            Debug.LogError("Failed to save image to gallery.");
+                        }
+                        else
+                        {
+                            Debug.Log($"Image saved to gallery at: {path}");
+                        }
+
+                        tcs.TrySetResult();
+                    });
+
+                await tcs.Task;
+#endif
+            }
+            finally
+            {
+                if (composited != null) UnityEngine.Object.Destroy(composited);
+            }
+        }
+
+        private static string BuildUniqueFileName(string baseName)
+        {
+            var prefix = Sanitize(baseName);
+            if (string.IsNullOrEmpty(prefix)) prefix = "drawing";
+            return $"{prefix}_{DateTime.UtcNow:yyyyMMdd_HHmmssfff}.png";
+        }
+
+        private static string Sanitize(string s)
+        {
+            if (string.IsNullOrEmpty(s)) return null;
+            var name = Path.GetFileNameWithoutExtension(s).Trim();
+            var sb = new StringBuilder(name.Length);
+            foreach (var c in name)
+            {
+                if (char.IsLetterOrDigit(c)) sb.Append(c);
+                else if (c == ' ' || c == '-' || c == '_') sb.Append('_');
+            }
+            return sb.Length == 0 ? null : sb.ToString();
+        }
+
+        private static Texture2D CompositeOverBackground(Texture2D captured, Texture2D background)
+        {
+            int bgW = background.width;
+            int bgH = background.height;
+            int cW = captured.width;
+            int cH = captured.height;
+
+            float fit = Mathf.Min(1f, Mathf.Min((float)bgW / cW, (float)bgH / cH));
+            int finalW = Mathf.Max(1, Mathf.RoundToInt(cW * fit));
+            int finalH = Mathf.Max(1, Mathf.RoundToInt(cH * fit));
+            int offsetX = (bgW - finalW) / 2;
+            int offsetY = (bgH - finalH) / 2;
+
+            var rt = RenderTexture.GetTemporary(bgW, bgH, 0, RenderTextureFormat.ARGB32);
+            var prev = RenderTexture.active;
+            try
+            {
+                Graphics.Blit(background, rt);
+
+                RenderTexture.active = rt;
+                GL.PushMatrix();
+                GL.LoadPixelMatrix(0, bgW, bgH, 0);
+                Graphics.DrawTexture(new Rect(offsetX, offsetY, finalW, finalH), captured);
+                GL.PopMatrix();
+
+                var output = new Texture2D(bgW, bgH, TextureFormat.RGBA32, mipChain: false);
+                output.ReadPixels(new Rect(0, 0, bgW, bgH), 0, 0);
+                output.Apply();
+                return output;
+            }
+            finally
+            {
+                RenderTexture.active = prev;
+                RenderTexture.ReleaseTemporary(rt);
+            }
         }
     }
-}
+}

Assets/Darkmatter/Code/Services/Gallery/Installers/GalleryModule.cs

@@ -7,8 +7,11 @@ namespace Darkmatter.Services.Gallery
 {
     public class GalleryModule : MonoBehaviour,IModule
     {
+        [SerializeField] private Texture2D saveBackground;
+
         public void Register(IContainerBuilder builder)
         {
+            builder.RegisterInstance(new GalleryConfig(saveBackground));
             builder.Register<IGalleryService,GalleryService>(Lifetime.Singleton);
         }
     }

Assets/Darkmatter/Content/Colorbook UI/Prefabs/UI/ArtBookView.prefab

@@ -64,7 +64,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -432,7 +432,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -631,7 +631,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -750,7 +750,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1328,7 +1328,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1522,7 +1522,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1912,7 +1912,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -2123,7 +2123,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -2298,7 +2298,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -2894,7 +2894,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -2969,7 +2969,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -3109,7 +3109,7 @@ MonoBehaviour:
   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_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []

Assets/Darkmatter/Content/Colorbook UI/Save Art Background.png.meta

@@ -37,8 +37,8 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
-    wrapV: 1
+    wrapU: 0
+    wrapV: 0
     wrapW: 0
   nPOTScale: 0
   lightmap: 0
@@ -52,9 +52,9 @@ TextureImporter:
   spriteBorder: {x: 869, y: 876, z: 282, w: 277}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   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
@@ -119,10 +119,24 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    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: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
@@ -132,6 +146,8 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0

Assets/Darkmatter/Scenes/Boot.unity

@@ -151,9 +151,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1424266587}
   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: -31.709412, y: -501}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -39, y: 37}
   m_SizeDelta: {x: 1124.7546, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &17632382
@@ -679,6 +679,50 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e14e6746c7bb4b57808b4d3020dc7bbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Services.Capture::Darkmatter.Services.Capture.Installers.CaptureServiceModule
+--- !u!1 &164240469
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 164240470}
+  - component: {fileID: 164240471}
+  m_Layer: 0
+  m_Name: AnalyticsServiceModule
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &164240470
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 164240469}
+  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 &164240471
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 164240469}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e89fdd4696924b7facccda23a94a978, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Services.Analytics::Darkmatter.Services.Analytics.AnalyticsModule
 --- !u!1 &196669901
 GameObject:
   m_ObjectHideFlags: 0
@@ -1583,6 +1627,7 @@ Transform:
   - {fileID: 978572232}
   - {fileID: 361052051}
   - {fileID: 1707278033}
+  - {fileID: 164240470}
   m_Father: {fileID: 1798580248}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1156238479
@@ -1632,6 +1677,7 @@ MonoBehaviour:
   catalog: {fileID: 11400000, guid: 6e2d0c78aa02e4411948adcca14299a5, type: 2}
   autoReload: 1
   reloadDelaySeconds: 5
+  reloadMaxAttempts: 6
 --- !u!1 &1239449674
 GameObject:
   m_ObjectHideFlags: 0
@@ -1676,6 +1722,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f03c84255756e497f96c3baa7f6abe16, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Services.Gallery::Darkmatter.Services.Gallery.GalleryServiceModule
+  saveBackground: {fileID: 2800000, guid: 0c8e208e83531f84cb2b842025cdd232, type: 3}
 --- !u!1 &1315655361
 GameObject:
   m_ObjectHideFlags: 0
@@ -1889,12 +1936,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
+  m_MatchWidthOrHeight: 0.5
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
@@ -1919,7 +1966,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_VertexColorAlwaysGammaSpace: 1
   m_UseReflectionProbes: 0
-  m_AdditionalShaderChannelsFlag: 1
+  m_AdditionalShaderChannelsFlag: 25
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
   m_SortingOrder: 800
@@ -2163,6 +2210,7 @@ MonoBehaviour:
   - {fileID: 978572233}
   - {fileID: 361052052}
   - {fileID: 1707278034}
+  - {fileID: 164240471}
 --- !u!1 &1890425864
 GameObject:
   m_ObjectHideFlags: 0

Assets/Darkmatter/Scenes/GamePlay.unity

@@ -164,6 +164,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: Features.Capture::Darkmatter.Features.Capture.CaptureFeatureModule
   captureScale: 1
+  galleryBackground: {fileID: 2800000, guid: 0c8e208e83531f84cb2b842025cdd232, type: 3}
   captureButtonView: {fileID: 376589371}
   gallerySaveView: {fileID: 0}
 --- !u!1 &64614225
@@ -971,6 +972,82 @@ MonoBehaviour:
   m_EditorClassIdentifier: Features.GameplayFlow::Darkmatter.Features.GameplayFlow.SceneRefs.GameplaySceneRefs
   paperRoot: {fileID: 1143672390}
   confetti: {fileID: 1141121867}
+--- !u!1 &565686254
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 565686255}
+  - component: {fileID: 565686257}
+  - component: {fileID: 565686256}
+  m_Layer: 5
+  m_Name: SavingIndicator
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &565686255
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 565686254}
+  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: 993060025}
+  m_Father: {fileID: 2069155641}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &565686256
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 565686254}
+  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: 0, g: 0, b: 0, a: 0.7607843}
+  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: 0}
+  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!222 &565686257
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 565686254}
+  m_CullTransparentMesh: 1
 --- !u!1 &600922870
 GameObject:
   m_ObjectHideFlags: 0
@@ -1395,6 +1472,143 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 892653812}
   m_CullTransparentMesh: 1
+--- !u!1 &993060024
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 993060025}
+  - component: {fileID: 993060027}
+  - component: {fileID: 993060026}
+  m_Layer: 5
+  m_Name: Saving
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &993060025
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 993060024}
+  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: 565686255}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 897.3912, y: 143.6794}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &993060026
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 993060024}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
+  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_text: Saving...
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: dde468a43b0440f4a9d121fb1d8f290e, type: 2}
+  m_sharedMaterial: {fileID: -1548830327015913602, guid: dde468a43b0440f4a9d121fb1d8f290e, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 124.7
+  m_fontSizeBase: 124.7
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_characterHorizontalScale: 1
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_TextWrappingMode: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_ActiveFontFeatures: 6e72656b
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &993060027
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 993060024}
+  m_CullTransparentMesh: 1
 --- !u!1 &1046038182
 GameObject:
   m_ObjectHideFlags: 0
@@ -3665,6 +3879,7 @@ RectTransform:
   m_Children:
   - {fileID: 201822947}
   - {fileID: 2022514148}
+  - {fileID: 565686255}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}