Развитие гоночек

2026-02-06 10:30:50 +03:00
1 parent ec60c47652
commit b54083521f
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 0f74886b687d21842831d79d48f04eee
@@ -1,18 +1,16 @@

 #pragma warning disable CS0105 
 using UnityEngine.AddressableAssets;
-using UnityEngine.AddressableAssets;

 using UnityEngine;
 using UnityEngine.AddressableAssets;

 namespace Code.Infrastructure.Audio{
 #pragma warning restore CS0105 
-[CreateAssetMenu(fileName = "AudioServiceSettingsConfig", menuName = "Configs/Audio/AudioServiceSettings")]
-public class AudioServiceSettingsConfig : ScriptableObject
+[CreateAssetMenu(fileName = "AudioSourcePrefabConfig", menuName = "Configs/Audio/AudioSourceSettings")]
+public class AudioSourcePrefabConfig : ScriptableObject
 {
    public UnityEngine.AddressableAssets.AssetReference sourcePrefab;
-public UnityEngine.AddressableAssets.AssetReference mixerPrefab;

 }
 }
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ba4d0c0f70786a459b739ae33e66122a
@@ -19,15 +19,15 @@ public partial class AppStateMachine : AbstractStateMachine<Code.Infrastructure.
        public AppStateMachine(Code.Infrastructure.App.AppStateMachineContext context, EventBus.EventBus eventBus) : base(context)
        { 
            
-var stateMainMenuState = new MainMenuState(StateMachineContext,eventBus);
-States.Add(stateMainMenuState.myState, stateMainMenuState);
-
 var stateBootstrapState = new BootstrapState(StateMachineContext,eventBus);
 States.Add(stateBootstrapState.myState, stateBootstrapState);

 var stateGameplayState = new GameplayState(StateMachineContext,eventBus);
 States.Add(stateGameplayState.myState, stateGameplayState);

+var stateMainMenuState = new MainMenuState(StateMachineContext,eventBus);
+States.Add(stateMainMenuState.myState, stateMainMenuState);
+
        }

        protected override bool CheckTransitionAllowed(Code.Infrastructure.App.AppStates nextState) => AllowedStates.HasFlag(nextState);
@@ -3,6 +3,8 @@
 #pragma warning disable CS0105 
 using Code.Infrastructure.StateMachine;
 
+using Code.Infrastructure.Camera.CameraStates;
+ 
 using Code.Infrastructure.Camera.CameraStates;

 #pragma warning restore CS0105
@@ -18,6 +20,9 @@ public partial class CameraStateMachine : AbstractStateMachine<Code.Infrastructu
 var stateNoneCameraState = new NoneCameraState(StateMachineContext,eventBus);
 States.Add(stateNoneCameraState.myState, stateNoneCameraState);

+var stateThirdPersonState = new ThirdPersonState(StateMachineContext,eventBus);
+States.Add(stateThirdPersonState.myState, stateThirdPersonState);
+
        }

        protected override bool CheckTransitionAllowed(Code.Infrastructure.Camera.CameraMode nextState) => AllowedStates.HasFlag(nextState);
@@ -0,0 +1,13 @@
+
+
+// retard-generated
+
+using Code.Infrastructure.StateMachine;
+
+namespace Code.Infrastructure.Camera.CameraStates
+{
+    public partial class ThirdPersonState 
+    {
+        
+    }  
+}
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: cca43e7b0e8ac7282820b994acf3239b
@@ -1,15 +1,16 @@

 #pragma warning disable CS0105 
    using Code.Infrastructure.Camera;
-using Code.Infrastructure.Input;
-using Code.Infrastructure.Audio;
-using Code.Infrastructure.Volume;
-using Code.Infrastructure.UI;
-using Code.Infrastructure.UI;
-using Code.Infrastructure.Audio;
 using Code.Infrastructure.Camera;
+using Code.Infrastructure.UI;
 using Code.Infrastructure.SceneLoader;
+using Code.Infrastructure.Input;
+using Code.Infrastructure.Volume;
 using Code.Infrastructure.Audio;
+using Code.Example.Race.Racer;
+using Code.Infrastructure.Audio;
+using Code.Infrastructure.Audio;
+using Code.Infrastructure.UI;

    using UnityEngine;
 #pragma warning restore CS0105
@@ -23,26 +24,28 @@ using Code.Infrastructure.Audio;
                      {
                           SystemConfigsReferences systemConfigsReferences = Resources.Load<SystemConfigsReferences>("SystemConfigsReferences");
                           
+             _singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera);
+
             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Camera.CameraSettingsConfig), systemConfigsReferences.CameraSettings);

-             _singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService);
-
-             _singleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioServiceSettingsConfig), systemConfigsReferences.AudioServiceSettings);
-
-             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Volume.VolumeSettingsConfig), systemConfigsReferences.VolumeSettings);
-
             _multipleConfigReferences.Add(typeof(Code.Infrastructure.UI.UIPanelSettingsConfig), systemConfigsReferences.UIPanelSettings);

-             _singleConfigReferences.Add(typeof(Code.Infrastructure.UI.CanvasSettingsConfig), systemConfigsReferences.CanvasSettings);
+             _multipleConfigReferences.Add(typeof(Code.Infrastructure.SceneLoader.SceneInfoConfig), systemConfigsReferences.SceneInfo);
+
+             _singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService);
+
+             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Volume.VolumeSettingsConfig), systemConfigsReferences.VolumeSettings);

             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourceSettingsConfig), systemConfigsReferences.AudioSourceSettings);

-             _singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera);
-
-             _multipleConfigReferences.Add(typeof(Code.Infrastructure.SceneLoader.SceneInfoConfig), systemConfigsReferences.SceneInfo);
+             _multipleConfigReferences.Add(typeof(Code.Example.Race.Racer.RacerSettingsConfig), systemConfigsReferences.RacerSettings);

             _multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioInfoConfig), systemConfigsReferences.AudioInfo);

+             _singleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourcePrefabConfig), systemConfigsReferences.AudioSourcePrefab);
+
+             _singleConfigReferences.Add(typeof(Code.Infrastructure.UI.CanvasSettingsConfig), systemConfigsReferences.CanvasSettings);
+
                           //_singleConfigReferences.Add(typeof(ScenesAssetReferences), systemConfigsReferences.scenesAssetReferences);
                      }
                  }
@@ -0,0 +1,18 @@
+
+#pragma warning disable CS0105 
+using Code.Example.Race.Racer;
+using UnityEngine.AddressableAssets;
+
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+
+namespace Code.Example.Race.Racer{
+#pragma warning restore CS0105 
+[CreateAssetMenu(fileName = "RacerSettingsConfig", menuName = "Configs/Gameplay/RacerSettings")]
+public class RacerSettingsConfig : ScriptableObject
+{
+    public Code.Example.Race.Racer.RacerData racerData;
+public UnityEngine.AddressableAssets.AssetReference prefabReference;
+
+}
+}
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0bc65efb4c6c6c2838e6dc00bdc37ea9
@@ -25,16 +25,19 @@ partial void SetupScenesInfo(){
    public interface IOnMainMenuSceneLoadedHandler : IGlobalSubscriber
    {
        void OnMainMenuSceneLoaded();
+        void OnMainMenuSceneInitialized(Reflex.Core.Container container); // Until its fixed
    }

    public interface IOnGameplaySceneLoadedHandler : IGlobalSubscriber
    {
        void OnGameplaySceneLoaded();
+        void OnGameplaySceneInitialized(Reflex.Core.Container container); // Until its fixed
    }

    public interface IOnSoundTestSceneLoadedHandler : IGlobalSubscriber
    {
        void OnSoundTestSceneLoaded();
+        void OnSoundTestSceneInitialized(Reflex.Core.Container container); // Until its fixed
    }

 }
@@ -1,15 +1,16 @@

 #pragma warning disable CS0105 
    using Code.Infrastructure.Camera;
-using Code.Infrastructure.Input;
-using Code.Infrastructure.Audio;
-using Code.Infrastructure.Volume;
-using Code.Infrastructure.UI;
-using Code.Infrastructure.UI;
-using Code.Infrastructure.Audio;
 using Code.Infrastructure.Camera;
+using Code.Infrastructure.UI;
 using Code.Infrastructure.SceneLoader;
+using Code.Infrastructure.Input;
+using Code.Infrastructure.Volume;
 using Code.Infrastructure.Audio;
+using Code.Example.Race.Racer;
+using Code.Infrastructure.Audio;
+using Code.Infrastructure.Audio;
+using Code.Infrastructure.UI;

    using UnityEngine.AddressableAssets;
 #pragma warning restore CS0105
@@ -17,16 +18,17 @@ using Code.Infrastructure.Audio;
    namespace Code.Infrastructure.Configs{
    public partial class SystemConfigsReferences
    {
-        public string CameraSettings;
-public AssetReference InputService;
-public AssetReference AudioServiceSettings;
-public string VolumeSettings;
+        public AssetReference GameCamera;
+public string CameraSettings;
 public string UIPanelSettings;
-public AssetReference CanvasSettings;
-public string AudioSourceSettings;
-public AssetReference GameCamera;
 public string SceneInfo;
+public AssetReference InputService;
+public string VolumeSettings;
+public string AudioSourceSettings;
+public string RacerSettings;
 public string AudioInfo;
+public AssetReference AudioSourcePrefab;
+public AssetReference CanvasSettings;

    }
 }