From dd6a7be1fc8f0857fc85f6218d617c73f306ade5 Mon Sep 17 00:00:00 2001 From: Savya Bikram Shah Date: Thu, 28 May 2026 14:40:21 +0545 Subject: [PATCH] Scene Loading Script --- .../App/LifetimeScopes/GameLifetimeScope.cs | 6 - .../LifetimeScopes/GameLifetimeScope.cs.meta | 2 - .../Core/Enums/Services/Scenes/GameScene.cs | 1 + .../Code/Features/AppBoot/Flow/AppBootFlow.cs | 7 +- Assets/Darkmatter/Code/Features/Coloring.meta | 8 + .../Coloring/Features.Coloring.asmdef | 22 ++ .../Coloring/Features.Coloring.asmdef.meta | 7 + .../Code/Features/Coloring/Installers.meta | 8 + .../Installers/ColoringFeatureModule.cs | 14 ++ .../Installers/ColoringFeatureModule.cs.meta | 2 + .../Code/Services/Audio/Installers.meta | 8 + .../Audio/Installers/AudioServiceModule.cs | 22 ++ .../Installers/AudioServiceModule.cs.meta | 2 + .../Code/Services/Audio/Services.Audio.asmdef | 3 +- .../Code/Services/Audio/Systems.meta | 8 + .../Audio/{ => Systems}/AudioService.cs | 0 .../Audio/{ => Systems}/AudioService.cs.meta | 0 .../Services/Audio/{ => Systems}/SfxPlayer.cs | 0 .../Audio/{ => Systems}/SfxPlayer.cs.meta | 0 .../Code/Services/Scenes/Installers.meta | 8 + .../Scenes/Installers/SceneServiceModule.cs | 15 ++ .../Installers/SceneServiceModule.cs.meta | 2 + .../Services/Scenes/Services.Scenes.asmdef | 4 +- .../Code/Services/Scenes/Systems.meta | 8 + .../Scenes/{ => Systems}/SceneService.cs | 0 .../Scenes/{ => Systems}/SceneService.cs.meta | 0 Assets/Darkmatter/Data/Audio.meta | 8 + Assets/Darkmatter/Data/Audio/SfxCatalog.asset | 15 ++ .../Data/Audio/SfxCatalog.asset.meta | 8 + Assets/Darkmatter/Scenes/Boot.unity | 197 ++++++++---------- Assets/Darkmatter/Scenes/GamePlay.unity | 48 ++++- 31 files changed, 312 insertions(+), 121 deletions(-) delete mode 100644 Assets/Darkmatter/Code/App/LifetimeScopes/GameLifetimeScope.cs delete mode 100644 Assets/Darkmatter/Code/App/LifetimeScopes/GameLifetimeScope.cs.meta create mode 100644 Assets/Darkmatter/Code/Features/Coloring.meta create mode 100644 Assets/Darkmatter/Code/Features/Coloring/Features.Coloring.asmdef create mode 100644 Assets/Darkmatter/Code/Features/Coloring/Features.Coloring.asmdef.meta create mode 100644 Assets/Darkmatter/Code/Features/Coloring/Installers.meta create mode 100644 Assets/Darkmatter/Code/Features/Coloring/Installers/ColoringFeatureModule.cs create mode 100644 Assets/Darkmatter/Code/Features/Coloring/Installers/ColoringFeatureModule.cs.meta create mode 100644 Assets/Darkmatter/Code/Services/Audio/Installers.meta create mode 100644 Assets/Darkmatter/Code/Services/Audio/Installers/AudioServiceModule.cs create mode 100644 Assets/Darkmatter/Code/Services/Audio/Installers/AudioServiceModule.cs.meta create mode 100644 Assets/Darkmatter/Code/Services/Audio/Systems.meta rename Assets/Darkmatter/Code/Services/Audio/{ => Systems}/AudioService.cs (100%) rename Assets/Darkmatter/Code/Services/Audio/{ => Systems}/AudioService.cs.meta (100%) rename Assets/Darkmatter/Code/Services/Audio/{ => Systems}/SfxPlayer.cs (100%) rename Assets/Darkmatter/Code/Services/Audio/{ => Systems}/SfxPlayer.cs.meta (100%) create mode 100644 Assets/Darkmatter/Code/Services/Scenes/Installers.meta create mode 100644 Assets/Darkmatter/Code/Services/Scenes/Installers/SceneServiceModule.cs create mode 100644 Assets/Darkmatter/Code/Services/Scenes/Installers/SceneServiceModule.cs.meta create mode 100644 Assets/Darkmatter/Code/Services/Scenes/Systems.meta rename Assets/Darkmatter/Code/Services/Scenes/{ => Systems}/SceneService.cs (100%) rename Assets/Darkmatter/Code/Services/Scenes/{ => Systems}/SceneService.cs.meta (100%) create mode 100644 Assets/Darkmatter/Data/Audio.meta create mode 100644 Assets/Darkmatter/Data/Audio/SfxCatalog.asset create mode 100644 Assets/Darkmatter/Data/Audio/SfxCatalog.asset.meta diff --git a/Assets/Darkmatter/Code/App/LifetimeScopes/GameLifetimeScope.cs b/Assets/Darkmatter/Code/App/LifetimeScopes/GameLifetimeScope.cs deleted file mode 100644 index 221a166..0000000 --- a/Assets/Darkmatter/Code/App/LifetimeScopes/GameLifetimeScope.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Darkmatter.App.LifetimeScopes -{ - public class GameLifetimeScope : BaseLifetimeScope - { - } -} diff --git a/Assets/Darkmatter/Code/App/LifetimeScopes/GameLifetimeScope.cs.meta b/Assets/Darkmatter/Code/App/LifetimeScopes/GameLifetimeScope.cs.meta deleted file mode 100644 index 5868652..0000000 --- a/Assets/Darkmatter/Code/App/LifetimeScopes/GameLifetimeScope.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 4ca410c053f074e1cba2f7041f500d34 \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Core/Enums/Services/Scenes/GameScene.cs b/Assets/Darkmatter/Code/Core/Enums/Services/Scenes/GameScene.cs index 3604567..3d4912e 100644 --- a/Assets/Darkmatter/Code/Core/Enums/Services/Scenes/GameScene.cs +++ b/Assets/Darkmatter/Code/Core/Enums/Services/Scenes/GameScene.cs @@ -4,6 +4,7 @@ namespace Darkmatter.Core.Enums.Services.Scenes { Boot, MainMenu, + Colorbook, Gameplay, } } \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Features/AppBoot/Flow/AppBootFlow.cs b/Assets/Darkmatter/Code/Features/AppBoot/Flow/AppBootFlow.cs index 15ae792..0a1ea4a 100644 --- a/Assets/Darkmatter/Code/Features/AppBoot/Flow/AppBootFlow.cs +++ b/Assets/Darkmatter/Code/Features/AppBoot/Flow/AppBootFlow.cs @@ -1,5 +1,7 @@ using System.Threading; using Cysharp.Threading.Tasks; +using Darkmatter.Core.Contracts.Services.Scenes; +using Darkmatter.Core.Enums.Services.Scenes; using Darkmatter.Features.AppBoot.SceneRefs; using UnityEngine; using UnityEngine.Video; @@ -10,10 +12,12 @@ namespace Darkmatter.Features.AppBoot.Flow public class AppBootFlow : IAsyncStartable { private readonly AppBootSceneRefs _sceneRefs; + private readonly ISceneService _sceneService; - public AppBootFlow(AppBootSceneRefs sceneRefs) + public AppBootFlow(AppBootSceneRefs sceneRefs, ISceneService sceneService) { _sceneRefs = sceneRefs; + _sceneService = sceneService; } public async UniTask StartAsync(CancellationToken cancellation = default) @@ -29,6 +33,7 @@ namespace Darkmatter.Features.AppBoot.Flow player.loopPointReached += OnDone; player.Play(); + await _sceneService.LoadSceneAsync(GameScene.MainMenu, null, cancellation); await tcs.Task.AttachExternalCancellation(cancellation); diff --git a/Assets/Darkmatter/Code/Features/Coloring.meta b/Assets/Darkmatter/Code/Features/Coloring.meta new file mode 100644 index 0000000..b4bd70d --- /dev/null +++ b/Assets/Darkmatter/Code/Features/Coloring.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 585a9b1ea84a5404d8726cb7e20e6398 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Code/Features/Coloring/Features.Coloring.asmdef b/Assets/Darkmatter/Code/Features/Coloring/Features.Coloring.asmdef new file mode 100644 index 0000000..e995fe8 --- /dev/null +++ b/Assets/Darkmatter/Code/Features/Coloring/Features.Coloring.asmdef @@ -0,0 +1,22 @@ +{ + "name": "Features.Coloring", + "rootNamespace": "Darkmatter.Features.Coloring", + "references": [ + "GUID:6a0a834eb41764f12ba55c3fb04a40cb", + "GUID:c1c03c0e5b2f4412b9f2be1c20d6a9b1", + "GUID:c176ee863a5e74e88a6517f9f102cf92", + "GUID:b4c9f7fbf1e144933a1797dc208ece5f", + "GUID:b0214a6008ed146ff8f122a6a9c2f6cc", + "GUID:f51ebe6a0ceec4240a699833d6309b23", + "GUID:80ecb87cae9c44d19824e70ea7229748" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Features/Coloring/Features.Coloring.asmdef.meta b/Assets/Darkmatter/Code/Features/Coloring/Features.Coloring.asmdef.meta new file mode 100644 index 0000000..098038a --- /dev/null +++ b/Assets/Darkmatter/Code/Features/Coloring/Features.Coloring.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4cede189a43c349069c614e305683720 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Code/Features/Coloring/Installers.meta b/Assets/Darkmatter/Code/Features/Coloring/Installers.meta new file mode 100644 index 0000000..5646365 --- /dev/null +++ b/Assets/Darkmatter/Code/Features/Coloring/Installers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9ad07895989e445f8557096c4a1aa7a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Code/Features/Coloring/Installers/ColoringFeatureModule.cs b/Assets/Darkmatter/Code/Features/Coloring/Installers/ColoringFeatureModule.cs new file mode 100644 index 0000000..c1ee051 --- /dev/null +++ b/Assets/Darkmatter/Code/Features/Coloring/Installers/ColoringFeatureModule.cs @@ -0,0 +1,14 @@ +using Darkmatter.Libs.Installers; +using UnityEngine; +using VContainer; + +namespace Darkmatter.Features.Coloring +{ + public class ColoringFeatureModule : MonoBehaviour,IModule + { + public void Register(IContainerBuilder builder) + { + + } + } +} diff --git a/Assets/Darkmatter/Code/Features/Coloring/Installers/ColoringFeatureModule.cs.meta b/Assets/Darkmatter/Code/Features/Coloring/Installers/ColoringFeatureModule.cs.meta new file mode 100644 index 0000000..19709e6 --- /dev/null +++ b/Assets/Darkmatter/Code/Features/Coloring/Installers/ColoringFeatureModule.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d0dc926588daf4a139e807f48f664baf \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Services/Audio/Installers.meta b/Assets/Darkmatter/Code/Services/Audio/Installers.meta new file mode 100644 index 0000000..dab23ba --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Audio/Installers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46d6646913d0d423eaabd923f70ef127 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Code/Services/Audio/Installers/AudioServiceModule.cs b/Assets/Darkmatter/Code/Services/Audio/Installers/AudioServiceModule.cs new file mode 100644 index 0000000..d5996aa --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Audio/Installers/AudioServiceModule.cs @@ -0,0 +1,22 @@ +using Darkmatter.Core.Contracts.Services.Audio; +using Darkmatter.Core.Data.Static.Services.Audio; +using Darkmatter.Libs.Installers; +using UnityEngine; +using VContainer; +using VContainer.Unity; + +namespace Darkmatter.Services.Audio +{ + public class AudioServiceModule : MonoBehaviour, IModule + { + [SerializeField] private SfxCatalogSO sfxCatalog; + + public void Register(IContainerBuilder builder) + { + if (sfxCatalog != null) + builder.RegisterComponent(sfxCatalog); + builder.Register(Lifetime.Singleton); + builder.Register(Lifetime.Singleton); + } + } +} \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Services/Audio/Installers/AudioServiceModule.cs.meta b/Assets/Darkmatter/Code/Services/Audio/Installers/AudioServiceModule.cs.meta new file mode 100644 index 0000000..e387a8c --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Audio/Installers/AudioServiceModule.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fa11c3cff997e4a0a8263a29d804779f \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Services/Audio/Services.Audio.asmdef b/Assets/Darkmatter/Code/Services/Audio/Services.Audio.asmdef index b3f5d48..e9ba122 100644 --- a/Assets/Darkmatter/Code/Services/Audio/Services.Audio.asmdef +++ b/Assets/Darkmatter/Code/Services/Audio/Services.Audio.asmdef @@ -5,7 +5,8 @@ "GUID:6a0a834eb41764f12ba55c3fb04a40cb", "GUID:f51ebe6a0ceec4240a699833d6309b23", "GUID:b0214a6008ed146ff8f122a6a9c2f6cc", - "GUID:b4c9f7fbf1e144933a1797dc208ece5f" + "GUID:b4c9f7fbf1e144933a1797dc208ece5f", + "GUID:c1c03c0e5b2f4412b9f2be1c20d6a9b1" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Darkmatter/Code/Services/Audio/Systems.meta b/Assets/Darkmatter/Code/Services/Audio/Systems.meta new file mode 100644 index 0000000..c25a602 --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Audio/Systems.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbbd26e1f2def4991b74ecd2709fdb08 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Code/Services/Audio/AudioService.cs b/Assets/Darkmatter/Code/Services/Audio/Systems/AudioService.cs similarity index 100% rename from Assets/Darkmatter/Code/Services/Audio/AudioService.cs rename to Assets/Darkmatter/Code/Services/Audio/Systems/AudioService.cs diff --git a/Assets/Darkmatter/Code/Services/Audio/AudioService.cs.meta b/Assets/Darkmatter/Code/Services/Audio/Systems/AudioService.cs.meta similarity index 100% rename from Assets/Darkmatter/Code/Services/Audio/AudioService.cs.meta rename to Assets/Darkmatter/Code/Services/Audio/Systems/AudioService.cs.meta diff --git a/Assets/Darkmatter/Code/Services/Audio/SfxPlayer.cs b/Assets/Darkmatter/Code/Services/Audio/Systems/SfxPlayer.cs similarity index 100% rename from Assets/Darkmatter/Code/Services/Audio/SfxPlayer.cs rename to Assets/Darkmatter/Code/Services/Audio/Systems/SfxPlayer.cs diff --git a/Assets/Darkmatter/Code/Services/Audio/SfxPlayer.cs.meta b/Assets/Darkmatter/Code/Services/Audio/Systems/SfxPlayer.cs.meta similarity index 100% rename from Assets/Darkmatter/Code/Services/Audio/SfxPlayer.cs.meta rename to Assets/Darkmatter/Code/Services/Audio/Systems/SfxPlayer.cs.meta diff --git a/Assets/Darkmatter/Code/Services/Scenes/Installers.meta b/Assets/Darkmatter/Code/Services/Scenes/Installers.meta new file mode 100644 index 0000000..dcd2262 --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Scenes/Installers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d37521fbeb9c48fd99ee8968c4ce1cf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Code/Services/Scenes/Installers/SceneServiceModule.cs b/Assets/Darkmatter/Code/Services/Scenes/Installers/SceneServiceModule.cs new file mode 100644 index 0000000..905c3ae --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Scenes/Installers/SceneServiceModule.cs @@ -0,0 +1,15 @@ +using Darkmatter.Core.Contracts.Services.Scenes; +using Darkmatter.Libs.Installers; +using UnityEngine; +using VContainer; + +namespace Darkmatter.Services.Scenes +{ + public class SceneServiceModule : MonoBehaviour, IModule + { + public void Register(IContainerBuilder builder) + { + builder.Register(Lifetime.Singleton); + } + } +} \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Services/Scenes/Installers/SceneServiceModule.cs.meta b/Assets/Darkmatter/Code/Services/Scenes/Installers/SceneServiceModule.cs.meta new file mode 100644 index 0000000..e9875a1 --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Scenes/Installers/SceneServiceModule.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ad17780c76afe4f33ac9f90931a18f76 \ No newline at end of file diff --git a/Assets/Darkmatter/Code/Services/Scenes/Services.Scenes.asmdef b/Assets/Darkmatter/Code/Services/Scenes/Services.Scenes.asmdef index 662c170..efd2e8c 100644 --- a/Assets/Darkmatter/Code/Services/Scenes/Services.Scenes.asmdef +++ b/Assets/Darkmatter/Code/Services/Scenes/Services.Scenes.asmdef @@ -6,7 +6,9 @@ "GUID:f51ebe6a0ceec4240a699833d6309b23", "GUID:593a5b492d29ac6448b1ebf7f035ef33", "GUID:9e24947de15b9834991c9d8411ea37cf", - "GUID:84651a3751eca9349aac36a66bba901b" + "GUID:84651a3751eca9349aac36a66bba901b", + "GUID:c1c03c0e5b2f4412b9f2be1c20d6a9b1", + "GUID:b0214a6008ed146ff8f122a6a9c2f6cc" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/Assets/Darkmatter/Code/Services/Scenes/Systems.meta b/Assets/Darkmatter/Code/Services/Scenes/Systems.meta new file mode 100644 index 0000000..df56fdd --- /dev/null +++ b/Assets/Darkmatter/Code/Services/Scenes/Systems.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa48eed4801294ccc8263b26b874dbb7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Code/Services/Scenes/SceneService.cs b/Assets/Darkmatter/Code/Services/Scenes/Systems/SceneService.cs similarity index 100% rename from Assets/Darkmatter/Code/Services/Scenes/SceneService.cs rename to Assets/Darkmatter/Code/Services/Scenes/Systems/SceneService.cs diff --git a/Assets/Darkmatter/Code/Services/Scenes/SceneService.cs.meta b/Assets/Darkmatter/Code/Services/Scenes/Systems/SceneService.cs.meta similarity index 100% rename from Assets/Darkmatter/Code/Services/Scenes/SceneService.cs.meta rename to Assets/Darkmatter/Code/Services/Scenes/Systems/SceneService.cs.meta diff --git a/Assets/Darkmatter/Data/Audio.meta b/Assets/Darkmatter/Data/Audio.meta new file mode 100644 index 0000000..d31d137 --- /dev/null +++ b/Assets/Darkmatter/Data/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 44f3782798fcc4e1f8cd9e4ff4722ece +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Data/Audio/SfxCatalog.asset b/Assets/Darkmatter/Data/Audio/SfxCatalog.asset new file mode 100644 index 0000000..efc0337 --- /dev/null +++ b/Assets/Darkmatter/Data/Audio/SfxCatalog.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8dc05770caf7f49e9a59dab81283a278, type: 3} + m_Name: SfxCatalog + m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Services.Audio.SfxCatalogSO + entries: [] diff --git a/Assets/Darkmatter/Data/Audio/SfxCatalog.asset.meta b/Assets/Darkmatter/Data/Audio/SfxCatalog.asset.meta new file mode 100644 index 0000000..b1602f4 --- /dev/null +++ b/Assets/Darkmatter/Data/Audio/SfxCatalog.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66f04dfcec18d453e8e15f3a2b02066d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Darkmatter/Scenes/Boot.unity b/Assets/Darkmatter/Scenes/Boot.unity index 7502b2c..2bc5310 100644 --- a/Assets/Darkmatter/Scenes/Boot.unity +++ b/Assets/Darkmatter/Scenes/Boot.unity @@ -376,6 +376,50 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &97140290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 97140292} + - component: {fileID: 97140291} + m_Layer: 0 + m_Name: SceneServiceModule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &97140291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 97140290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad17780c76afe4f33ac9f90931a18f76, type: 3} + m_Name: + m_EditorClassIdentifier: Services.Scenes::Darkmatter.Services.Scenes.SceneServiceModule +--- !u!4 &97140292 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 97140290} + 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!1 &109717500 GameObject: m_ObjectHideFlags: 0 @@ -480,12 +524,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 137105223} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -16.30939, y: -8.32207, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 274737044} + m_Father: {fileID: 1050564725} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &137105225 MonoBehaviour: @@ -571,39 +615,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 202998924} m_CullTransparentMesh: 1 ---- !u!1 &274737043 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 274737044} - m_Layer: 0 - m_Name: ServiceModule - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &274737044 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 274737043} - 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: - - {fileID: 292698384} - - {fileID: 137105224} - m_Father: {fileID: 329578012} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &292698383 GameObject: m_ObjectHideFlags: 0 @@ -630,11 +641,11 @@ Transform: m_GameObject: {fileID: 292698383} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 16.30939, y: 8.32207, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 274737044} + m_Father: {fileID: 1050564725} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &292698385 MonoBehaviour: @@ -651,61 +662,6 @@ MonoBehaviour: mainCamera: {fileID: 519420031} uiCamera: {fileID: 82022334} captureCamera: {fileID: 94039066} ---- !u!1 &329578011 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 329578012} - - component: {fileID: 329578013} - m_Layer: 0 - m_Name: GameLifetimeScope - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &329578012 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 329578011} - 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: - - {fileID: 274737044} - - {fileID: 1709100712} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &329578013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 329578011} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4ca410c053f074e1cba2f7041f500d34, type: 3} - m_Name: - m_EditorClassIdentifier: Darkmatter.App::GameLifetimeScope - parentReference: - TypeName: - autoRun: 1 - autoInjectGameObjects: [] - serviceModules: - - {fileID: 292698385} - - {fileID: 137105225} - - {fileID: 1043308347} - - {fileID: 610419920} --- !u!1 &445008005 GameObject: m_ObjectHideFlags: 0 @@ -914,12 +870,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610419918} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -16.30939, y: -8.32207, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1709100712} + m_Father: {fileID: 752713007} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &610419920 MonoBehaviour: @@ -963,6 +919,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 445008006} + - {fileID: 1043308346} + - {fileID: 610419919} m_Father: {fileID: 1798580248} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1043308345 @@ -990,12 +948,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1043308345} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -16.30939, y: -8.32207, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1709100712} + m_Father: {fileID: 752713007} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1043308347 MonoBehaviour: @@ -1038,7 +996,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 292698384} + - {fileID: 137105224} - {fileID: 1239449675} + - {fileID: 1776076871} + - {fileID: 97140292} m_Father: {fileID: 1798580248} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1239449674 @@ -1085,7 +1047,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f03c84255756e497f96c3baa7f6abe16, type: 3} m_Name: m_EditorClassIdentifier: Services.Gallery::Darkmatter.Services.Gallery.GalleryServiceModule ---- !u!1 &1709100711 +--- !u!1 &1776076870 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1093,31 +1055,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1709100712} + - component: {fileID: 1776076871} + - component: {fileID: 1776076872} m_Layer: 0 - m_Name: FeatureModules + m_Name: AudioServiceModule m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1709100712 +--- !u!4 &1776076871 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1709100711} + m_GameObject: {fileID: 1776076870} 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: - - {fileID: 1043308346} - - {fileID: 610419919} - m_Father: {fileID: 329578012} + m_Children: [] + m_Father: {fileID: 1050564725} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1776076872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1776076870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa11c3cff997e4a0a8263a29d804779f, type: 3} + m_Name: + m_EditorClassIdentifier: Services.Audio::Darkmatter.Services.Audio.AudioServiceModule + sfxCatalog: {fileID: 11400000, guid: 66f04dfcec18d453e8e15f3a2b02066d, type: 2} --- !u!1 &1798580247 GameObject: m_ObjectHideFlags: 0 @@ -1171,6 +1145,12 @@ MonoBehaviour: serviceModules: - {fileID: 445008007} - {fileID: 1239449676} + - {fileID: 292698385} + - {fileID: 137105225} + - {fileID: 1043308347} + - {fileID: 610419920} + - {fileID: 1776076872} + - {fileID: 97140291} --- !u!1 &1890425864 GameObject: m_ObjectHideFlags: 0 @@ -1396,7 +1376,6 @@ SceneRoots: - {fileID: 94039067} - {fileID: 82022335} - {fileID: 1798580248} - - {fileID: 329578012} - {fileID: 2122267605} - {fileID: 1890425865} - {fileID: 2133561498} diff --git a/Assets/Darkmatter/Scenes/GamePlay.unity b/Assets/Darkmatter/Scenes/GamePlay.unity index 103ff84..8652300 100644 --- a/Assets/Darkmatter/Scenes/GamePlay.unity +++ b/Assets/Darkmatter/Scenes/GamePlay.unity @@ -339,13 +339,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Darkmatter.App::Darkmatter.App.LifetimeScopes.GameplayLifetimescope parentReference: - TypeName: Darkmatter.App.LifetimeScopes.GameLifetimeScope + TypeName: Darkmatter.App.LifetimeScopes.RootLifetimeScope autoRun: 1 autoInjectGameObjects: [] serviceModules: - {fileID: 1046038184} - {fileID: 1551649429} - {fileID: 1991184380} + - {fileID: 1867428030} --- !u!1 &1551649427 GameObject: m_ObjectHideFlags: 0 @@ -391,6 +392,50 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Features.History::Darkmatter.Features.History.HistoryServiceModule historyButtonsView: {fileID: 0} +--- !u!1 &1867428028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1867428029} + - component: {fileID: 1867428030} + m_Layer: 0 + m_Name: ColoringFeatureModule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1867428029 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1867428028} + 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: 1965442263} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1867428030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1867428028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0dc926588daf4a139e807f48f664baf, type: 3} + m_Name: + m_EditorClassIdentifier: Features.Coloring::Darkmatter.Features.Coloring.ColoringFeatureModule --- !u!1 &1965442262 GameObject: m_ObjectHideFlags: 0 @@ -423,6 +468,7 @@ Transform: - {fileID: 1046038183} - {fileID: 1551649428} - {fileID: 1991184379} + - {fileID: 1867428029} m_Father: {fileID: 1224714932} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1991184378