diff --git a/.idea/.idea.Infratest/.idea/workspace.xml b/.idea/.idea.Infratest/.idea/workspace.xml
index d6a86a3..1d6f04f 100644
--- a/.idea/.idea.Infratest/.idea/workspace.xml
+++ b/.idea/.idea.Infratest/.idea/workspace.xml
@@ -5,130 +5,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
@@ -145,17 +32,13 @@
-
-
-
-
-
+
@@ -173,7 +56,7 @@
"Attach to Unity Editor.Attach to Unity Editor.executor": "Debug",
"RunOnceActivity.ShowReadmeOnStart": "true",
"XThreadsFramesViewSplitterKey": "0.31173185",
- "git-widget-placeholder": "main",
+ "git-widget-placeholder": "NotLiminalOne",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -209,10 +92,10 @@
-
+
-
+
+
+ file://$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraFactory.cs
+ 50
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/Assets/Code/Infrastructure/Camera/CameraFactory.cs
+ 35
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/Code/Infrastructure/App/PapaInstaller.cs b/Assets/Code/Infrastructure/App/PapaInstaller.cs
index b428a45..120bdda 100644
--- a/Assets/Code/Infrastructure/App/PapaInstaller.cs
+++ b/Assets/Code/Infrastructure/App/PapaInstaller.cs
@@ -4,7 +4,9 @@ using Code.Infrastructure.Input;
using Code.Infrastructure.Loadings;
using Code.Infrastructure.SceneLoader;
using Reflex.Core;
+using Reflex.Enums;
using UnityEngine;
+using Resolution = Reflex.Enums.Resolution;
namespace Code.Infrastructure.App
{
@@ -12,19 +14,19 @@ namespace Code.Infrastructure.App
{
public void InstallBindings(ContainerBuilder containerBuilder)
{
- containerBuilder.AddSingleton(typeof(EventBus.EventBus));
- containerBuilder.AddSingleton(typeof(ConfigLocator), typeof(IConfigLocator));
- containerBuilder.AddSingleton(typeof(SceneLoader.SceneLoader));
- containerBuilder.AddSingleton(typeof(InputService),typeof(IInputService));
+ containerBuilder.RegisterType(typeof(EventBus.EventBus), Lifetime.Singleton, Resolution.Eager);
+ containerBuilder.RegisterType(typeof(ConfigLocator), new[] { typeof(IConfigLocator) }, Lifetime.Singleton, Resolution.Eager);
+ containerBuilder.RegisterType(typeof(SceneLoader.SceneLoader), Lifetime.Singleton, Resolution.Eager);
+ containerBuilder.RegisterType(typeof(InputService),new[] { typeof(IInputService) }, Lifetime.Singleton, Resolution.Eager);
containerBuilder.OnContainerBuilt += Bootstrap;
- containerBuilder.AddSingleton(typeof(AppStateMachine));
- containerBuilder.AddSingleton(typeof(AppStateMachineContext));
+ containerBuilder.RegisterType(typeof(AppStateMachine), Lifetime.Singleton, Resolution.Lazy);
+ containerBuilder.RegisterType(typeof(AppStateMachineContext), Lifetime.Singleton, Resolution.Lazy);
- containerBuilder.AddSingleton(typeof(CameraFactory));
- containerBuilder.AddSingleton(typeof(CameraStateMachine));
- containerBuilder.AddSingleton(typeof(CameraStateMachineContext));
+ containerBuilder.RegisterType(typeof(CameraFactory), Lifetime.Singleton, Resolution.Lazy);
+ containerBuilder.RegisterType(typeof(CameraStateMachine), Lifetime.Singleton, Resolution.Lazy);
+ containerBuilder.RegisterType(typeof(CameraStateMachineContext), Lifetime.Singleton, Resolution.Lazy);
}
@@ -35,8 +37,8 @@ namespace Code.Infrastructure.App
_thatRightContainer = container;
container.Resolve().Subscribe(this);
- container.Resolve();
- container.Resolve();
+ // container.Resolve();
+ // container.Resolve();
container.Resolve().CreateCameraStateMachine(container.Resolve()).Forget();
initialLoading = new Loading(3, () => EssentialLoadEnded(container));
diff --git a/Assets/Code/Infrastructure/EventBus/EventBus.cs b/Assets/Code/Infrastructure/EventBus/EventBus.cs
index 6405360..c126c14 100644
--- a/Assets/Code/Infrastructure/EventBus/EventBus.cs
+++ b/Assets/Code/Infrastructure/EventBus/EventBus.cs
@@ -52,8 +52,7 @@ namespace Code.Infrastructure.EventBus
where TSubscriber : class, IGlobalSubscriber
{
for ( int i = 0; i < subscribers.List.Count; i++)
- {
- Debug.Log("Invoking " + typeof(TSubscriber).Name);
+ {
IGlobalSubscriber subscriber = subscribers.List[i];
try
{
diff --git a/Assets/Resources/ProjectScope.prefab b/Assets/Resources/ProjectScope.prefab
index 1481bf5..fcae571 100644
--- a/Assets/Resources/ProjectScope.prefab
+++ b/Assets/Resources/ProjectScope.prefab
@@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8739486317792213346}
- - component: {fileID: 5606446440374662551}
- component: {fileID: 82607719754315564}
+ - component: {fileID: -2867823150533533373}
m_Layer: 0
m_Name: ProjectScope
m_TagString: Untagged
@@ -33,18 +33,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5606446440374662551
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6025525265571595293}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 238ee66aa2bafad47bf60938e98aebca, type: 3}
- m_Name:
- m_EditorClassIdentifier: Reflex::Reflex.Core.ProjectScope
--- !u!114 &82607719754315564
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -57,3 +45,15 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e62d9c9e01334727887a684e008440a6, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.App.PapaInstaller
+--- !u!114 &-2867823150533533373
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6025525265571595293}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5312032623c34414a54ea00e35a7eb8e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Reflex::Reflex.Core.ContainerScope
diff --git a/Assets/Resources/ReflexSettings.asset b/Assets/Resources/ReflexSettings.asset
index c4e4cef..9dc3809 100644
--- a/Assets/Resources/ReflexSettings.asset
+++ b/Assets/Resources/ReflexSettings.asset
@@ -13,5 +13,5 @@ MonoBehaviour:
m_Name: ReflexSettings
m_EditorClassIdentifier: Reflex::Reflex.Configuration.ReflexSettings
k__BackingField: 0
- k__BackingField:
- - {fileID: 5606446440374662551, guid: ec0f7695b6246ec4e859d78a70c50a8f, type: 3}
+ k__BackingField:
+ - {fileID: -2867823150533533373, guid: ec0f7695b6246ec4e859d78a70c50a8f, type: 3}
diff --git a/Assets/Scenes/Bootstrap.unity b/Assets/Scenes/Bootstrap.unity
index cb762da..a0fb0c1 100644
--- a/Assets/Scenes/Bootstrap.unity
+++ b/Assets/Scenes/Bootstrap.unity
@@ -128,8 +128,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 60958143}
- - component: {fileID: 60958142}
- component: {fileID: 60958144}
+ - component: {fileID: 60958145}
m_Layer: 0
m_Name: SceneScope
m_TagString: Untagged
@@ -137,18 +137,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!114 &60958142
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 60958141}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3}
- m_Name:
- m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope
--- !u!4 &60958143
Transform:
m_ObjectHideFlags: 0
@@ -176,6 +164,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 067978788f51445ca3af5381eafec386, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.App.SceneInstallers.MainMenuSceneInstaller
+--- !u!114 &60958145
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 60958141}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5312032623c34414a54ea00e35a7eb8e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Reflex::Reflex.Core.ContainerScope
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity
index 1680355..a0edcc0 100644
--- a/Assets/Scenes/Gameplay.unity
+++ b/Assets/Scenes/Gameplay.unity
@@ -185,8 +185,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 871625794}
- - component: {fileID: 871625793}
- component: {fileID: 871625795}
+ - component: {fileID: 871625796}
m_Layer: 0
m_Name: SceneScope
m_TagString: Untagged
@@ -194,18 +194,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!114 &871625793
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 871625792}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3}
- m_Name:
- m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope
--- !u!4 &871625794
Transform:
m_ObjectHideFlags: 0
@@ -233,6 +221,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab7d8da1f0cc44bf99ae978a6b75847a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.App.SceneInstallers.GameplaySceneInstaller
+--- !u!114 &871625796
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 871625792}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5312032623c34414a54ea00e35a7eb8e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier: Reflex::Reflex.Core.ContainerScope
--- !u!1 &892968103 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6371182735212572944, guid: 24906af39c56b6841a50573dc0da37ef, type: 3}
diff --git a/Packages/manifest.json b/Packages/manifest.json
index f1a2e99..4900b7b 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -2,7 +2,7 @@
"dependencies": {
"com.annulusgames.unity-codegen": "https://github.com/AnnulusGames/UnityCodeGen.git?path=/Assets/UnityCodeGen",
"com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
- "com.gustavopsantos.reflex": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#13.0.3",
+ "com.gustavopsantos.reflex": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#14.0.0",
"com.unity.2d.sprite": "1.0.0",
"com.unity.addressables": "2.7.6",
"com.unity.ai.navigation": "2.0.9",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 40df5d8..b23c4dd 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -15,11 +15,11 @@
"hash": "73a63b7f672b88f7e9992f6917eb458a8cbb6fa9"
},
"com.gustavopsantos.reflex": {
- "version": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#13.0.3",
+ "version": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#14.0.0",
"depth": 0,
"source": "git",
"dependencies": {},
- "hash": "3d382e6e1d479380685887ef0c7a7a5492911b99"
+ "hash": "7860febed99b82ca2dc273ca621c13965dc497a2"
},
"com.unity.2d.sprite": {
"version": "1.0.0",