diff --git a/.idea/.idea.Infra/.idea/workspace.xml b/.idea/.idea.Infra/.idea/workspace.xml index 33507f3..ac83830 100644 --- a/.idea/.idea.Infra/.idea/workspace.xml +++ b/.idea/.idea.Infra/.idea/workspace.xml @@ -5,18 +5,51 @@ + + + + + + + + - + + + + + + + + + + + + + - + + + + + + + + + - + + + + + + - + @@ -136,4 +170,62 @@ + + + + + file://$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/GameplayState.cs + 141 + + + + + + + + + file://$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/GameplayState.cs + 62 + + + + + + + + + file://$PROJECT_DIR$/Assets/Code/Infrastructure/App/States/MainMenuState.cs + 60 + + + + + + + + + file://$PROJECT_DIR$/Assets/Code/Example/Race/RaceGame.cs + 62 + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 2a1637f..321a0ed 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -125,6 +125,12 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 55ccf07d7c51c2a409a42ddcda3b3b30 + m_Address: Assets/Resources_moved/Configs/UI/WinScreen.asset + m_ReadOnly: 0 + m_SerializedLabels: + - UIPanelConfig + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 62388720cc90ef87f9d8ed5328dbc6fe m_Address: Assets/Resources_moved/Configs/Audio/AudioInfoConfig.asset m_ReadOnly: 0 @@ -308,6 +314,11 @@ MonoBehaviour: m_SerializedLabels: - SceneConfig FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: f60baf3e133aa2644a106742a1f2c2fb + m_Address: Assets/Resources_moved/Example/Race/WinScreen.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: f7cebe94899e9257497d042d1ec4fd76 m_Address: Assets/Resources_moved/Configs/Audio/Infos/UI/ButtonRollOver.asset m_ReadOnly: 0 diff --git a/Assets/Code/Debug/SceneChooser.cs b/Assets/Code/Debug/SceneChooser.cs index baf35de..4132942 100644 --- a/Assets/Code/Debug/SceneChooser.cs +++ b/Assets/Code/Debug/SceneChooser.cs @@ -1,8 +1,10 @@ +using System.Collections.Generic; using Code.Infrastructure.App; using Code.Infrastructure.SceneLoader; using Reflex.Attributes; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; namespace Code.Debug { @@ -12,7 +14,7 @@ namespace Code.Debug [Inject] private AppStateMachine _stateMachine; public void ChooseScene(int id) { - _sceneLoader.LoadSceneAsync((SceneId)id, LoadSceneMode.Single).Forget(); + _sceneLoader.LoadSceneAsync((SceneId)id, LoadSceneMode.Additive).Forget(); } public void ChooseState(int id) @@ -24,5 +26,12 @@ namespace Code.Debug { _stateMachine.SwitchState(AppStates.Gameplay).AllowStateTransition(AppStates.MainMenu); } + + [SerializeField] private List