diff --git a/.idea/.idea.Infratest/.idea/workspace.xml b/.idea/.idea.Infratest/.idea/workspace.xml
index d920911..9ab36de 100644
--- a/.idea/.idea.Infratest/.idea/workspace.xml
+++ b/.idea/.idea.Infratest/.idea/workspace.xml
@@ -5,85 +5,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
@@ -101,6 +48,7 @@
+
@@ -109,6 +57,7 @@
+
@@ -158,10 +107,6 @@
-
-
-
-
{
"customColor": "",
@@ -189,6 +134,16 @@
}
}
+
+
+
+
+
+
+
+
+
+
@@ -199,6 +154,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -222,6 +187,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -238,6 +231,9 @@
+
+
+
@@ -316,6 +312,7 @@
+
@@ -348,43 +345,30 @@
- file://$PROJECT_DIR$/Assets/Code/Infrastructure/Configs/LayerMasksConfig.cs
- 34
-
+ file://$PROJECT_DIR$/Assets/Code/Example/Platformer/PlatformerSceneInstaller.cs
+ 45
+
-
+
-
+
-
+
- file://$PROJECT_DIR$/Assets/Code/Infrastructure/Configs/LayerMasksConfig.cs
- 40
-
+ file://$PROJECT_DIR$/Assets/Code/Example/Platformer/PlatformerSceneInstaller.cs
+ 51
+
-
+
-
+
-
-
-
- file://$PROJECT_DIR$/Assets/Code/Infrastructure/App/PapaInstaller.cs
- 209
-
-
-
-
-
-
-
-
-
+
diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
index 1b600b8..dbafeab 100644
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: d790534e015d692428ac5a9ce7d2ceb6
m_currentHash:
serializedVersion: 2
- Hash: 208aa87fbe30bd178e21e8742fefa5f7
+ Hash: ffc22690a01aea70596951aee1f02765
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0
@@ -42,6 +42,7 @@ MonoBehaviour:
m_BundleRedirectLimit: -1
m_SharedBundleSettings: 0
m_SharedBundleSettingsCustomGroupIndex: 0
+ m_simulatedLoadDelay: 0.1
m_ContiguousBundles: 1
m_StripUnityVersionFromBundleBuild: 0
m_DisableVisibleSubAssetRepresentations: 0
@@ -108,6 +109,7 @@ MonoBehaviour:
- AudioSettingsConfig
- RacerConfig
- LayerMaskConfig
+ - PlatformerEntity
m_SchemaTemplates: []
m_GroupTemplateObjects:
- {fileID: 11400000, guid: af0b5782a0090884db056705d7776701, type: 2}
diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
index fa80189..b48db4a 100644
--- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
@@ -15,11 +15,22 @@ MonoBehaviour:
m_GroupName: Default Local Group
m_GUID: d790534e015d692428ac5a9ce7d2ceb6
m_SerializeEntries:
+ - m_GUID: 00279b1c6fbb7ac80868388a292b0c44
+ m_Address: Assets/Resources_moved/Example/Platformer/Configs/Enemies/Snail.asset
+ m_ReadOnly: 0
+ m_SerializedLabels:
+ - PlatformerEntity
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0d2cf1d8a32701f56851c8b734cf7928
m_Address: Assets/Resources_moved/UI/Panels/PlayerCounter.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 0eb645a0c96b1c437bf0712d6b856b7c
+ m_Address: Assets/Resources_moved/Example/Platformer/Bee.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0f5388dd5b953e74281733a43c9bca5a
m_Address: Audio/UI/01. Wake Up, Get Up, Get Out There
m_ReadOnly: 0
@@ -193,6 +204,17 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 77a268730c52ad461920f3459fdda1a0
+ m_Address: Assets/Resources_moved/Example/Platformer/Snail.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: 78f36de38978ecc0a9d9dff2ca9cf488
+ m_Address: Assets/Resources_moved/Example/Platformer/Configs/Enemies/Boar.asset
+ m_ReadOnly: 0
+ m_SerializedLabels:
+ - PlatformerEntity
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 7a5ae0cc826b85108aa9f0681d7f85cc
m_Address: Assets/Resources_moved/Example/Race/Configs/AIRed.asset
m_ReadOnly: 0
@@ -285,6 +307,11 @@ MonoBehaviour:
m_SerializedLabels:
- LayerMaskConfig
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: d0a994964f42e0c0dad3da32f7b52c90
+ m_Address: Assets/Resources_moved/Example/Platformer/Boar.prefab
+ m_ReadOnly: 0
+ m_SerializedLabels: []
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: d2750e654bd192d41a48144c43b41302
m_Address: Assets/Resources_moved/Configs/UI/Logo.asset
m_ReadOnly: 0
@@ -339,6 +366,12 @@ MonoBehaviour:
m_SerializedLabels:
- AudioSettingsConfig
FlaggedDuringContentUpdateRestriction: 0
+ - m_GUID: ef1b55458defd6ca99e4006b21b9cb02
+ m_Address: Assets/Resources_moved/Example/Platformer/Configs/Enemies/Bee.asset
+ m_ReadOnly: 0
+ m_SerializedLabels:
+ - PlatformerEntity
+ FlaggedDuringContentUpdateRestriction: 0
- m_GUID: f5d189d2c8569c2489fe942137ea0f24
m_Address: Assets/Resources_moved/Camera/CinemachineCamera.prefab
m_ReadOnly: 0
diff --git a/Assets/Code/Example/Platformer/Entity/PlatformerEnemyFactory.cs b/Assets/Code/Example/Platformer/Entity/PlatformerEnemyFactory.cs
index 06e8ae8..57b4cf8 100644
--- a/Assets/Code/Example/Platformer/Entity/PlatformerEnemyFactory.cs
+++ b/Assets/Code/Example/Platformer/Entity/PlatformerEnemyFactory.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using Code.Infrastructure.Configs;
using Code.Infrastructure.EventBus;
-using Code.Infrastructure.Generators;
using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.AddressableAssets;
@@ -11,40 +10,24 @@ using UnityEngine.ResourceManagement.AsyncOperations;
namespace Code.Example.Platformer.Entity
{
- [Config("Configs/Gameplay/Platformer/EntitySettings", true)]
- public class PlatformerEntitySettings
+ public interface IPlatformerEnemyFactory
{
- [ToConfig] public PlatformerEntityData EntityData;
+ UniTaskVoid LoadEnemy(PlatformerEntityType enemyType);
+ void ReleaseEnemy(PlatformerEntityType racerType);
- [ToConfig] public AssetReference prefabReference;
+ UniTaskVoid SpawnEnemy(
+ PlatformerEntityType enemyType,
+ Vector3 position);
}
- [Serializable]
- public struct PlatformerEntityData
- {
- public string name;
- public float speed;
- public float acceleration;
- public int damage;
- public PlatformerEntityType type;
- public int maxHealth;
- }
-
- public enum PlatformerEntityType
- {
- Player,
- Boar,
- Bee,
- Snail
- }
- public class PlatformerEnemyFactory
+ public class PlatformerEnemyFactory : IPlatformerEnemyFactory, IDisposable
{
private EventBus _eventBus;
-
+
private string _enemyConfigsLabel;
private AsyncOperationHandle> _enemyConfigsHandle;
private Dictionary> _enemyPrefabsHandle = new();
-
+
private Dictionary _enemyConfigs;
public PlatformerEnemyFactory(IConfigLocator configLocator, EventBus eventBus)
@@ -52,62 +35,75 @@ namespace Code.Example.Platformer.Entity
_eventBus = eventBus;
_enemyConfigsLabel = configLocator.TryGetManyConfigAssetReferences();
- LoadConfigs().Forget();
+ LoadConfigs().Forget();
}
-
+
private async UniTaskVoid LoadConfigs()
{
_enemyConfigsHandle = Addressables.LoadAssetsAsync(_enemyConfigsLabel);
await _enemyConfigsHandle.ToUniTask();
- _enemyConfigs = _enemyConfigsHandle.Result.ToDictionary(x => x.racerData.type);
+ _enemyConfigs = _enemyConfigsHandle.Result.ToDictionary(x => x.EntityData.type);
_enemyConfigs.Remove(PlatformerEntityType.Player);
-
- _eventBus.RaiseEvent(x => x.PlatformerFactoryInitialized());
+
+ _eventBus.RaiseEvent(x => x.PlatformerEnemyFactoryInitialized());
}
- public async UniTaskVoid LoadRacer(PlatformerEntityType racerType)
+ public async UniTaskVoid LoadEnemy(PlatformerEntityType enemyType)
{
- if (racerType == PlatformerEntityType.Player) return;
-
- if (_enemyPrefabsHandle.ContainsKey(racerType))
+ if (enemyType == PlatformerEntityType.Player) return;
+
+ if (_enemyPrefabsHandle.ContainsKey(enemyType))
{
- _eventBus.RaiseEvent(x => x.PlatformerEnemyLoaded(racerType, null));
+ _eventBus.RaiseEvent(x => x.PlatformerEnemyLoaded(enemyType, null));
return;
- }
- UnityEngine.Debug.LogWarning($"Racer loaded {racerType}");
- _enemyPrefabsHandle.Add(racerType,
- Addressables.LoadAssetAsync(_enemyConfigs[racerType].prefabReference));
-
- await _enemyPrefabsHandle[racerType].ToUniTask();
- var racer = _enemyPrefabsHandle[racerType].Result.GetComponent();
- racer.SetData(_enemyConfigs[racerType].racerData);
-
- _eventBus.RaiseEvent(x => x.PlatformerEnemyLoaded(racerType, racer));
+ }
+
+ UnityEngine.Debug.LogWarning($"Enemy loaded {enemyType}");
+ _enemyPrefabsHandle.Add(enemyType,
+ Addressables.LoadAssetAsync(_enemyConfigs[enemyType].prefabReference));
+
+ await _enemyPrefabsHandle[enemyType].ToUniTask();
+ var racer = _enemyPrefabsHandle[enemyType].Result.GetComponent();
+ racer.SetData(_enemyConfigs[enemyType].EntityData);
+
+ _eventBus.RaiseEvent(x => x.PlatformerEnemyLoaded(enemyType, racer));
}
- public void ReleaseRacer(PlatformerEntityType racerType)
+ public void ReleaseEnemy(PlatformerEntityType racerType)
{
_enemyPrefabsHandle[racerType].Release();
_enemyPrefabsHandle.Remove(racerType);
}
+ public async UniTaskVoid SpawnEnemy(
+ PlatformerEntityType enemyType,
+ Vector3 position)
+ {
+ if (enemyType == PlatformerEntityType.Player) return;
+
+ await Addressables.InstantiateAsync(_enemyConfigs[enemyType].prefabReference, position, Quaternion.identity);
+ }
+
public void Dispose()
{
- UnityEngine.Debug.LogWarning($"Racers released");
- foreach (var prefab in _enemyPrefabsHandle)
+ UnityEngine.Debug.LogWarning($"Enemies released");
+ foreach (var prefab in _enemyPrefabsHandle)
prefab.Value.Release();
+
_enemyPrefabsHandle.Clear();
-
+
_enemyConfigsHandle.Release();
}
}
- public interface IPlatformerFactoryInitializedHandle : IGlobalSubscriber
+
+ public interface IPlatformerEnemyFactoryInitializedHandle : IGlobalSubscriber
{
- public void PlatformerFactoryInitialized();
+ public void PlatformerEnemyFactoryInitialized();
}
+
public interface IPlatformerEnemyLoadedHandle : IGlobalSubscriber
{
public void PlatformerEnemyLoaded(PlatformerEntityType type, Entity entity);
diff --git a/Assets/Code/Example/Platformer/Entity/PlatformerEntitySettings.cs b/Assets/Code/Example/Platformer/Entity/PlatformerEntitySettings.cs
new file mode 100644
index 0000000..fd0d932
--- /dev/null
+++ b/Assets/Code/Example/Platformer/Entity/PlatformerEntitySettings.cs
@@ -0,0 +1,41 @@
+using System;
+using Code.Infrastructure.Generators;
+using UnityEngine.AddressableAssets;
+
+namespace Code.Example.Platformer.Entity
+{
+
+ [Serializable]
+ public struct PlatformerEntityData
+ {
+ public string name;
+ public float speed;
+ public float acceleration;
+ public int damage;
+ public PlatformerEntityType type;
+ public int maxHealth;
+ }
+
+ public enum PlatformerEntityType
+ {
+ Player,
+ Boar,
+ Bee,
+ Snail
+ }
+ [Config("Configs/Gameplay/Platformer/EntitySettings", true)]
+ public class PlatformerEntitySettings
+ {
+ [ToConfig] public PlatformerEntityData EntityData;
+
+ [ToConfig] public AssetReference prefabReference;
+ }
+
+ [Config("Configs/Gameplay/Platformer/PlayerSettings")]
+ public class PlatformerPlayerSettings
+ {
+ [ToConfig] public PlatformerEntityData EntityData;
+
+ [ToConfig] public AssetReference prefabReference;
+ }
+}
\ No newline at end of file
diff --git a/Assets/Code/Example/Platformer/Entity/PlatformerEntitySettings.cs.meta b/Assets/Code/Example/Platformer/Entity/PlatformerEntitySettings.cs.meta
new file mode 100644
index 0000000..90e36a8
--- /dev/null
+++ b/Assets/Code/Example/Platformer/Entity/PlatformerEntitySettings.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6116fb7cbe9c49a9863b83f85375096a
+timeCreated: 1773066580
\ No newline at end of file
diff --git a/Assets/Code/Example/Platformer/Level.meta b/Assets/Code/Example/Platformer/Level.meta
new file mode 100644
index 0000000..1aa1be4
--- /dev/null
+++ b/Assets/Code/Example/Platformer/Level.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 50745373fe25451191a647170efe16d9
+timeCreated: 1773067033
\ No newline at end of file
diff --git a/Assets/Code/Example/Platformer/Level/PlatformerLevelData.cs b/Assets/Code/Example/Platformer/Level/PlatformerLevelData.cs
new file mode 100644
index 0000000..070f3e8
--- /dev/null
+++ b/Assets/Code/Example/Platformer/Level/PlatformerLevelData.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Code.Example.Platformer.Level
+{
+ [Serializable]
+ public struct PlatformerFirstLevelData
+ {
+ [SerializeField] public List enemySpawnPoints;
+ [SerializeField] public List playerCheckPoints;
+ }
+}
\ No newline at end of file
diff --git a/Assets/Code/Example/Platformer/Level/PlatformerLevelData.cs.meta b/Assets/Code/Example/Platformer/Level/PlatformerLevelData.cs.meta
new file mode 100644
index 0000000..7bc389d
--- /dev/null
+++ b/Assets/Code/Example/Platformer/Level/PlatformerLevelData.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 23a7f57640a141dc866ceb89058c2f71
+timeCreated: 1773067046
\ No newline at end of file
diff --git a/Assets/Code/Example/Platformer/PlatformerSceneInstaller.cs b/Assets/Code/Example/Platformer/PlatformerSceneInstaller.cs
index 5e659d8..90323dd 100644
--- a/Assets/Code/Example/Platformer/PlatformerSceneInstaller.cs
+++ b/Assets/Code/Example/Platformer/PlatformerSceneInstaller.cs
@@ -1,28 +1,55 @@
+using System;
+using Code.Example.Platformer.Entity;
+using Code.Example.Platformer.Level;
using Code.Infrastructure.EventBus;
+using Code.Infrastructure.Loadings;
using Code.Infrastructure.SceneLoader;
using Reflex.Core;
+using Reflex.Enums;
using UnityEngine;
+using Resolution = Reflex.Enums.Resolution;
namespace Code.Example.Platformer
{
- public class PlatformerSceneInstaller : MonoBehaviour, IInstaller
+ public class PlatformerEnemySceneInstaller : MonoBehaviour, IInstaller, IPlatformerEnemyFactoryInitializedHandle
{
// [SerializeField] private PlatformerCanvas gameplayPlatformerCanvas;
+ [SerializeField] private PlatformerFirstLevelData firstLevelData;
- public void InstallBindings(ContainerBuilder containerBuilder)
+ private Loading _sceneInit;
+
+ private void LoadingComplete()
{
- // containerBuilder.RegisterValue(gameplayPlatformerCanvas);
-
- containerBuilder.OnContainerBuilt += OnContainerBuild;
+ _container.Resolve()
+ .RaiseEvent(x => x.OnPlatformerSceneInitialized(_container));
}
+ public void InstallBindings(ContainerBuilder containerBuilder)
+ {
+ // Enemies
+ // Container
+ _sceneInit = new(2, LoadingComplete);
+
+ // containerBuilder.RegisterValue(gameplayPlatformerCanvas);
+ containerBuilder.Parent.Resolve().Subscribe(this);
+
+ containerBuilder.RegisterValue(firstLevelData);
+ containerBuilder.RegisterType(typeof(PlatformerEnemyFactory), new []{typeof(IPlatformerEnemyFactory)}, Lifetime.Scoped, Resolution.Eager);
+ containerBuilder.OnContainerBuilt += OnContainerBuild;
+ }
+ private Container _container;
private void OnContainerBuild(Container container)
{
// gameplayPlatformerCanvas.GameplayPlatformerCanvas.worldCamera =
// container.Resolve().cameraLoadedData.Camera;
- //
- container.Resolve()
- .RaiseEvent(x => x.OnPlatformerSceneInitialized(container));
+
+ _container = container;
+ _sceneInit.DoProgress();
+ }
+
+ public void PlatformerEnemyFactoryInitialized()
+ {
+ _sceneInit.DoProgress();
}
}
}
\ No newline at end of file
diff --git a/Assets/Code/Example/Platformer/PlatformerState.cs b/Assets/Code/Example/Platformer/PlatformerState.cs
index 94097e2..f4b38d3 100644
--- a/Assets/Code/Example/Platformer/PlatformerState.cs
+++ b/Assets/Code/Example/Platformer/PlatformerState.cs
@@ -1,3 +1,5 @@
+using Code.Example.Platformer.Entity;
+using Code.Example.Platformer.Level;
using Code.Infrastructure.App;
using Code.Infrastructure.Audio;
using Code.Infrastructure.Camera;
@@ -15,7 +17,7 @@ namespace Code.Example.Platformer
{
[State(typeof(AppStates),typeof(AppStateMachineContext))]
[StateRaisingEvent]
- public partial class PlatformerState : IOnPlatformerSceneLoadedHandler, ICinematicMachineHandle
+ public partial class PlatformerState : IOnPlatformerSceneLoadedHandler, ICinematicMachineHandle, IPlatformerEnemyLoadedHandle
{
public PlatformerState(AppStateMachineContext context, EventBus eventBus) : base(context, eventBus)
{
@@ -26,7 +28,12 @@ namespace Code.Example.Platformer
{
EventBus.Subscribe(this);
- _loading = new(2, LoadingCompleted);
+ // Scene
+ // Camera
+ // Enemy snail
+ // Enemy bee
+ // Enemy boar
+ _loading = new(5, LoadingCompleted);
Context.UIService.OpenPanel(UIPanelType.Loading);
Context.SceneLoader.LoadSceneAsync(SceneId.Platformer, LoadSceneMode.Single).Forget();
@@ -39,14 +46,20 @@ namespace Code.Example.Platformer
{
Context.AudioService.CancelMusic(AudioNames.UISounds,0);
Context.UIService.ClosePanel(UIPanelType.Loading);
+
+ _enemyFactory.SpawnEnemy(PlatformerEntityType.Snail, _firstLevelData.enemySpawnPoints[0].position);
}
protected override void OnExitState()
- {
+ {
+ _enemyFactory.ReleaseEnemy(PlatformerEntityType.Bee);
+ _enemyFactory.ReleaseEnemy(PlatformerEntityType.Snail);
+ _enemyFactory.ReleaseEnemy(PlatformerEntityType.Boar);
+
Context.CameraFactory.ReleaseCinemachineCamera(CameraMode.Platformer);
- Context.InputService.DisableMap(ActionMappings.Platformer);
EventBus.Unsubscribe(this);
+ Context.InputService.DisableMap(ActionMappings.Platformer);
}
public void OnPlatformerSceneLoaded()
@@ -54,14 +67,30 @@ namespace Code.Example.Platformer
}
+ private IPlatformerEnemyFactory _enemyFactory;
+ private PlatformerFirstLevelData _firstLevelData;
public void OnPlatformerSceneInitialized(Container container)
{
+ _firstLevelData = container.Resolve();
+ _enemyFactory = container.Resolve();
+
+ _enemyFactory.LoadEnemy(PlatformerEntityType.Bee);
+ _enemyFactory.LoadEnemy(PlatformerEntityType.Boar);
+ _enemyFactory.LoadEnemy(PlatformerEntityType.Snail);
+
_loading.DoProgress();
}
+
+
public void CinemachineLoaded(CinemachineCamera cinemachineCamera)
{
_loading.DoProgress();
}
+
+ public void PlatformerEnemyLoaded(PlatformerEntityType type, Entity.Entity entity)
+ {
+ if(entity) _loading.DoProgress();
+ }
}
}
\ No newline at end of file
diff --git a/Assets/Code/Infrastructure/Configs/ConfigLocator.cs b/Assets/Code/Infrastructure/Configs/ConfigLocator.cs
index 83914e3..c356234 100644
--- a/Assets/Code/Infrastructure/Configs/ConfigLocator.cs
+++ b/Assets/Code/Infrastructure/Configs/ConfigLocator.cs
@@ -1,8 +1,5 @@
using System;
-using System.Collections.Generic;
-using Code.Infrastructure.SceneLoader;
-using Cysharp.Threading.Tasks;
-using Reflex.Core;
+using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AddressableAssets;
@@ -27,9 +24,7 @@ namespace Code.Infrastructure.Configs
private void LoadSystemConfigs()
{
- SystemConfigsReferences systemConfigsReferences = Resources.Load("SystemConfigsReferences");
-
- _singleConfigReferences.Add(typeof(ScenesAssetReferences), systemConfigsReferences.scenesAssetReferences);
+ Resources.Load("SystemConfigsReferences");
}
}
}
\ No newline at end of file
diff --git a/Assets/Code/Infrastructure/Configs/SystemConfigsReferences.cs b/Assets/Code/Infrastructure/Configs/SystemConfigsReferences.cs
index c8ee89f..e5d19ef 100644
--- a/Assets/Code/Infrastructure/Configs/SystemConfigsReferences.cs
+++ b/Assets/Code/Infrastructure/Configs/SystemConfigsReferences.cs
@@ -6,6 +6,5 @@ namespace Code.Infrastructure.Configs
[CreateAssetMenu(fileName = "SystemConfigsReferences", menuName = "Configs/SystemConfigsReferences")]
public partial class SystemConfigsReferences : ScriptableObject
{
- public AssetReference scenesAssetReferences;
}
}
\ No newline at end of file
diff --git a/Assets/Resources/SystemConfigsReferences.asset b/Assets/Resources/SystemConfigsReferences.asset
index 5057df6..466bfe3 100644
--- a/Assets/Resources/SystemConfigsReferences.asset
+++ b/Assets/Resources/SystemConfigsReferences.asset
@@ -19,15 +19,18 @@ MonoBehaviour:
m_SubObjectGUID:
m_EditorAssetChanged: 0
AudioSourceSettings: AudioSettingsConfig
- LayerMasksConfig: LayerMaskConfig
- CanvasSettings:
- m_AssetGUID: 17c5e56eb6c99db40b6093c9d543bb4f
+ SceneInfo: SceneConfig
+ VolumeSettings: PostProccessVolume
+ InputService:
+ m_AssetGUID: eab71c0cf90c4b94294e497d3734cfe1
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
UIPanelSettings: UIPanelConfig
- SceneInfo: SceneConfig
+ PlatformerEnemySettings: PlatformerEntity
+ LayerMasksConfig: LayerMaskConfig
+ RacerSettings: RacerConfig
GameCamera:
m_AssetGUID: c42e39e2fb64cdd45b2ebc4b723d9d0c
m_SubObjectName:
@@ -35,18 +38,16 @@ MonoBehaviour:
m_SubObjectGUID:
m_EditorAssetChanged: 1
AudioInfo: AudioInfoConfig
- RacerSettings: RacerConfig
AudioSourcePrefab:
m_AssetGUID: d7dd69cfadda3d6e18ec390724be0d80
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 1
- VolumeSettings: PostProccessVolume
- CameraSettings: CameraConfig
- InputService:
- m_AssetGUID: eab71c0cf90c4b94294e497d3734cfe1
+ CanvasSettings:
+ m_AssetGUID: 17c5e56eb6c99db40b6093c9d543bb4f
m_SubObjectName:
m_SubObjectType:
m_SubObjectGUID:
m_EditorAssetChanged: 0
+ CameraSettings: CameraConfig
diff --git a/Assets/Resources_moved/Example/Platformer/Configs/Enemies.meta b/Assets/Resources_moved/Example/Platformer/Configs/Enemies.meta
new file mode 100644
index 0000000..7e08e45
--- /dev/null
+++ b/Assets/Resources_moved/Example/Platformer/Configs/Enemies.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d4c5da3fb6660d2c8b2ffd41a9128fe2
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Bee.asset b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Bee.asset
new file mode 100644
index 0000000..d55676b
--- /dev/null
+++ b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Bee.asset
@@ -0,0 +1,27 @@
+%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: c75c4d6c834f6bae6bef22279173f226, type: 3}
+ m_Name: Bee
+ m_EditorClassIdentifier: Assembly-CSharp::Code.Example.Platformer.Entity.PlatformerEntitySettingsConfig
+ racerData:
+ name: Bee
+ speed: 1
+ acceleration: 2
+ damage: 1
+ type: 2
+ maxHealth: 1
+ prefabReference:
+ m_AssetGUID: 0eb645a0c96b1c437bf0712d6b856b7c
+ m_SubObjectName:
+ m_SubObjectType:
+ m_SubObjectGUID:
+ m_EditorAssetChanged: 0
diff --git a/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Bee.asset.meta b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Bee.asset.meta
new file mode 100644
index 0000000..efe54b0
--- /dev/null
+++ b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Bee.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ef1b55458defd6ca99e4006b21b9cb02
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Boar.asset b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Boar.asset
new file mode 100644
index 0000000..2694cef
--- /dev/null
+++ b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Boar.asset
@@ -0,0 +1,27 @@
+%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: c75c4d6c834f6bae6bef22279173f226, type: 3}
+ m_Name: Boar
+ m_EditorClassIdentifier: Assembly-CSharp::Code.Example.Platformer.Entity.PlatformerEntitySettingsConfig
+ racerData:
+ name: Boar
+ speed: 0.5
+ acceleration: 2
+ damage: 1
+ type: 1
+ maxHealth: 2
+ prefabReference:
+ m_AssetGUID: d0a994964f42e0c0dad3da32f7b52c90
+ m_SubObjectName:
+ m_SubObjectType:
+ m_SubObjectGUID:
+ m_EditorAssetChanged: 0
diff --git a/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Boar.asset.meta b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Boar.asset.meta
new file mode 100644
index 0000000..f015775
--- /dev/null
+++ b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Boar.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 78f36de38978ecc0a9d9dff2ca9cf488
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Snail.asset b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Snail.asset
new file mode 100644
index 0000000..0191457
--- /dev/null
+++ b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Snail.asset
@@ -0,0 +1,27 @@
+%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: c75c4d6c834f6bae6bef22279173f226, type: 3}
+ m_Name: Snail
+ m_EditorClassIdentifier: Assembly-CSharp::Code.Example.Platformer.Entity.PlatformerEntitySettingsConfig
+ racerData:
+ name: Snaily
+ speed: 1
+ acceleration: 2
+ damage: 1
+ type: 3
+ maxHealth: 1
+ prefabReference:
+ m_AssetGUID: 77a268730c52ad461920f3459fdda1a0
+ m_SubObjectName:
+ m_SubObjectType:
+ m_SubObjectGUID:
+ m_EditorAssetChanged: 0
diff --git a/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Snail.asset.meta b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Snail.asset.meta
new file mode 100644
index 0000000..8483918
--- /dev/null
+++ b/Assets/Resources_moved/Example/Platformer/Configs/Enemies/Snail.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 00279b1c6fbb7ac80868388a292b0c44
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources_moved/Example/Platformer/Platformer.unity b/Assets/Resources_moved/Example/Platformer/Platformer.unity
index 428ca90..3dc00c6 100644
--- a/Assets/Resources_moved/Example/Platformer/Platformer.unity
+++ b/Assets/Resources_moved/Example/Platformer/Platformer.unity
@@ -176,6 +176,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0aa23aea61d74467889be39a550c9922, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Code.Example.Platformer.PlatformerSceneInstaller
+ firstLevelData:
+ enemySpawnPoints:
+ - {fileID: 591811690}
+ playerCheckPoints:
+ - {fileID: 0}
--- !u!1 &97537770
GameObject:
m_ObjectHideFlags: 0
@@ -483,6 +488,37 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
+--- !u!1 &591811689
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 591811690}
+ m_Layer: 0
+ m_Name: SpawnPoint (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &591811690
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 591811689}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 2.48, y: -0.05, 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 &595108273
GameObject:
m_ObjectHideFlags: 0
@@ -1389,189 +1425,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 234ab51636edcbab88dbadfdb7fbfe65, type: 3}
---- !u!1001 &3495612028810159075
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 3801642601722797476, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_Name
- value: Bee
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0.494
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4741199656111979734, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8386846360287835849, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: 'partolPoints.Array.data[0]'
- value:
- objectReference: {fileID: 97537771}
- - target: {fileID: 8386846360287835849, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
- propertyPath: 'partolPoints.Array.data[1]'
- value:
- objectReference: {fileID: 1369074043}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 0eb645a0c96b1c437bf0712d6b856b7c, type: 3}
---- !u!1001 &4401792132824091566
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalPosition.x
- value: -0.283
- objectReference: {fileID: 0}
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.414
- objectReference: {fileID: 0}
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2972276770558329035, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3564754929267664154, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
- propertyPath: m_Name
- value: Boar
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: d0a994964f42e0c0dad3da32f7b52c90, type: 3}
---- !u!1001 &7850265554012673606
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 2523079170963062473, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_Name
- value: Snail
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalPosition.x
- value: -0.346
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.306
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4330041015761084350, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6897803134956731688, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
- propertyPath: m_CollisionDetection
- value: 1
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 77a268730c52ad461920f3459fdda1a0, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -1580,8 +1433,6 @@ SceneRoots:
- {fileID: 1464509737}
- {fileID: 595108274}
- {fileID: 3315900791696923540}
- - {fileID: 4401792132824091566}
- - {fileID: 3495612028810159075}
- - {fileID: 7850265554012673606}
- {fileID: 97537771}
- {fileID: 1369074043}
+ - {fileID: 591811690}
diff --git a/Assets/Resources_moved/Example/Platformer/Snail.prefab b/Assets/Resources_moved/Example/Platformer/Snail.prefab
index df3a9cf..c9a4f46 100644
--- a/Assets/Resources_moved/Example/Platformer/Snail.prefab
+++ b/Assets/Resources_moved/Example/Platformer/Snail.prefab
@@ -166,7 +166,7 @@ Rigidbody2D:
m_Bits: 0
m_Interpolate: 0
m_SleepingMode: 1
- m_CollisionDetection: 0
+ m_CollisionDetection: 1
m_Constraints: 4
--- !u!95 &958628273609526838
Animator:
diff --git a/Assets/UnityCodeGen.Generated/Code.Example.Race.UI.PlayerScoreCounterEvents.Generated.cs b/Assets/UnityCodeGen.Generated/Code.Example.Race.UI.PlayerScoreCounterEvents.Generated.cs
index 2cc00d9..418907e 100644
--- a/Assets/UnityCodeGen.Generated/Code.Example.Race.UI.PlayerScoreCounterEvents.Generated.cs
+++ b/Assets/UnityCodeGen.Generated/Code.Example.Race.UI.PlayerScoreCounterEvents.Generated.cs
@@ -2,9 +2,9 @@
// retard-generated
+using Code.Infrastructure.UI;
using Code.Infrastructure.EventBus;
using Code.Infrastructure.StateMachine;
-using Code.Infrastructure.UI;
namespace Code.Example.Race.UI
{
diff --git a/Assets/UnityCodeGen.Generated/Code.Example.Race.UI.PlayerScoresEvents.Generated.cs b/Assets/UnityCodeGen.Generated/Code.Example.Race.UI.PlayerScoresEvents.Generated.cs
index f7eaa63..1f75965 100644
--- a/Assets/UnityCodeGen.Generated/Code.Example.Race.UI.PlayerScoresEvents.Generated.cs
+++ b/Assets/UnityCodeGen.Generated/Code.Example.Race.UI.PlayerScoresEvents.Generated.cs
@@ -2,9 +2,9 @@
// retard-generated
+using Code.Infrastructure.UI;
using Code.Infrastructure.EventBus;
using Code.Infrastructure.StateMachine;
-using Code.Infrastructure.UI;
namespace Code.Example.Race.UI
{
diff --git a/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LoadingPanelEvents.Generated.cs b/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LoadingPanelEvents.Generated.cs
index 04fe8e8..7407f68 100644
--- a/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LoadingPanelEvents.Generated.cs
+++ b/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LoadingPanelEvents.Generated.cs
@@ -2,6 +2,7 @@
// retard-generated
+using Code.Infrastructure.UI;
using Code.Infrastructure.EventBus;
using Code.Infrastructure.StateMachine;
diff --git a/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LogoPanelEvents.Generated.cs b/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LogoPanelEvents.Generated.cs
index 0003c70..aebbe66 100644
--- a/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LogoPanelEvents.Generated.cs
+++ b/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.LogoPanelEvents.Generated.cs
@@ -2,6 +2,7 @@
// retard-generated
+using Code.Infrastructure.UI;
using Code.Infrastructure.EventBus;
using Code.Infrastructure.StateMachine;
diff --git a/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.MenuChoosePanelEvents.Generated.cs b/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.MenuChoosePanelEvents.Generated.cs
index 0cbbd8c..83bbec4 100644
--- a/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.MenuChoosePanelEvents.Generated.cs
+++ b/Assets/UnityCodeGen.Generated/Code.Infrastructure.UI.Panels.MenuChoosePanelEvents.Generated.cs
@@ -2,6 +2,7 @@
// retard-generated
+using Code.Infrastructure.UI;
using Code.Infrastructure.EventBus;
using Code.Infrastructure.StateMachine;
diff --git a/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs b/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs
index f518479..04ca9e9 100644
--- a/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs
+++ b/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs
@@ -1,18 +1,19 @@
#pragma warning disable CS0105
using Code.Infrastructure.Audio;
-using Code.Infrastructure.SceneLoader;
-using Code.Infrastructure.Volume;
-using Code.Infrastructure.Input;
-using Code.Infrastructure.UI;
using Code.Example.Platformer.Entity;
-using Code.Infrastructure.Configs;
-using Code.Example.Race.Racer;
+using Code.Example.Platformer.Entity;
+using Code.Infrastructure.Volume;
using Code.Infrastructure.Camera;
+using Code.Infrastructure.UI;
+using Code.Example.Race.Racer;
+using Code.Infrastructure.Configs;
using Code.Infrastructure.Audio;
using Code.Infrastructure.Audio;
using Code.Infrastructure.UI;
+using Code.Infrastructure.SceneLoader;
using Code.Infrastructure.Camera;
+using Code.Infrastructure.Input;
using UnityEngine;
#pragma warning restore CS0105
@@ -26,32 +27,34 @@ using Code.Infrastructure.Camera;
{
SystemConfigsReferences systemConfigsReferences = Resources.Load("SystemConfigsReferences");
- _multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourceSettingsConfig), systemConfigsReferences.AudioSourceSettings);
+ _multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioInfoConfig), systemConfigsReferences.AudioInfo);
- _multipleConfigReferences.Add(typeof(Code.Infrastructure.SceneLoader.SceneInfoConfig), systemConfigsReferences.SceneInfo);
+ _multipleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerEntitySettingsConfig), systemConfigsReferences.PlatformerEntitySettings);
+
+ _singleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerPlayerSettingsConfig), systemConfigsReferences.PlatformerPlayerSettings);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Volume.VolumeSettingsConfig), systemConfigsReferences.VolumeSettings);
- _singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService);
+ _singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.UI.UIPanelSettingsConfig), systemConfigsReferences.UIPanelSettings);
- _multipleConfigReferences.Add(typeof(Code.Example.Platformer.Entity.PlatformerEntitySettingsConfig), systemConfigsReferences.PlatformerEnemySettings);
+ _multipleConfigReferences.Add(typeof(Code.Example.Race.Racer.RacerSettingsConfig), systemConfigsReferences.RacerSettings);
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Configs.LayerMasksConfigConfig), systemConfigsReferences.LayerMasksConfig);
- _multipleConfigReferences.Add(typeof(Code.Example.Race.Racer.RacerSettingsConfig), systemConfigsReferences.RacerSettings);
-
- _singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera);
-
- _multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioInfoConfig), systemConfigsReferences.AudioInfo);
+ _multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourceSettingsConfig), systemConfigsReferences.AudioSourceSettings);
_singleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourcePrefabConfig), systemConfigsReferences.AudioSourcePrefab);
_singleConfigReferences.Add(typeof(Code.Infrastructure.UI.CanvasSettingsConfig), systemConfigsReferences.CanvasSettings);
+ _multipleConfigReferences.Add(typeof(Code.Infrastructure.SceneLoader.SceneInfoConfig), systemConfigsReferences.SceneInfo);
+
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Camera.CameraSettingsConfig), systemConfigsReferences.CameraSettings);
+ _singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService);
+
//_singleConfigReferences.Add(typeof(ScenesAssetReferences), systemConfigsReferences.scenesAssetReferences);
}
}
diff --git a/Assets/UnityCodeGen.Generated/PlatformerEnemySettingsConfig.Generated.cs.meta b/Assets/UnityCodeGen.Generated/PlatformerEnemySettingsConfig.Generated.cs.meta
deleted file mode 100644
index f9ea6e6..0000000
--- a/Assets/UnityCodeGen.Generated/PlatformerEnemySettingsConfig.Generated.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: c75c4d6c834f6bae6bef22279173f226
\ No newline at end of file
diff --git a/Assets/UnityCodeGen.Generated/PlatformerEnemySettingsConfig.Generated.cs b/Assets/UnityCodeGen.Generated/PlatformerEntitySettingsConfig.Generated.cs
similarity index 66%
rename from Assets/UnityCodeGen.Generated/PlatformerEnemySettingsConfig.Generated.cs
rename to Assets/UnityCodeGen.Generated/PlatformerEntitySettingsConfig.Generated.cs
index 45be4a1..40f5811 100644
--- a/Assets/UnityCodeGen.Generated/PlatformerEnemySettingsConfig.Generated.cs
+++ b/Assets/UnityCodeGen.Generated/PlatformerEntitySettingsConfig.Generated.cs
@@ -8,10 +8,10 @@ using UnityEngine.AddressableAssets;
namespace Code.Example.Platformer.Entity{
#pragma warning restore CS0105
-[CreateAssetMenu(fileName = "PlatformerEnemySettingsConfig", menuName = "Configs/Gameplay/Platformer/EnemySettings")]
+[CreateAssetMenu(fileName = "PlatformerEntitySettingsConfig", menuName = "Configs/Gameplay/Platformer/EntitySettings")]
public class PlatformerEntitySettingsConfig : ScriptableObject
{
- public Code.Example.Platformer.Entity.PlatformerEntityData racerData;
+ public Code.Example.Platformer.Entity.PlatformerEntityData EntityData;
public UnityEngine.AddressableAssets.AssetReference prefabReference;
}
diff --git a/Assets/UnityCodeGen.Generated/PlatformerEntitySettingsConfig.Generated.cs.meta b/Assets/UnityCodeGen.Generated/PlatformerEntitySettingsConfig.Generated.cs.meta
new file mode 100644
index 0000000..902d793
--- /dev/null
+++ b/Assets/UnityCodeGen.Generated/PlatformerEntitySettingsConfig.Generated.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d9f34335a0d495815967b971fedf1519
\ No newline at end of file
diff --git a/Assets/UnityCodeGen.Generated/PlatformerPlayerSettingsConfig.Generated.cs b/Assets/UnityCodeGen.Generated/PlatformerPlayerSettingsConfig.Generated.cs
new file mode 100644
index 0000000..bb7aa2b
--- /dev/null
+++ b/Assets/UnityCodeGen.Generated/PlatformerPlayerSettingsConfig.Generated.cs
@@ -0,0 +1,18 @@
+
+#pragma warning disable CS0105
+using Code.Example.Platformer.Entity;
+using UnityEngine.AddressableAssets;
+
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+
+namespace Code.Example.Platformer.Entity{
+#pragma warning restore CS0105
+[CreateAssetMenu(fileName = "PlatformerPlayerSettingsConfig", menuName = "Configs/Gameplay/Platformer/PlayerSettings")]
+public class PlatformerPlayerSettingsConfig : ScriptableObject
+{
+ public Code.Example.Platformer.Entity.PlatformerEntityData EntityData;
+public UnityEngine.AddressableAssets.AssetReference prefabReference;
+
+}
+}
diff --git a/Assets/UnityCodeGen.Generated/PlatformerPlayerSettingsConfig.Generated.cs.meta b/Assets/UnityCodeGen.Generated/PlatformerPlayerSettingsConfig.Generated.cs.meta
new file mode 100644
index 0000000..cce1e1d
--- /dev/null
+++ b/Assets/UnityCodeGen.Generated/PlatformerPlayerSettingsConfig.Generated.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f80fb6365f0d881bf813d6d78850dc36
\ No newline at end of file
diff --git a/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs b/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs
index df31afb..7f69bd4 100644
--- a/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs
+++ b/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs
@@ -1,18 +1,19 @@
#pragma warning disable CS0105
using Code.Infrastructure.Audio;
-using Code.Infrastructure.SceneLoader;
-using Code.Infrastructure.Volume;
-using Code.Infrastructure.Input;
-using Code.Infrastructure.UI;
using Code.Example.Platformer.Entity;
-using Code.Infrastructure.Configs;
-using Code.Example.Race.Racer;
+using Code.Example.Platformer.Entity;
+using Code.Infrastructure.Volume;
using Code.Infrastructure.Camera;
+using Code.Infrastructure.UI;
+using Code.Example.Race.Racer;
+using Code.Infrastructure.Configs;
using Code.Infrastructure.Audio;
using Code.Infrastructure.Audio;
using Code.Infrastructure.UI;
+using Code.Infrastructure.SceneLoader;
using Code.Infrastructure.Camera;
+using Code.Infrastructure.Input;
using UnityEngine.AddressableAssets;
#pragma warning restore CS0105
@@ -20,19 +21,20 @@ using Code.Infrastructure.Camera;
namespace Code.Infrastructure.Configs{
public partial class SystemConfigsReferences
{
- public string AudioSourceSettings;
-public string SceneInfo;
+ public string AudioInfo;
+public string PlatformerEntitySettings;
+public AssetReference PlatformerPlayerSettings;
public string VolumeSettings;
-public AssetReference InputService;
-public string UIPanelSettings;
-public string PlatformerEnemySettings;
-public string LayerMasksConfig;
-public string RacerSettings;
public AssetReference GameCamera;
-public string AudioInfo;
+public string UIPanelSettings;
+public string RacerSettings;
+public string LayerMasksConfig;
+public string AudioSourceSettings;
public AssetReference AudioSourcePrefab;
public AssetReference CanvasSettings;
+public string SceneInfo;
public string CameraSettings;
+public AssetReference InputService;
}
}