diff --git a/Assets/AudioController.cs b/Assets/AudioController.cs index 76c302df..909df267 100644 --- a/Assets/AudioController.cs +++ b/Assets/AudioController.cs @@ -45,7 +45,7 @@ public class AudioController : MonoBehaviour public void PlaySound(AudioClip clip) { - ac.volume = 0.6f*_startVolume; + ac.volume = 0.4f*_startVolume; ac.PlayOneShot(clip); } } diff --git a/Assets/PlayerFollower.cs b/Assets/PlayerFollower.cs new file mode 100644 index 00000000..e79b6dd3 --- /dev/null +++ b/Assets/PlayerFollower.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerFollower : MonoBehaviour +{ + [SerializeField] GameObject _player; + + private void LateUpdate() + { + transform.position = _player.transform.position; + } +} diff --git a/Assets/PlayerFollower.cs.meta b/Assets/PlayerFollower.cs.meta new file mode 100644 index 00000000..f68a79e0 --- /dev/null +++ b/Assets/PlayerFollower.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 45fc274967e3d934fb5084350efb8df2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level_1.unity b/Assets/Scenes/Level_1.unity index f62f2bc1..75d564b9 100644 --- a/Assets/Scenes/Level_1.unity +++ b/Assets/Scenes/Level_1.unity @@ -1447,6 +1447,59 @@ PrefabInstance: m_RemovedComponents: - {fileID: 4621458471676120662, guid: fa5ecf8ffbe22c7459c44494cee176d9, type: 3} m_SourcePrefab: {fileID: 100100000, guid: fa5ecf8ffbe22c7459c44494cee176d9, type: 3} +--- !u!1 &142144178 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 142144179} + - component: {fileID: 142144181} + - component: {fileID: 142144180} + m_Layer: 8 + m_Name: PlayerAudioListener + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &142144179 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 142144178} + 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_Children: [] + m_Father: {fileID: 1923264932} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &142144180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 142144178} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45fc274967e3d934fb5084350efb8df2, type: 3} + m_Name: + m_EditorClassIdentifier: + _player: {fileID: 1801060021} +--- !u!81 &142144181 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 142144178} + m_Enabled: 1 --- !u!1001 &145632616 PrefabInstance: m_ObjectHideFlags: 0 @@ -20453,10 +20506,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 + MinDistance: 3 + MaxDistance: 15 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 1 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -20489,7 +20542,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -27003,7 +27056,6 @@ GameObject: m_Component: - component: {fileID: 1923264932} - component: {fileID: 1923264935} - - component: {fileID: 1923264934} - component: {fileID: 1923264933} - component: {fileID: 1923264937} - component: {fileID: 1923264936} @@ -27022,10 +27074,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1923264931} - m_LocalRotation: {x: 0.029971035, y: 0.000000004076362, z: -0.000000007576159, w: 0.9995508} + m_LocalRotation: {x: 0.029971035, y: -0.000000004076362, z: 0.0000000075761575, + w: 0.9995508} m_LocalPosition: {x: 0, y: 0.87083435, z: -14.50833} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 142144179} m_Father: {fileID: 961629212} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -27065,14 +27119,6 @@ MonoBehaviour: Distance: 0 currentZoom: 5 remainingTranslation: {x: 0, y: 0, z: 0} ---- !u!81 &1923264934 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1923264931} - m_Enabled: 1 --- !u!20 &1923264935 Camera: m_ObjectHideFlags: 0 @@ -27708,7 +27754,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1946816075} - m_LocalRotation: {x: 0.5257311, y: 0.0000000073183117, z: -0.0000000045229647, w: 0.85065085} + m_LocalRotation: {x: 0.5257311, y: -0.000000007318311, z: 0.000000004522964, w: 0.85065085} m_LocalPosition: {x: 0, y: 13, z: -6.5} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index f6307f12..cb325ea3 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -5462,7 +5462,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1003420330} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -5475,7 +5475,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 426478b073313244bbe84d3ec1cafa64, type: 3} + m_Sprite: {fileID: 21300000, guid: eda48b7fc41be467ebbc27f02d3b86cd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scripts/Global/DeathChecker.cs b/Assets/Scripts/Global/DeathChecker.cs index f6aec74b..c8501593 100644 --- a/Assets/Scripts/Global/DeathChecker.cs +++ b/Assets/Scripts/Global/DeathChecker.cs @@ -201,6 +201,8 @@ public class DeathChecker : MonoBehaviour { TileManagment.OnAnyTileCaptured = null; TileManagment.OnInitialized = null; + CustomInput.OnTouchDown = null; + CustomInput.OnTouchUp = null; StartCoroutine(GoToMenuAfter(3f)); } //////////////////////////PLAYER DEATH////////////// diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8c8837ad..a0a7c532 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -127,7 +127,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.27 + bundleVersion: 0.28 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0