savya/Colorbook
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into work_branch

Browse Source 
# Conflicts:
#	Assets/Darkmatter/Code/Features/MainMenu/Mascot/MainmenuPresenter.cs
#	Assets/Darkmatter/Code/Features/MainMenu/Mascot/MainmenuPresenter.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/Mascot/MainmenuView.cs
#	Assets/Darkmatter/Code/Features/MainMenu/Mascot/MainmenuView.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuPresenter.cs
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuPresenter.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuView.cs
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuView.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuPresenter.cs
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuPresenter.cs.meta
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuView.cs
#	Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuView.cs.meta
This commit is contained in:
Mausham
2026-05-28 15:11:46 +05:45
parent 4064df19bc e96fefa642
commit 86bf52ced4
58 changed files with 910 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Darkmatter/Code/Core/Data/Signals/Features/AppBoot.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: e7d1320ac2ff4ba4ae4bff41efa01e29
timeCreated: 1779959661

3
Assets/Darkmatter/Code/Core/Data/Signals/Features/AppBoot/IntroCompletedSignal.cs Normal file
View File

@@ -0,0 +1,3 @@
namespace Darkmatter.Core.Data.Signals.Features.AppBoot;
public record struct IntroCompletedSignal();

3
Assets/Darkmatter/Code/Core/Data/Signals/Features/AppBoot/IntroCompletedSignal.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: a44d51add9914de6bc28b428e13aaecb
timeCreated: 1779959670

1
Assets/Darkmatter/Code/Features/AppBoot/Features.AppBoot.asmdef
View File

@@ -4,6 +4,7 @@
"references": [
"GUID:6a0a834eb41764f12ba55c3fb04a40cb",
"GUID:c1c03c0e5b2f4412b9f2be1c20d6a9b1",
"GUID:b4c9f7fbf1e144933a1797dc208ece5f",
"GUID:b0214a6008ed146ff8f122a6a9c2f6cc",
"GUID:f51ebe6a0ceec4240a699833d6309b23"
],

10
Assets/Darkmatter/Code/Features/AppBoot/Flow/AppBootFlow.cs
View File

@@ -1,8 +1,11 @@
using System.Threading;
using Cysharp.Threading.Tasks;
using Darkmatter.Core.Contracts.Features.Progression;
using Darkmatter.Core.Contracts.Services.Scenes;
using Darkmatter.Core.Data.Signals.Features.AppBoot;
using Darkmatter.Core.Enums.Services.Scenes;
using Darkmatter.Features.AppBoot.SceneRefs;
using Darkmatter.Libs.Observer;
using UnityEngine;
using UnityEngine.Video;
using VContainer.Unity;
@@ -13,11 +16,13 @@ namespace Darkmatter.Features.AppBoot.Flow
{
private readonly AppBootSceneRefs _sceneRefs;
private readonly ISceneService _sceneService;
private readonly IEventBus _eventBus;
public AppBootFlow(AppBootSceneRefs sceneRefs, ISceneService sceneService)
public AppBootFlow(AppBootSceneRefs sceneRefs, ISceneService sceneService, IEventBus eventBus)
{
_sceneRefs = sceneRefs;
_sceneService = sceneService;
_eventBus = eventBus;
}
public async UniTask StartAsync(CancellationToken cancellation = default)
@@ -33,7 +38,7 @@ namespace Darkmatter.Features.AppBoot.Flow
player.loopPointReached += OnDone;
player.Play();
await _sceneService.LoadSceneAsync(GameScene.MainMenu, null, cancellation);
await _sceneService.LoadSceneAsync(nameof(GameScene.MainMenu), null, cancellation);
await tcs.Task.AttachExternalCancellation(cancellation);
@@ -44,6 +49,7 @@ namespace Darkmatter.Features.AppBoot.Flow
if (_sceneRefs.IntroCanvas != null)
Object.Destroy(_sceneRefs.IntroCanvas.gameObject);
Object.Destroy(player.gameObject);
_eventBus.Publish(new IntroCompletedSignal());
}
}
}

6
Assets/Darkmatter/Code/Features/MainMenu/Installers/MainmenuFeatureModule.cs
View File

@@ -7,12 +7,12 @@ namespace Darkmatter.Features.Mainmenu
{
public class MainmenuFeatureModule: MonoBehaviour, IModule
{
[SerializeField] private MainmenuView mainmenuView;
[SerializeField] private MainMenuView mainMenuView;
public void Register(IContainerBuilder builder)
{
if(mainmenuView!= null)
if(mainMenuView!= null)
{
builder.RegisterEntryPoint<MainmenuPresenter>().WithParameter(mainmenuView);
builder.RegisterEntryPoint<MainMenuPresenter>().WithParameter(mainMenuView);
}
}
}

8
Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuPresenter.cs → Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuPresenter.cs
View File

@@ -5,12 +5,18 @@ using VContainer.Unity;
namespace Darkmatter.Features.Mainmenu
{
public class MainmenuPresenter : IStartable, IDisposable
public class MainMenuPresenter : IStartable, IDisposable
{
<<<<<<<< HEAD:Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuPresenter.cs
private readonly MainmenuView _view;
private readonly IEventBus _eventBus;
public MainmenuPresenter(MainmenuView view, IEventBus eventBus)
========
private readonly MainMenuView _view;
public MainMenuPresenter(MainMenuView view)
>>>>>>>> origin/main:Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuPresenter.cs
{
_view = view;
_eventBus = eventBus;

0
Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuPresenter.cs.meta → Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuPresenter.cs.meta
View File

2
Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuView.cs → Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuView.cs
View File

@@ -7,7 +7,7 @@ using UnityEngine.UI;
namespace Darkmatter.Features.Mainmenu
{
public class MainmenuView : MonoBehaviour
public class MainMenuView : MonoBehaviour
{
[Header("UI Elements")]
[SerializeField] private Button playBtn;

0
Assets/Darkmatter/Code/Features/MainMenu/UI/MainmenuView.cs.meta → Assets/Darkmatter/Code/Features/MainMenu/UI/MainMenuView.cs.meta
View File

2
Assets/Darkmatter/Content/Gameplay.meta → Assets/Darkmatter/Code/Libs/Observer/Installers.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 227c245961aab4de9b09eae4fe4a619c
guid: 56c469bea638b43dc96015d33d220a8f
folderAsset: yes
DefaultImporter:
externalObjects: {}

14
Assets/Darkmatter/Code/Libs/Observer/Installers/ObserverLibraryModule.cs Normal file
View File

@@ -0,0 +1,14 @@
using Darkmatter.Libs.Installers;
using UnityEngine;
using VContainer;
namespace Darkmatter.Libs.Observer
{
public class ObserverLibraryModule : MonoBehaviour, IModule
{
public void Register(IContainerBuilder builder)
{
builder.Register<IEventBus, EventBus>(Lifetime.Singleton);
}
}
}

2
Assets/Darkmatter/Code/Libs/Observer/Installers/ObserverLibraryModule.cs.meta Normal file
View File

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

3
Assets/Darkmatter/Code/Libs/Observer/Libs.Observer.asmdef
View File

@@ -2,7 +2,8 @@
"name": "Libs.Observer",
"rootNamespace": "Darkmatter.Libs.Observer",
"references": [
"VContainer"
"VContainer",
"Libs.Installers"
],
"includePlatforms": [],
"excludePlatforms": [],

8
Assets/Darkmatter/Code/Libs/Observer/Systems.meta Normal file
View File

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

0
Assets/Darkmatter/Code/Libs/Observer/EventBus.cs → Assets/Darkmatter/Code/Libs/Observer/Systems/EventBus.cs
View File

0
Assets/Darkmatter/Code/Libs/Observer/EventBus.cs.meta → Assets/Darkmatter/Code/Libs/Observer/Systems/EventBus.cs.meta
View File

0
Assets/Darkmatter/Code/Libs/Observer/IEventBus.cs → Assets/Darkmatter/Code/Libs/Observer/Systems/IEventBus.cs
View File

0
Assets/Darkmatter/Code/Libs/Observer/IEventBus.cs.meta → Assets/Darkmatter/Code/Libs/Observer/Systems/IEventBus.cs.meta
View File

80
Assets/Darkmatter/Scenes/Boot.unity
View File

@@ -707,6 +707,38 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Features.AppBoot::Darkmatter.Features.AppBoot.Installers.AppBootFeatureModule
sceneRefs: {fileID: 1890425866}
--- !u!1 &494156339
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 494156340}
m_Layer: 0
m_Name: LibraryModules
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &494156340
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 494156339}
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: 1740606685}
m_Father: {fileID: 1798580248}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &519420028
GameObject:
m_ObjectHideFlags: 0
@@ -1047,6 +1079,50 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f03c84255756e497f96c3baa7f6abe16, type: 3}
m_Name:
m_EditorClassIdentifier: Services.Gallery::Darkmatter.Services.Gallery.GalleryServiceModule
--- !u!1 &1740606684
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1740606685}
- component: {fileID: 1740606686}
m_Layer: 0
m_Name: ObserverLibraryModule
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1740606685
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1740606684}
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: 494156340}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1740606686
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1740606684}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: aa2c71d11c78f4c16a545758585358bf, type: 3}
m_Name:
m_EditorClassIdentifier: Libs.Observer::Darkmatter.Libs.Observer.ObserverLibraryModule
--- !u!1 &1776076870
GameObject:
m_ObjectHideFlags: 0
@@ -1124,6 +1200,7 @@ Transform:
m_Children:
- {fileID: 1050564725}
- {fileID: 752713007}
- {fileID: 494156340}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1798580249
@@ -1143,6 +1220,7 @@ MonoBehaviour:
autoRun: 1
autoInjectGameObjects: []
serviceModules:
- {fileID: 1740606686}
- {fileID: 445008007}
- {fileID: 1239449676}
- {fileID: 292698385}
@@ -1346,7 +1424,7 @@ Canvas:
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_SortingOrder: 1000
m_TargetDisplay: 0
--- !u!224 &2133561498
RectTransform: