From b974bbd843b1daabe0063c3e0bf5e607e95791c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C5=A1a=20Ceviel?= Date: Tue, 27 Jan 2026 11:01:59 +0300 Subject: [PATCH] finalizing main menu + DI container --- Assets/{Resources => }/Code.meta | 0 Assets/Code/DI.meta | 3 + Assets/Code/DI/Bootstrapper.cs | 18 + Assets/Code/DI/Bootstrapper.cs.meta | 3 + Assets/Code/DI/DIContainer.cs | 35 + Assets/Code/DI/DIContainer.cs.meta | 3 + Assets/Code/Input.meta | 3 + Assets/Code/Input/ActionMapping.cs | 9 + Assets/Code/Input/ActionMapping.cs.meta | 3 + Assets/Code/Input/IInputService.cs | 22 + Assets/Code/Input/IInputService.cs.meta | 3 + Assets/Code/Input/InputService.cs | 81 +++ Assets/Code/Input/InputService.cs.meta | 3 + Assets/{Resources => }/Code/UI.meta | 0 Assets/Code/UI/MainMenuController.cs | 162 +++++ .../Code/UI/MainMenuController.cs.meta | 0 Assets/Resources/Audio.meta | 8 + Assets/Resources/Audio/Music.meta | 8 + Assets/Resources/Audio/Music/MainMenu.wav | 3 + .../Resources/Audio/Music/MainMenu.wav.meta | 23 + .../Resources/Code/UI/MainMenuController.cs | 22 - Assets/Resources/Scenes/Gameplay.unity | 316 ++++++++ Assets/Resources/Scenes/Gameplay.unity.meta | 7 + Assets/Resources/Scenes/MainMenu.unity | 678 +++++++++++++++++- Assets/Resources/Sprites/button.png | 3 - Assets/Resources/Sprites/buttons.png | 3 + .../{button.png.meta => buttons.png.meta} | 81 ++- .../Input/InputSystem_Actions.inputactions | 369 +--------- Packages/manifest.json | 4 +- Packages/packages-lock.json | 4 +- 30 files changed, 1478 insertions(+), 399 deletions(-) rename Assets/{Resources => }/Code.meta (100%) create mode 100644 Assets/Code/DI.meta create mode 100644 Assets/Code/DI/Bootstrapper.cs create mode 100644 Assets/Code/DI/Bootstrapper.cs.meta create mode 100644 Assets/Code/DI/DIContainer.cs create mode 100644 Assets/Code/DI/DIContainer.cs.meta create mode 100644 Assets/Code/Input.meta create mode 100644 Assets/Code/Input/ActionMapping.cs create mode 100644 Assets/Code/Input/ActionMapping.cs.meta create mode 100644 Assets/Code/Input/IInputService.cs create mode 100644 Assets/Code/Input/IInputService.cs.meta create mode 100644 Assets/Code/Input/InputService.cs create mode 100644 Assets/Code/Input/InputService.cs.meta rename Assets/{Resources => }/Code/UI.meta (100%) create mode 100644 Assets/Code/UI/MainMenuController.cs rename Assets/{Resources => }/Code/UI/MainMenuController.cs.meta (100%) create mode 100644 Assets/Resources/Audio.meta create mode 100644 Assets/Resources/Audio/Music.meta create mode 100644 Assets/Resources/Audio/Music/MainMenu.wav create mode 100644 Assets/Resources/Audio/Music/MainMenu.wav.meta delete mode 100644 Assets/Resources/Code/UI/MainMenuController.cs create mode 100644 Assets/Resources/Scenes/Gameplay.unity create mode 100644 Assets/Resources/Scenes/Gameplay.unity.meta delete mode 100644 Assets/Resources/Sprites/button.png create mode 100644 Assets/Resources/Sprites/buttons.png rename Assets/Resources/Sprites/{button.png.meta => buttons.png.meta} (65%) diff --git a/Assets/Resources/Code.meta b/Assets/Code.meta similarity index 100% rename from Assets/Resources/Code.meta rename to Assets/Code.meta diff --git a/Assets/Code/DI.meta b/Assets/Code/DI.meta new file mode 100644 index 0000000..337c259 --- /dev/null +++ b/Assets/Code/DI.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8752b6bb3b4c47e0ba37207aa531e459 +timeCreated: 1769496772 \ No newline at end of file diff --git a/Assets/Code/DI/Bootstrapper.cs b/Assets/Code/DI/Bootstrapper.cs new file mode 100644 index 0000000..25c176f --- /dev/null +++ b/Assets/Code/DI/Bootstrapper.cs @@ -0,0 +1,18 @@ +using Code.Input; +using UnityEngine; +using UnityEngine.InputSystem; + +namespace Code.DI +{ + public class Bootstrapper : MonoBehaviour + { + [SerializeField] private InputActionAsset inputActionAsset; + + private void Awake() + { + var container = new GameObject("DIContainer").AddComponent(); + + container.Register(new InputService(inputActionAsset)); + } + } +} \ No newline at end of file diff --git a/Assets/Code/DI/Bootstrapper.cs.meta b/Assets/Code/DI/Bootstrapper.cs.meta new file mode 100644 index 0000000..8ff371d --- /dev/null +++ b/Assets/Code/DI/Bootstrapper.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8c0e2e6ddaf841588115d29a403122f9 +timeCreated: 1769496855 \ No newline at end of file diff --git a/Assets/Code/DI/DIContainer.cs b/Assets/Code/DI/DIContainer.cs new file mode 100644 index 0000000..b4476dc --- /dev/null +++ b/Assets/Code/DI/DIContainer.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace Code.DI +{ + public class DIContainer : MonoBehaviour + { + private readonly Dictionary _services = new(); + + private void Awake() + { + DontDestroyOnLoad(gameObject); + } + + public void Register(T service) + { + var type = typeof(T); + if (!_services.TryAdd(type, service)) + { + Debug.LogWarning($"Service {type} is already registered."); + } + } + + public T Resolve() + { + var type = typeof(T); + if (_services.TryGetValue(type, out var service)) + { + return (T)service; + } + throw new Exception($"Service {type} not found."); + } + } +} \ No newline at end of file diff --git a/Assets/Code/DI/DIContainer.cs.meta b/Assets/Code/DI/DIContainer.cs.meta new file mode 100644 index 0000000..f2bbe4a --- /dev/null +++ b/Assets/Code/DI/DIContainer.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4cf9b443633a411ebfc48fe9b0f981b4 +timeCreated: 1769496780 \ No newline at end of file diff --git a/Assets/Code/Input.meta b/Assets/Code/Input.meta new file mode 100644 index 0000000..247860c --- /dev/null +++ b/Assets/Code/Input.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d7c1cbe75231462fb8ae7fd41e5600a9 +timeCreated: 1769496987 \ No newline at end of file diff --git a/Assets/Code/Input/ActionMapping.cs b/Assets/Code/Input/ActionMapping.cs new file mode 100644 index 0000000..651c312 --- /dev/null +++ b/Assets/Code/Input/ActionMapping.cs @@ -0,0 +1,9 @@ +namespace Code.Input +{ + public enum ActionMapping + { + MainMenu, + UI, + Gameplay + } +} \ No newline at end of file diff --git a/Assets/Code/Input/ActionMapping.cs.meta b/Assets/Code/Input/ActionMapping.cs.meta new file mode 100644 index 0000000..2584e4e --- /dev/null +++ b/Assets/Code/Input/ActionMapping.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1e6d3a235a2d42729329b58480a6ac87 +timeCreated: 1769497003 \ No newline at end of file diff --git a/Assets/Code/Input/IInputService.cs b/Assets/Code/Input/IInputService.cs new file mode 100644 index 0000000..df6ece9 --- /dev/null +++ b/Assets/Code/Input/IInputService.cs @@ -0,0 +1,22 @@ +using System; +using UnityEngine; +using UnityEngine.InputSystem; + +namespace Code.Input +{ + public interface IInputService + { + void EnableMap(ActionMapping actionMap); + void DisableMap(ActionMapping actionMap); + + Vector2 MainMenuParalax { get; } + + Vector2 LookInput { get; } + Vector2 MoveInput { get; } + bool SprintPressed { get; } + + + void DebugBindAction(int mapId, int actionId, Action action); + void DebugUnbindAction(int mapId, int actionId, Action action); + } +} \ No newline at end of file diff --git a/Assets/Code/Input/IInputService.cs.meta b/Assets/Code/Input/IInputService.cs.meta new file mode 100644 index 0000000..9e06e18 --- /dev/null +++ b/Assets/Code/Input/IInputService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: eb7a6d7e580d409aa67e2ea49ee41314 +timeCreated: 1769497026 \ No newline at end of file diff --git a/Assets/Code/Input/InputService.cs b/Assets/Code/Input/InputService.cs new file mode 100644 index 0000000..a2a361a --- /dev/null +++ b/Assets/Code/Input/InputService.cs @@ -0,0 +1,81 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +namespace Code.Input +{ + public class InputService : IInputService + { + private readonly InputActionAsset _inputActionAsset; + private InputAction _lmbInteractAction; + + public Vector2 MainMenuParalax { get; private set; } + + public Vector2 LookInput { get; private set; } + public Vector2 MoveInput { get; private set; } + public bool SprintPressed { get; private set; } + + public InputService(InputActionAsset inputActionAsset) + { + _inputActionAsset = inputActionAsset; + SetupInputCallbacks(); + } + + private void SetupInputCallbacks() + { + SetupMainMenuInputCallbacks(); + //SetupMovementInputCallbacks(); + } + + /*private void SetupMovementInputCallbacks() + { + var map = _inputActionAsset.actionMaps[(int)ActionMapping.Movement]; + BindVector2(map, "Look", v => LookInput = v); + BindVector2(map, "Move", v => MoveInput = v); + BindButton(map, "Sprint", v => SprintPressed = v); + }*/ + + private void SetupMainMenuInputCallbacks() + { + var map = _inputActionAsset.actionMaps[(int)ActionMapping.MainMenu]; + BindVector2(map, "Parallax", v => MainMenuParalax = v); + } + + private void BindButton(InputActionMap map, string actionName, System.Action setter) + { + var action = map.FindAction(actionName); + + if (action == null) + return; + + action.performed += _ => setter(true); + action.canceled += _ => setter(false); + } + + private void BindVector2(InputActionMap map, string actionName, System.Action setter) + { + var action = map.FindAction(actionName); + + if (action == null) + return; + + action.performed += ctx => setter(ctx.ReadValue()); + action.canceled += _ => setter(Vector2.zero); + } + + public void EnableMap(ActionMapping actionMap) + { + _inputActionAsset.actionMaps[(int)actionMap].Enable(); + } + + public void DisableMap(ActionMapping actionMap) + { + _inputActionAsset.actionMaps[(int)actionMap].Disable(); + } + + public void DebugBindAction(int mapId, int actionId, System.Action action) => + _inputActionAsset.actionMaps[mapId].actions[actionId].performed += action; + + public void DebugUnbindAction(int mapId, int actionId, System.Action action) => + _inputActionAsset.actionMaps[mapId].actions[actionId].performed -= action; + } +} \ No newline at end of file diff --git a/Assets/Code/Input/InputService.cs.meta b/Assets/Code/Input/InputService.cs.meta new file mode 100644 index 0000000..011c4e2 --- /dev/null +++ b/Assets/Code/Input/InputService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 559062e3db0d479880c8bb1df8ea1d6c +timeCreated: 1769497052 \ No newline at end of file diff --git a/Assets/Resources/Code/UI.meta b/Assets/Code/UI.meta similarity index 100% rename from Assets/Resources/Code/UI.meta rename to Assets/Code/UI.meta diff --git a/Assets/Code/UI/MainMenuController.cs b/Assets/Code/UI/MainMenuController.cs new file mode 100644 index 0000000..bff8d1b --- /dev/null +++ b/Assets/Code/UI/MainMenuController.cs @@ -0,0 +1,162 @@ +using Code.DI; +using Code.Input; +using DG.Tweening; +using TMPro; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +namespace Code.UI +{ + public class MainMenuController : MonoBehaviour + { + [SerializeField] private TMP_Text logotype; + [SerializeField] private Button startGameButton; + [SerializeField] private Button showResultsButton; + [SerializeField] private Button exitButton; + [SerializeField] private Transform parallaxRoot; + + [SerializeField] private Image fader; + [SerializeField] private Image backgroundImage; + + [SerializeField] private float parallaxStrength = 15f; + [SerializeField] private float parallaxSmoothTime = 0.1f; + + private Vector3 _targetParallaxOffset; + private Vector3 _currentParallaxOffset; + private IInputService _inputService; + private AudioSource _audioSource; + + private void Start() + { + var container = FindFirstObjectByType(); + _inputService = container.Resolve(); + _inputService.EnableMap(ActionMapping.MainMenu); + _audioSource = FindFirstObjectByType(); + + SetupButtons(); + AnimateLogo(); + AnimateBackground(); + FadeIn(); + } + + private void SetupButtons() + { + startGameButton.onClick.AddListener(OnStartGameClicked); + showResultsButton.onClick.AddListener(OnShowResultsClicked); + exitButton.onClick.AddListener(OnExitButtonClicked); + } + + private void AnimateLogo() + { + var rect = logotype.rectTransform; + var originalColor = logotype.color; + + rect.localScale = Vector3.zero; + rect.rotation = Quaternion.Euler(0, 0, -20f); + logotype.color = new Color(originalColor.r, originalColor.g, originalColor.b, 0f); + + var logoSequence = DOTween.Sequence(); + logoSequence.Append(rect.DOScale(Vector3.one * 1.2f, 0.6f).SetEase(Ease.OutBack)) + .Join(rect.DORotate(Vector3.zero, 0.6f).SetEase(Ease.OutSine)) + .Join(logotype.DOColor(originalColor, 0.6f)); + + logoSequence.OnComplete(() => + { + rect.DOScale(new Vector3(1.08f, 1.08f, 1f), 2.4f) + .SetLoops(-1, LoopType.Yoyo) + .SetEase(Ease.InOutSine); + + logotype.DOColor(new Color(originalColor.r, originalColor.g, originalColor.b, 0.9f), 3f) + .SetLoops(-1, LoopType.Yoyo) + .SetEase(Ease.InOutSine); + }); + } + + private void AnimateBackground() + { + if (backgroundImage == null) return; + + var rect = backgroundImage.rectTransform; + + rect.DOScale(1.2f, 25f) + .SetLoops(-1, LoopType.Yoyo) + .SetEase(Ease.InOutSine); + } + + private void FadeIn() + { + _audioSource.volume = 0f; + _audioSource.DOFade(1f, 1f).SetEase(Ease.Linear); + fader.color = new Color(0, 0, 0, 1f); + fader.DOFade(0f, 1f).SetEase(Ease.Linear); + fader.raycastTarget = false; + } + + private void Update() + { + HandleParallax(); + } + + private void HandleParallax() + { + if (parallaxRoot == null) return; + + var mousePos = _inputService.MainMenuParalax; + var center = new Vector2(Screen.width / 2f, Screen.height / 2f); + + if (center.x == 0 || center.y == 0) return; + + var offset = (mousePos - center) / center; + _targetParallaxOffset = new Vector3( + -offset.x * parallaxStrength, + -offset.y * parallaxStrength, + 0f + ); + + _currentParallaxOffset = Vector3.Lerp( + _currentParallaxOffset, + _targetParallaxOffset, + Time.deltaTime / parallaxSmoothTime + ); + + parallaxRoot.localPosition = _currentParallaxOffset; + } + + private void OnStartGameClicked() => FadeOutAndLoad("Gameplay"); + private void OnShowResultsClicked() => Debug.Log("Show results"); + private void OnExitButtonClicked() => FadeOutAndQuit(); + + private void FadeOutAndLoad(string sceneName) + { + fader.raycastTarget = true; + _audioSource.DOFade(0, 0.8f).SetEase(Ease.Linear); + fader.DOFade(1f, 0.8f).OnComplete(() => + { + SceneManager.LoadScene(sceneName); + }); + } + + private void FadeOutAndQuit() + { + fader.raycastTarget = true; + _audioSource.DOFade(0, 0.8f).SetEase(Ease.Linear); + fader.DOFade(1f, 0.8f).OnComplete(() => + { +#if UNITY_EDITOR + UnityEditor.EditorApplication.isPlaying = false; +#else + Application.Quit(); +#endif + }); + } + + private void OnDestroy() + { + _inputService?.DisableMap(ActionMapping.MainMenu); + startGameButton?.onClick.RemoveListener(OnStartGameClicked); + showResultsButton?.onClick.RemoveListener(OnShowResultsClicked); + exitButton?.onClick.RemoveListener(OnExitButtonClicked); + } + } +} \ No newline at end of file diff --git a/Assets/Resources/Code/UI/MainMenuController.cs.meta b/Assets/Code/UI/MainMenuController.cs.meta similarity index 100% rename from Assets/Resources/Code/UI/MainMenuController.cs.meta rename to Assets/Code/UI/MainMenuController.cs.meta diff --git a/Assets/Resources/Audio.meta b/Assets/Resources/Audio.meta new file mode 100644 index 0000000..dae8d91 --- /dev/null +++ b/Assets/Resources/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bce9c9accfa8f439fb4c4eda3198a534 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Music.meta b/Assets/Resources/Audio/Music.meta new file mode 100644 index 0000000..914cc08 --- /dev/null +++ b/Assets/Resources/Audio/Music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b73b21b1ac007f4f9e742cae8c85146 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Music/MainMenu.wav b/Assets/Resources/Audio/Music/MainMenu.wav new file mode 100644 index 0000000..8f03d71 --- /dev/null +++ b/Assets/Resources/Audio/Music/MainMenu.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc08e7bd258d04a2fae9c6a622c14475f7850e3ce03d9ab7d2a97f12215d4660 +size 37744810 diff --git a/Assets/Resources/Audio/Music/MainMenu.wav.meta b/Assets/Resources/Audio/Music/MainMenu.wav.meta new file mode 100644 index 0000000..33e1f80 --- /dev/null +++ b/Assets/Resources/Audio/Music/MainMenu.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bb42abb71df63a20ab10f430198e3990 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Code/UI/MainMenuController.cs b/Assets/Resources/Code/UI/MainMenuController.cs deleted file mode 100644 index c95eba6..0000000 --- a/Assets/Resources/Code/UI/MainMenuController.cs +++ /dev/null @@ -1,22 +0,0 @@ -using DG.Tweening; -using TMPro; -using UnityEngine; - -namespace Code.UI -{ - public class MainMenuController : MonoBehaviour - { - [SerializeField] private TMP_Text logotype; - - private void Start() - { - AnimateLogo(); - } - - private void AnimateLogo() - { - logotype.transform.DOShakePosition(3, new Vector3(5, 5, 0)).SetLoops(-1, LoopType.Yoyo); - logotype.transform.DOShakeScale(7, new Vector3(0.5f, 1.2f, 0)).SetLoops(-1, LoopType.Yoyo); - } - } -} diff --git a/Assets/Resources/Scenes/Gameplay.unity b/Assets/Resources/Scenes/Gameplay.unity new file mode 100644 index 0000000..9d6968c --- /dev/null +++ b/Assets/Resources/Scenes/Gameplay.unity @@ -0,0 +1,316 @@ +%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: 2 + 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 &152902919 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 152902922} + - component: {fileID: 152902921} + - component: {fileID: 152902920} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &152902920 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152902919} + m_Enabled: 1 +--- !u!20 &152902921 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152902919} + 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 &152902922 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152902919} + 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!1 &535950259 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 535950261} + - component: {fileID: 535950260} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &535950260 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535950259} + m_Enabled: 1 + serializedVersion: 12 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &535950261 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535950259} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 152902922} + - {fileID: 535950261} diff --git a/Assets/Resources/Scenes/Gameplay.unity.meta b/Assets/Resources/Scenes/Gameplay.unity.meta new file mode 100644 index 0000000..8268785 --- /dev/null +++ b/Assets/Resources/Scenes/Gameplay.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 671bd89a40ae6c8729f779d5cd5ff905 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Scenes/MainMenu.unity b/Assets/Resources/Scenes/MainMenu.unity index fbe7a82..21b4f49 100644 --- a/Assets/Resources/Scenes/MainMenu.unity +++ b/Assets/Resources/Scenes/MainMenu.unity @@ -119,6 +119,191 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &39175565 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 39175569} + - component: {fileID: 39175568} + - component: {fileID: 39175567} + - component: {fileID: 39175566} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &39175566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39175565} + 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!81 &39175567 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39175565} + m_Enabled: 1 +--- !u!20 &39175568 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39175565} + 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: 1 + orthographic size: 0.086602546 + m_Depth: 0 + 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 &39175569 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39175565} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, 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!1 &150185179 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 150185180} + - component: {fileID: 150185181} + m_Layer: 5 + m_Name: ParallaxRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &150185180 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 150185179} + 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: 524370756} + - {fileID: 276536515} + - {fileID: 949956272} + - {fileID: 1379910030} + m_Father: {fileID: 1082687091} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &150185181 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 150185179} + m_CullTransparentMesh: 1 --- !u!1 &276536514 GameObject: m_ObjectHideFlags: 0 @@ -145,13 +330,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 276536514} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 607322246} - m_Father: {fileID: 1082687091} + m_Father: {fileID: 150185180} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -222,8 +407,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1219692439, guid: 53adfc79d491c74a3ab386467d287ccb, type: 3} - m_Type: 0 + m_Sprite: {fileID: 845044900, guid: ff9c70969675bfb31b97df7dd4bf2564, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -231,7 +416,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2 --- !u!222 &276536518 CanvasRenderer: m_ObjectHideFlags: 0 @@ -340,12 +525,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 524370755} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1082687091} + m_Father: {fileID: 150185180} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -518,8 +703,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -655,8 +840,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -726,6 +911,264 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 607322245} m_CullTransparentMesh: 1 +--- !u!1 &949956271 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 949956272} + - component: {fileID: 949956275} + - component: {fileID: 949956274} + - component: {fileID: 949956273} + m_Layer: 5 + m_Name: ShowResultsButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &949956272 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 949956271} + 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: 1023426806} + m_Father: {fileID: 150185180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -200} + m_SizeDelta: {x: -1240, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &949956273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 949956271} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 949956274} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &949956274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 949956271} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1095557392, guid: ff9c70969675bfb31b97df7dd4bf2564, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &949956275 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 949956271} + m_CullTransparentMesh: 1 +--- !u!1 &1023426805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1023426806} + - component: {fileID: 1023426808} + - component: {fileID: 1023426807} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1023426806 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023426805} + 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: 949956272} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1023426807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023426805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Show Results + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 455fab60d8654c315baae5983dd772cb, type: 2} + m_sharedMaterial: {fileID: 2132471366458363271, guid: 455fab60d8654c315baae5983dd772cb, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 72 + m_fontSizeBase: 72 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_characterHorizontalScale: 1 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1023426808 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023426805} + m_CullTransparentMesh: 1 --- !u!1 &1082687087 GameObject: m_ObjectHideFlags: 0 @@ -821,9 +1264,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 440274559} - - {fileID: 524370756} - - {fileID: 276536515} - - {fileID: 1379910030} + - {fileID: 150185180} + - {fileID: 1698987784} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -841,6 +1283,8 @@ GameObject: m_Component: - component: {fileID: 1223299655} - component: {fileID: 1223299656} + - component: {fileID: 1223299658} + - component: {fileID: 1223299657} m_Layer: 0 m_Name: ScriptsHelper m_TagString: Untagged @@ -876,6 +1320,124 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Code.UI.MainMenuController logotype: {fileID: 524370757} + startGameButton: {fileID: 276536516} + showResultsButton: {fileID: 949956273} + exitButton: {fileID: 1379910031} + parallaxRoot: {fileID: 150185180} + fader: {fileID: 1698987782} + backgroundImage: {fileID: 440274560} + parallaxStrength: 15 + parallaxSmoothTime: 0.2 +--- !u!82 &1223299657 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223299654} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: bb42abb71df63a20ab10f430198e3990, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1223299658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223299654} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8c0e2e6ddaf841588115d29a403122f9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.DI.Bootstrapper + inputActionAsset: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} --- !u!1 &1336407493 GameObject: m_ObjectHideFlags: 0 @@ -981,17 +1543,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1379910029} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 579760431} - m_Father: {fileID: 1082687091} + m_Father: {fileID: 150185180} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchoredPosition: {x: 0, y: -400} m_SizeDelta: {x: -1500, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1379910031 @@ -1058,7 +1620,63 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -1219692439, guid: 53adfc79d491c74a3ab386467d287ccb, type: 3} + m_Sprite: {fileID: -896484843, guid: ff9c70969675bfb31b97df7dd4bf2564, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1379910033 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1379910029} + m_CullTransparentMesh: 1 +--- !u!1 &1698987781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1698987784} + - component: {fileID: 1698987783} + - component: {fileID: 1698987782} + m_Layer: 5 + m_Name: Fader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1698987782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698987781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1068,14 +1686,33 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1379910033 +--- !u!222 &1698987783 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1379910029} + m_GameObject: {fileID: 1698987781} m_CullTransparentMesh: 1 +--- !u!224 &1698987784 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1698987781} + 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: 1082687091} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1083,3 +1720,4 @@ SceneRoots: - {fileID: 1082687091} - {fileID: 1336407496} - {fileID: 1223299655} + - {fileID: 39175569} diff --git a/Assets/Resources/Sprites/button.png b/Assets/Resources/Sprites/button.png deleted file mode 100644 index 557ec4b..0000000 --- a/Assets/Resources/Sprites/button.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:446edb357eede5a232d58dad25abfc4615611d5cd13df8c2df090d9e0bf7a48f -size 516416 diff --git a/Assets/Resources/Sprites/buttons.png b/Assets/Resources/Sprites/buttons.png new file mode 100644 index 0000000..370e34c --- /dev/null +++ b/Assets/Resources/Sprites/buttons.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e60b3855f5d6d0cd7c311b60edda75c5a723f9d4d33f54e0a294e7fe2b7a2de +size 425784 diff --git a/Assets/Resources/Sprites/button.png.meta b/Assets/Resources/Sprites/buttons.png.meta similarity index 65% rename from Assets/Resources/Sprites/button.png.meta rename to Assets/Resources/Sprites/buttons.png.meta index b870ba7..81f4cb6 100644 --- a/Assets/Resources/Sprites/button.png.meta +++ b/Assets/Resources/Sprites/buttons.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 53adfc79d491c74a3ab386467d287ccb +guid: ff9c70969675bfb31b97df7dd4bf2564 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -93,27 +93,84 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: - serializedVersion: 2 - name: button_0 + name: buttons_0 rect: serializedVersion: 2 - x: 123 - y: 120 - width: 3084 - height: 1114 + x: 96 + y: 663 + width: 832 + height: 219 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 439, y: 117, z: 403, w: 347} + border: {x: 72, y: 50, z: 72, w: 30} customData: outline: [] physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: b165fc44fa1981ffa9230005b4e9008d - internalID: -1219692439 + spriteID: 498d56fc95d2bbf56913538d6f9a94c2 + internalID: -896484843 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: buttons_1 + rect: + serializedVersion: 2 + x: 96 + y: 399 + width: 832 + height: 219 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 72, y: 50, z: 72, w: 30} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 395790dce885e5b42bb649a3f0373fb5 + internalID: 845044900 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: buttons_2 + rect: + serializedVersion: 2 + x: 96 + y: 134 + width: 832 + height: 219 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 72, y: 50, z: 72, w: 30} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f0030ddd31993f46487a3adf478d80d3 + internalID: -1095557392 vertices: [] indices: edges: [] @@ -122,7 +179,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: 6beaa0287146bb068a5cf93181fe8715 + spriteID: ac591c8caf230fd79b7aac6410d8aad7 internalID: 0 vertices: [] indices: @@ -134,7 +191,9 @@ TextureImporter: - key: SpriteEditor.SliceSettings value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":64.0,"y":64.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":0,"keepEmptyRects":false,"isAlternate":false}' nameFileIdTable: - button_0: -1219692439 + buttons_0: -896484843 + buttons_1: 845044900 + buttons_2: -1095557392 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Settings/Input/InputSystem_Actions.inputactions b/Assets/Settings/Input/InputSystem_Actions.inputactions index 1a12cb9..2c49208 100644 --- a/Assets/Settings/Input/InputSystem_Actions.inputactions +++ b/Assets/Settings/Input/InputSystem_Actions.inputactions @@ -1,8 +1,37 @@ { + "version": 1, "name": "InputSystem_Actions", "maps": [ { - "name": "Player", + "name": "MainMenu", + "id": "2b894239-3ac0-4e80-abc6-3598af98c67a", + "actions": [ + { + "name": "Parallax", + "type": "Value", + "id": "9ce7abc0-2bf9-45b4-bd18-5f7bc7844085", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + } + ], + "bindings": [ + { + "name": "", + "id": "dc74448e-12ee-4deb-9bc4-449116ba675c", + "path": "/position", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Parallax", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, + { + "name": "Gameplay", "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", "actions": [ { @@ -22,83 +51,9 @@ "processors": "", "interactions": "", "initialStateCheck": true - }, - { - "name": "Attack", - "type": "Button", - "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Interact", - "type": "Button", - "id": "852140f2-7766-474d-8707-702459ba45f3", - "expectedControlType": "Button", - "processors": "", - "interactions": "Hold", - "initialStateCheck": false - }, - { - "name": "Crouch", - "type": "Button", - "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Jump", - "type": "Button", - "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Previous", - "type": "Button", - "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Next", - "type": "Button", - "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Sprint", - "type": "Button", - "id": "641cd816-40e6-41b4-8c3d-04687c349290", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false } ], "bindings": [ - { - "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "WASD", "id": "00ca640b-d935-4593-8157-c05846ea39b3", @@ -198,39 +153,6 @@ "isComposite": false, "isPartOfComposite": true }, - { - "name": "", - "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3ea4d645-4504-4529-b061-ab81934c3752", - "path": "/stick", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", - "path": "/rightStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "8c8e490b-c610-4785-884f-f04217b23ca4", @@ -241,237 +163,6 @@ "action": "Look", "isComposite": false, "isPartOfComposite": false - }, - { - "name": "", - "id": "3e5f5442-8668-4b27-a940-df99bad7e831", - "path": "/{Hatswitch}", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", - "path": "/buttonWest", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", - "path": "/primaryTouch/tap", - "interactions": "", - "processors": "", - "groups": ";Touch", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8255d333-5683-4943-a58a-ccb207ff1dce", - "path": "/{PrimaryAction}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", - "path": "/enter", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", - "path": "/2", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", - "path": "/dpad/right", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "f2e9ba44-c423-42a7-ad56-f20975884794", - "path": "/leftShift", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", - "path": "/leftStickPress", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", - "path": "/buttonSouth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "603f3daf-40bd-4854-8724-93e8017f59e3", - "path": "/secondaryButton", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", - "path": "/1", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", - "path": "/dpad/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", - "path": "/e", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", - "path": "/buttonEast", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", - "path": "/c", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false } ] }, diff --git a/Packages/manifest.json b/Packages/manifest.json index 2165972..9aac3fe 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,8 +2,8 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "2.0.9", - "com.unity.collab-proxy": "2.11.2", - "com.unity.ide.rider": "3.0.38", + "com.unity.collab-proxy": "2.11.3", + "com.unity.ide.rider": "3.0.39", "com.unity.ide.visualstudio": "2.0.26", "com.unity.inputsystem": "1.17.0", "com.unity.multiplayer.center": "1.0.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d191760..edd87af 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -26,7 +26,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.11.2", + "version": "2.11.3", "depth": 0, "source": "registry", "dependencies": {}, @@ -52,7 +52,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.38", + "version": "3.0.39", "depth": 0, "source": "registry", "dependencies": {