From 86c9c126a64a33f63c6a0e3719b0375986536cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C5=A1a=20Ceviel?= <39222425+MrTorex@users.noreply.github.com> Date: Thu, 16 Oct 2025 22:06:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=B0=D0=BC=D0=B5=D1=80=D0=B0,=20=D0=BE?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B8=D0=BD?= =?UTF-8?q?=D0=BF=D1=83=D1=82=20=D0=BC=D0=B0=D0=BF=D1=8B=20=D0=B8=20=D0=B5?= =?UTF-8?q?=D1=89=D1=91=20=D1=87=D1=83=D1=82=D1=8C-=D1=87=D1=83=D1=82?= =?UTF-8?q?=D1=8C=20=D1=88=D1=82=D1=83=D0=BA=20=D0=B4=D0=BB=D1=8F=20=D1=82?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B0=20(=D0=B2=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=BA=D1=80=D0=B8=D0=BD=D0=B6=D0=BE=D0=B2=D1=83?= =?UTF-8?q?=D1=8E=20=D1=81=D1=86=D0=B5=D0=BD=D1=83,=20=D1=81=D1=82=D0=B5?= =?UTF-8?q?=D0=B9=D1=82=20=D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D1=8B=20=D0=B8=20?= =?UTF-8?q?=D0=B4=D1=80.)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Code/App/AppStates/MovementDevState.cs | 38 + .../App/AppStates/MovementDevState.cs.meta | 3 + .../Assets/Code/App/BootstrapInstaller.cs | 6 +- .../Assets/Code/App/StateMachine/AppState.cs | 4 +- .../Code/App/StateMachine/AppStateMachine.cs | 3 + Game/CourierOld/Assets/Code/Gameplay.meta | 4 +- .../Assets/Code/Gameplay/Player.meta | 3 + .../Assets/Code/Gameplay/Player/Player.cs | 34 + .../Code/Gameplay/Player/Player.cs.meta | 2 + .../Code/Gameplay/Player/PlayerCamera.cs | 128 +++ .../Code/Gameplay/Player/PlayerCamera.cs.meta | 3 + .../Assets/Code/Input/GameplayActions.cs | 3 + .../Assets/Code/Input/IInputService.cs | 6 +- .../Assets/Code/Input/InputService.cs | 53 +- .../CourierOld/Assets/Code/Scenes/SceneIds.cs | 4 +- .../Assets/Resources/Scenes/MovementDev.unity | 736 ++++++++++++++++++ .../Resources/Scenes/MovementDev.unity.meta | 7 + .../Input/InputSystem_Actions.inputactions | 35 +- .../ProjectSettings/EditorBuildSettings.asset | 3 + .../ProjectSettings/ProjectSettings.asset | 3 + 20 files changed, 1062 insertions(+), 16 deletions(-) create mode 100644 Game/CourierOld/Assets/Code/App/AppStates/MovementDevState.cs create mode 100644 Game/CourierOld/Assets/Code/App/AppStates/MovementDevState.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Player.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Player/Player.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Player/Player.cs.meta create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Player/PlayerCamera.cs create mode 100644 Game/CourierOld/Assets/Code/Gameplay/Player/PlayerCamera.cs.meta create mode 100644 Game/CourierOld/Assets/Resources/Scenes/MovementDev.unity create mode 100644 Game/CourierOld/Assets/Resources/Scenes/MovementDev.unity.meta diff --git a/Game/CourierOld/Assets/Code/App/AppStates/MovementDevState.cs b/Game/CourierOld/Assets/Code/App/AppStates/MovementDevState.cs new file mode 100644 index 0000000..2fed0a9 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/AppStates/MovementDevState.cs @@ -0,0 +1,38 @@ +using Code.App.StateMachine; +using Code.Input; +using Code.Scenes; +using Code.StateMachine; + +namespace Code.App.AppStates +{ + //TODO: поменяно для теста + public class MovementDevState: BaseState + { + public MovementDevState(AppStateMachineContext context) : base(context) + { + } + + public override void EnterState() + { + Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded); + Context.InputService.EnableMap(ActionMappings.Gameplay); + } + + private void SceneLoaded() + { + + base.EnterState(); + } + + public override void Tick() + { + } + + public override void ExitState() + { + Context.InputService.DisableMap(ActionMappings.Gameplay); + + base.ExitState(); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/AppStates/MovementDevState.cs.meta b/Game/CourierOld/Assets/Code/App/AppStates/MovementDevState.cs.meta new file mode 100644 index 0000000..701ac93 --- /dev/null +++ b/Game/CourierOld/Assets/Code/App/AppStates/MovementDevState.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 395d8d3979124f10897c28bae62b288a +timeCreated: 1760638654 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs index 7f87fb0..cf3e584 100644 --- a/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs +++ b/Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs @@ -51,10 +51,10 @@ namespace Code.App appStateMachine.Initialize(); AttributeInjector.Inject(appStateMachine.StateMachineContext, container); - + + // TODO: поменяно для теста appStateMachine - .SwitchState(AppState.MainMenu) - .AllowStateTransition(AppState.Gameplay); + .SwitchState(AppState.MovementDev); } } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs b/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs index 343ef3b..fdebce6 100644 --- a/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs +++ b/Game/CourierOld/Assets/Code/App/StateMachine/AppState.cs @@ -8,6 +8,8 @@ namespace Code.App.StateMachine Bootstrap = 1, MainMenu = 2, Gameplay = 4, - GameOver = 8 + GameOver = 8, + // TODO: поменяно для теста + MovementDev = 52 } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs index 566e990..8e29af7 100644 --- a/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs +++ b/Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs @@ -10,9 +10,12 @@ namespace Code.App.StateMachine States.Add(AppState.MainMenu, new MainMenuState(StateMachineContext)); States.Add(AppState.Gameplay, new GameplayState(StateMachineContext)); States.Add(AppState.GameOver, new GameOverState(StateMachineContext)); + //TODO: Для теста + States.Add(AppState.MovementDev, new MovementDevState(StateMachineContext)); AllowedStates |= AppState.MainMenu; AllowedStates |= AppState.Gameplay; + AllowedStates |= AppState.MovementDev; } protected override bool CheckTransitionAllowed(AppState nextState) => AllowedStates.HasFlag(nextState); diff --git a/Game/CourierOld/Assets/Code/Gameplay.meta b/Game/CourierOld/Assets/Code/Gameplay.meta index 9420e3c..642bd06 100644 --- a/Game/CourierOld/Assets/Code/Gameplay.meta +++ b/Game/CourierOld/Assets/Code/Gameplay.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: a8d4b5b0fbd947b093f98937d7b80f8e -timeCreated: 1760423477 \ No newline at end of file +guid: e4901b413afd4d7da914edf2a1e51f8f +timeCreated: 1760627936 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player.meta b/Game/CourierOld/Assets/Code/Gameplay/Player.meta new file mode 100644 index 0000000..a252be7 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Player.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f8a8f6d0b8744b4c981d87722e6bb7e8 +timeCreated: 1760627963 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player/Player.cs b/Game/CourierOld/Assets/Code/Gameplay/Player/Player.cs new file mode 100644 index 0000000..9f5e165 --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Player/Player.cs @@ -0,0 +1,34 @@ +using Code.Gameplay.Player; +using Code.Input; +using Reflex.Attributes; +using UnityEngine; + +public class Player : MonoBehaviour +{ + [SerializeField] + private PlayerCamera playerCamera; + [SerializeField] + private Transform cameraFollowPoint; + [Inject] private IInputService _inputService; + + private Vector3 _lookInputVector; + + private void Start() + { + playerCamera.SetFollowTransform(cameraFollowPoint); + } + + private void HandleCameraInput() + { + var lookInput = _inputService.LookInput; + var scrollInput = _inputService.ZoomInput; + + playerCamera.UpdateWithInput(Time.deltaTime, scrollInput, + new Vector3(lookInput.x, lookInput.y, 0)); + } + + private void LateUpdate() + { + HandleCameraInput(); + } +} diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player/Player.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Player/Player.cs.meta new file mode 100644 index 0000000..3cd409c --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Player/Player.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9f2cdbe59523ace7ab0d8dfc36b4eb02 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerCamera.cs b/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerCamera.cs new file mode 100644 index 0000000..736c4bb --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerCamera.cs @@ -0,0 +1,128 @@ +using System; +using UnityEngine; + +namespace Code.Gameplay.Player +{ + /* + * Скрипт, отвечающий за поведение камеры при передвижении + * Поддерживает как 3rd-person, так и 1st-person режимы камеры + * Реализует плавное следование за игроком, вращение и зум камеры + * + * Источник: Tvtig, https://www.youtube.com/watch?v=9ibpY64wBYM + */ + public class PlayerCamera : MonoBehaviour + { + [SerializeField] + private float + // Расстояния от игрока до камеры + defaultDistance = 6f, // Стандартное расстояние камеры от цели + minDistance = 3f, // Минимальное расстояние при зуме + maxDistance = 10f, // Максимальное расстояние при зуме + + // Скорость зума камеры + distanceMovementSpeed = 5f, // Множитель скорости изменения дистанции при зуме + + // Скорость интерполяции текущая -> целевая позиция зума + distanceMovementSharpness = 10000f, // Коэффициент плавности изменения дистанции (чем выше - тем резче) + + // Скорость поворота камеры + rotationSpeed = 1f, // Множитель скорости вращения камеры + + // Скорость интерполяции текущее -> целевое вращение + rotationSharpness = 10000f, // Коэффициент плавности вращения камеры (чем выше - тем резче) + + // Резкость следования камеры за целью + followSharpness = 10000f, // Коэффициент плавности следования за движущейся целью (чем выше - тем резче) + + // Углы наклона камеры + minVerticalAngle = -45f, // Минимальный угол наклона камеры (вниз) + maxVerticalAngle = 45f, // Максимальный угол наклона камеры (вверх) + defaultVerticalAngle = 10f; // Стандартный угол наклона камеры + + // Трансформ объекта, за которым следует камера (для 1st-person: уровень глаз) + private Transform _followTransform; + + // Позиция следования: текущая сглаженная позиция и горизонтальное направление камеры + private Vector3 _currentFollowPosition, _planarDirection; + + // Целевой вертикальный угол камеры (наклон вверх/вниз) + private float _targetVerticalAngle; + + // Текущая и целевая дистанция камеры от цели + private float _currentDistance, _targetDistance; + + // Инициализация камеры при создании + private void Awake() + { + _currentDistance = defaultDistance; + _targetDistance = _currentDistance; + _targetVerticalAngle = 0f; + _planarDirection = Vector3.forward; // Начальное направление - вперед по оси Z + } + + // Установка цели для следования камеры + public void SetFollowTransform(Transform t) + { + _followTransform = t; + _currentFollowPosition = t.position; + _planarDirection = t.forward; // Начальное направление совпадает с направлением цели + } + + // Валидация параметров в редакторе Unity + private void OnValidate() + { + // Обеспечиваем корректные значения дистанции и угла + defaultDistance = Mathf.Clamp(defaultDistance, minDistance, maxDistance); + defaultVerticalAngle = Mathf.Clamp(defaultVerticalAngle, minVerticalAngle, maxVerticalAngle); + } + + // Обработка вращения камеры на основе пользовательского ввода + private void HandleRotationInput(float deltaTime, Vector3 rotationInput, out Quaternion targetRotation) + { + // Вращение вокруг вертикальной оси (горизонтальный поворот) + var rotationFromInput = Quaternion.Euler(_followTransform.up * (rotationInput.x * rotationSpeed)); + _planarDirection = rotationFromInput * _planarDirection; + var planarRotation = Quaternion.LookRotation(_planarDirection, _followTransform.up); + + // Вращение вокруг горизонтальной оси (вертикальный наклон) + _targetVerticalAngle -= rotationInput.y * rotationSpeed; + _targetVerticalAngle = Math.Clamp(_targetVerticalAngle, minVerticalAngle, maxVerticalAngle); + var verticalRotation = Quaternion.Euler(_targetVerticalAngle, 0, 0); + + // Интерполяция к целевому вращению для плавности + targetRotation = Quaternion.Slerp(transform.rotation, planarRotation * verticalRotation, deltaTime * rotationSharpness); + + // Применение финального вращения + transform.rotation = targetRotation; + } + + // Обработка позиционирования камеры и зума + private void HandlePosition(float deltaTime, float zoomInput, Quaternion targetRotation) + { + // Обновление целевой дистанции на основе ввода зума + _targetDistance += zoomInput * distanceMovementSpeed; + _targetDistance = Mathf.Clamp(_targetDistance, minDistance, maxDistance); + + // Плавное следование за целью с использованием экспоненциального сглаживания + _currentFollowPosition = Vector3.Lerp(_currentFollowPosition, _followTransform.position, 1f - Mathf.Exp(-followSharpness * deltaTime)); + + // Вычисление целевой позиции камеры за вычетом дистанции по направлению взгляда + var targetPosition = _currentFollowPosition - targetRotation * Vector3.forward * _currentDistance; + + // Плавное изменение текущей дистанции к целевой + _currentDistance = Mathf.Lerp(_currentDistance, _targetDistance, 1f - Mathf.Exp(-distanceMovementSpeed * deltaTime)); + + // Установка финальной позиции камеры + transform.position = targetPosition; + } + + // Основной метод обновления камеры, вызываемый извне каждый кадр + public void UpdateWithInput(float deltaTime, float zoomInput, Vector3 rotationInput) + { + // Проверка наличия цели для следования + if (!_followTransform) return; + HandleRotationInput(deltaTime, rotationInput, out Quaternion targetRotation); + HandlePosition(deltaTime, zoomInput, targetRotation); + } + } +} \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerCamera.cs.meta b/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerCamera.cs.meta new file mode 100644 index 0000000..e57386e --- /dev/null +++ b/Game/CourierOld/Assets/Code/Gameplay/Player/PlayerCamera.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f1d98e6c5419411098391c07861e627e +timeCreated: 1760627986 \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/GameplayActions.cs b/Game/CourierOld/Assets/Code/Input/GameplayActions.cs index cdbb3ed..9697340 100644 --- a/Game/CourierOld/Assets/Code/Input/GameplayActions.cs +++ b/Game/CourierOld/Assets/Code/Input/GameplayActions.cs @@ -2,5 +2,8 @@ namespace Code.Input { public enum GameplayActions { + Move, + Look, + Zoom } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/IInputService.cs b/Game/CourierOld/Assets/Code/Input/IInputService.cs index 49f0e78..7ae3dc5 100644 --- a/Game/CourierOld/Assets/Code/Input/IInputService.cs +++ b/Game/CourierOld/Assets/Code/Input/IInputService.cs @@ -1,5 +1,4 @@ -using System; -using UnityEngine.InputSystem; +using UnityEngine; namespace Code.Input { @@ -7,5 +6,8 @@ namespace Code.Input { void EnableMap(ActionMappings actionMap); void DisableMap(ActionMappings actionMap); + + Vector2 LookInput { get; } + float ZoomInput { get; } } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Input/InputService.cs b/Game/CourierOld/Assets/Code/Input/InputService.cs index 2589f22..1c59396 100644 --- a/Game/CourierOld/Assets/Code/Input/InputService.cs +++ b/Game/CourierOld/Assets/Code/Input/InputService.cs @@ -9,6 +9,49 @@ namespace Code.Input { private InputActionAsset _inputActionAsset; + + // Для работы с камерой + public Vector2 LookInput { get; private set; } + public float ZoomInput { get; private set; } + + public InputService(InputActionAsset inputActionAsset) + { + _inputActionAsset = inputActionAsset; + SetupInputCallbacks(); + } + + private void SetupInputCallbacks() + { + var gameplayMap = _inputActionAsset.FindActionMap("Gameplay"); + + var lookAction = gameplayMap.FindAction("Look"); + lookAction.performed += OnLookPerformed; + lookAction.canceled += OnLookCanceled; + + var zoomAction = gameplayMap.FindAction("Zoom"); + zoomAction.performed += OnZoomPerformed; + zoomAction.canceled += OnZoomCanceled; + } + + private void OnLookPerformed(InputAction.CallbackContext context) + { + LookInput = context.ReadValue(); + } + + private void OnLookCanceled(InputAction.CallbackContext context) + { + LookInput = Vector2.zero; + } + + private void OnZoomPerformed(InputAction.CallbackContext context) + { + ZoomInput = context.ReadValue(); + } + + private void OnZoomCanceled(InputAction.CallbackContext context) + { + ZoomInput = 0f; + } public void EnableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Enable(); public void DisableMap(ActionMappings actionMap) => _inputActionAsset.actionMaps[(int)actionMap].Disable(); @@ -20,13 +63,13 @@ namespace Code.Input _inputActionAsset .actionMaps[mapId].actions[actionId].performed -= action; - public InputService(InputActionAsset inputActionAsset) - { - _inputActionAsset = inputActionAsset; - } - public void Dispose() { + var gameplayMap = _inputActionAsset.FindActionMap("Gameplay"); + gameplayMap.FindAction("Look").performed -= OnLookPerformed; + gameplayMap.FindAction("Look").canceled -= OnLookCanceled; + gameplayMap.FindAction("Zoom").performed -= OnZoomPerformed; + gameplayMap.FindAction("Zoom").canceled -= OnZoomCanceled; } } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs b/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs index ac3b0d9..e9c9a8d 100644 --- a/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs +++ b/Game/CourierOld/Assets/Code/Scenes/SceneIds.cs @@ -4,6 +4,8 @@ namespace Code.Scenes { Initial, MainMenu, - Gameplay + Gameplay, + // TODO: поменяно для теста + MovementDev } } \ No newline at end of file diff --git a/Game/CourierOld/Assets/Resources/Scenes/MovementDev.unity b/Game/CourierOld/Assets/Resources/Scenes/MovementDev.unity new file mode 100644 index 0000000..9e9b820 --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Scenes/MovementDev.unity @@ -0,0 +1,736 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 10 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &55880351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 55880352} + - component: {fileID: 55880355} + - component: {fileID: 55880354} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &55880352 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55880351} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.4, y: 0.4, z: 0} + m_LocalScale: {x: 0.5, y: 0.2, z: 0.4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1533098598} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &55880354 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55880351} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &55880355 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55880351} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &338454659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 338454662} + - component: {fileID: 338454661} + - component: {fileID: 338454660} + - component: {fileID: 338454663} + - component: {fileID: 338454664} + m_Layer: 0 + m_Name: PlayerCamera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &338454660 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338454659} + m_Enabled: 1 +--- !u!20 &338454661 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338454659} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &338454662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338454659} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + 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!114 &338454663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338454659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!114 &338454664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338454659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1d98e6c5419411098391c07861e627e, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Gameplay.Player.PlayerCamera + defaultDistance: 6 + minDistance: 6 + maxDistance: 10 + distanceMovementSpeed: 5 + distanceMovementSharpness: 10000 + rotationSpeed: 1 + rotationSharpness: 10000 + followSharpness: 10000 + minVerticalAngle: -45 + maxVerticalAngle: 45 + defaultVerticalAngle: 10 +--- !u!1 &453575297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 453575298} + m_Layer: 0 + m_Name: CameraTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &453575298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453575297} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.644, y: 1.395, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1696686254} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &481156066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 481156070} + - component: {fileID: 481156069} + - component: {fileID: 481156068} + - component: {fileID: 481156067} + m_Layer: 0 + m_Name: Ground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!64 &481156067 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481156066} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &481156068 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481156066} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &481156069 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481156066} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &481156070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 481156066} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &678700801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 678700802} + m_Layer: 0 + m_Name: Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &678700802 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 678700801} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1533098598} + m_Father: {fileID: 1696686254} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1533098597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1533098598} + - component: {fileID: 1533098600} + - component: {fileID: 1533098599} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1533098598 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533098597} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 55880352} + m_Father: {fileID: 678700802} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1533098599 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533098597} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1533098600 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1533098597} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1696686253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1696686254} + - component: {fileID: 1696686255} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1696686254 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696686253} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 678700802} + - {fileID: 453575298} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1696686255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696686253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9f2cdbe59523ace7ab0d8dfc36b4eb02, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Player + playerCamera: {fileID: 338454664} + cameraFollowPoint: {fileID: 453575298} +--- !u!1 &1959874989 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1959874991} + - component: {fileID: 1959874990} + m_Layer: 0 + m_Name: SceneScope + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1959874990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1959874989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fd1482e4a9dee141aecc5bcd0a4f0f3, type: 3} + m_Name: + m_EditorClassIdentifier: Reflex::Reflex.Core.SceneScope +--- !u!4 &1959874991 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1959874989} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, 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!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 338454662} + - {fileID: 1959874991} + - {fileID: 1696686254} + - {fileID: 481156070} diff --git a/Game/CourierOld/Assets/Resources/Scenes/MovementDev.unity.meta b/Game/CourierOld/Assets/Resources/Scenes/MovementDev.unity.meta new file mode 100644 index 0000000..731746d --- /dev/null +++ b/Game/CourierOld/Assets/Resources/Scenes/MovementDev.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: de5b9a1ae6b033560b88d00b149b86bd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/CourierOld/Assets/Settings/Input/InputSystem_Actions.inputactions b/Game/CourierOld/Assets/Settings/Input/InputSystem_Actions.inputactions index 95c9647..0042ac9 100644 --- a/Game/CourierOld/Assets/Settings/Input/InputSystem_Actions.inputactions +++ b/Game/CourierOld/Assets/Settings/Input/InputSystem_Actions.inputactions @@ -546,11 +546,20 @@ "interactions": "", "initialStateCheck": true }, + { + "name": "Zoom", + "type": "Value", + "id": "6a7a1c09-c0f8-4ffe-94e0-3dc5e9e279d4", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, { "name": "Attack", "type": "Button", "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false @@ -559,7 +568,7 @@ "name": "Interact", "type": "Button", "id": "852140f2-7766-474d-8707-702459ba45f3", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "Hold", "initialStateCheck": false @@ -776,6 +785,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "f8ca1921-4be2-4067-8199-ffea9bcefeee", + "path": "/delta", + "interactions": "", + "processors": "", + "groups": "", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", @@ -995,6 +1015,17 @@ "action": "Crouch", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "00080d14-7d66-4e81-9fe8-9c3c9a0bb647", + "path": "/scroll/y", + "interactions": "", + "processors": "", + "groups": "", + "action": "Zoom", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Game/CourierOld/ProjectSettings/EditorBuildSettings.asset b/Game/CourierOld/ProjectSettings/EditorBuildSettings.asset index 65b057f..05103b7 100644 --- a/Game/CourierOld/ProjectSettings/EditorBuildSettings.asset +++ b/Game/CourierOld/ProjectSettings/EditorBuildSettings.asset @@ -14,5 +14,8 @@ EditorBuildSettings: - enabled: 1 path: Assets/Resources/Scenes/Gameplay.unity guid: 59150559bf28464b5a553799889b9b80 + - enabled: 1 + path: Assets/Resources/Scenes/MovementDev.unity + guid: de5b9a1ae6b033560b88d00b149b86bd m_configObjects: {} m_UseUCBPForAssetBundles: 0 diff --git a/Game/CourierOld/ProjectSettings/ProjectSettings.asset b/Game/CourierOld/ProjectSettings/ProjectSettings.asset index 230ac23..5e1ea44 100644 --- a/Game/CourierOld/ProjectSettings/ProjectSettings.asset +++ b/Game/CourierOld/ProjectSettings/ProjectSettings.asset @@ -532,6 +532,9 @@ PlayerSettings: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 m_Automatic: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_APIs: 1500000011000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0