Машина, камера, мотор
This commit is contained in:
1 parent
b54083521f
commit
a45223d0e7
48 files changed
+5507
-3735
No files matched your search
@@ -1,16 +1,7 @@
|
||||
|
||||
#pragma warning disable CS0105
|
||||
using System;
|
||||
using System;
|
||||
using System;
|
||||
using System;
|
||||
using System;
|
||||
using System;
|
||||
using System;
|
||||
using System;
|
||||
using System;
|
||||
using System;
|
||||
using System;
|
||||
using UnityEngine.AddressableAssets;
|
||||
using Code.Infrastructure.Camera;
|
||||
using UnityEngine;
|
||||
|
||||
@@ -22,17 +13,8 @@ namespace Code.Infrastructure.Camera{
|
||||
[CreateAssetMenu(fileName = "CameraSettingsConfig", menuName = "Configs/Camera/CameraSettings")]
|
||||
public class CameraSettingsConfig : ScriptableObject
|
||||
{
|
||||
public System.Single defaultDistance;
|
||||
public System.Single minDistance;
|
||||
public System.Single maxDistance;
|
||||
public System.Single distanceMovementSpeed;
|
||||
public System.Single rotationSpeed;
|
||||
public System.Single rotationSharpness;
|
||||
public System.Single followSharpness;
|
||||
public System.Single minVerticalAngle;
|
||||
public System.Single maxVerticalAngle;
|
||||
public System.Single defaultVerticalAngle;
|
||||
public System.Single fov;
|
||||
public System.Single fov;
|
||||
public UnityEngine.AddressableAssets.AssetReference cinemachineCamera;
|
||||
public Code.Infrastructure.Camera.CameraMode cameraMode;
|
||||
public UnityEngine.Vector3 defaultFollowPosition;
|
||||
|
||||
|
||||
@@ -22,12 +22,12 @@ public partial class AppStateMachine : AbstractStateMachine<Code.Infrastructure.
|
||||
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);
|
||||
|
||||
var stateGameplayState = new GameplayState(StateMachineContext,eventBus);
|
||||
States.Add(stateGameplayState.myState, stateGameplayState);
|
||||
|
||||
}
|
||||
|
||||
protected override bool CheckTransitionAllowed(Code.Infrastructure.App.AppStates nextState) => AllowedStates.HasFlag(nextState);
|
||||
|
||||
+3
-3
@@ -17,12 +17,12 @@ public partial class CameraStateMachine : AbstractStateMachine<Code.Infrastructu
|
||||
public CameraStateMachine(Code.Infrastructure.Camera.CameraStateMachineContext context, EventBus.EventBus eventBus) : base(context)
|
||||
{
|
||||
|
||||
var stateNoneCameraState = new NoneCameraState(StateMachineContext,eventBus);
|
||||
States.Add(stateNoneCameraState.myState, stateNoneCameraState);
|
||||
|
||||
var stateThirdPersonState = new ThirdPersonState(StateMachineContext,eventBus);
|
||||
States.Add(stateThirdPersonState.myState, stateThirdPersonState);
|
||||
|
||||
var stateNoneCameraState = new NoneCameraState(StateMachineContext,eventBus);
|
||||
States.Add(stateNoneCameraState.myState, stateNoneCameraState);
|
||||
|
||||
}
|
||||
|
||||
protected override bool CheckTransitionAllowed(Code.Infrastructure.Camera.CameraMode nextState) => AllowedStates.HasFlag(nextState);
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
|
||||
#pragma warning disable CS0105
|
||||
using Code.Infrastructure.Camera;
|
||||
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.UI;
|
||||
using Code.Infrastructure.Audio;
|
||||
using Code.Infrastructure.Audio;
|
||||
using Code.Infrastructure.UI;
|
||||
using Code.Infrastructure.SceneLoader;
|
||||
using Code.Infrastructure.Volume;
|
||||
using Code.Infrastructure.Camera;
|
||||
using Code.Infrastructure.Input;
|
||||
|
||||
using UnityEngine;
|
||||
#pragma warning restore CS0105
|
||||
@@ -26,25 +26,25 @@ using Code.Infrastructure.UI;
|
||||
|
||||
_singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera);
|
||||
|
||||
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Camera.CameraSettingsConfig), systemConfigsReferences.CameraSettings);
|
||||
|
||||
_multipleConfigReferences.Add(typeof(Code.Infrastructure.UI.UIPanelSettingsConfig), systemConfigsReferences.UIPanelSettings);
|
||||
|
||||
_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.Example.Race.Racer.RacerSettingsConfig), systemConfigsReferences.RacerSettings);
|
||||
|
||||
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Audio.AudioSourceSettingsConfig), systemConfigsReferences.AudioSourceSettings);
|
||||
|
||||
_multipleConfigReferences.Add(typeof(Code.Example.Race.Racer.RacerSettingsConfig), systemConfigsReferences.RacerSettings);
|
||||
_singleConfigReferences.Add(typeof(Code.Infrastructure.UI.CanvasSettingsConfig), systemConfigsReferences.CanvasSettings);
|
||||
|
||||
_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);
|
||||
_multipleConfigReferences.Add(typeof(Code.Infrastructure.UI.UIPanelSettingsConfig), systemConfigsReferences.UIPanelSettings);
|
||||
|
||||
_multipleConfigReferences.Add(typeof(Code.Infrastructure.SceneLoader.SceneInfoConfig), systemConfigsReferences.SceneInfo);
|
||||
|
||||
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Volume.VolumeSettingsConfig), systemConfigsReferences.VolumeSettings);
|
||||
|
||||
_multipleConfigReferences.Add(typeof(Code.Infrastructure.Camera.CameraSettingsConfig), systemConfigsReferences.CameraSettings);
|
||||
|
||||
_singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService);
|
||||
|
||||
//_singleConfigReferences.Add(typeof(ScenesAssetReferences), systemConfigsReferences.scenesAssetReferences);
|
||||
}
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
|
||||
#pragma warning disable CS0105
|
||||
using Code.Infrastructure.Camera;
|
||||
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.UI;
|
||||
using Code.Infrastructure.Audio;
|
||||
using Code.Infrastructure.Audio;
|
||||
using Code.Infrastructure.UI;
|
||||
using Code.Infrastructure.SceneLoader;
|
||||
using Code.Infrastructure.Volume;
|
||||
using Code.Infrastructure.Camera;
|
||||
using Code.Infrastructure.Input;
|
||||
|
||||
using UnityEngine.AddressableAssets;
|
||||
#pragma warning restore CS0105
|
||||
@@ -19,16 +19,16 @@ using Code.Infrastructure.UI;
|
||||
public partial class SystemConfigsReferences
|
||||
{
|
||||
public AssetReference GameCamera;
|
||||
public string CameraSettings;
|
||||
public string UIPanelSettings;
|
||||
public string SceneInfo;
|
||||
public AssetReference InputService;
|
||||
public string VolumeSettings;
|
||||
public string AudioSourceSettings;
|
||||
public string RacerSettings;
|
||||
public string AudioSourceSettings;
|
||||
public AssetReference CanvasSettings;
|
||||
public string AudioInfo;
|
||||
public AssetReference AudioSourcePrefab;
|
||||
public AssetReference CanvasSettings;
|
||||
public string UIPanelSettings;
|
||||
public string SceneInfo;
|
||||
public string VolumeSettings;
|
||||
public string CameraSettings;
|
||||
public AssetReference InputService;
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user