diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index 60aad1e..adcac2b 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -133,6 +133,8 @@ GameObject: - component: {fileID: 10774714} - component: {fileID: 10774713} - component: {fileID: 10774712} + - component: {fileID: 10774718} + - component: {fileID: 10774717} m_Layer: 0 m_Name: Boll m_TagString: Ball @@ -229,6 +231,121 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &10774717 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10774711} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + 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: 2 + 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: 1 + 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 &10774718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10774711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b77cfee0db7d5ec4a87421b180b83cd7, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 10774717} + collisionSounds: + - {fileID: 8300000, guid: 81c023438803f984abf14e807b485e73, type: 3} + - {fileID: 8300000, guid: 6cef3062b893fc64cbc7e7b707b20218, type: 3} + - {fileID: 8300000, guid: 24cfc2e8f3df43642a3ecf98cd38100a, type: 3} + - {fileID: 8300000, guid: 11369db0f03d06a41b94d37f12a01a1a, type: 3} + - {fileID: 8300000, guid: 225dff5c48b88164a84497136d337530, type: 3} --- !u!1 &268360628 GameObject: m_ObjectHideFlags: 0 @@ -363,6 +480,8 @@ GameObject: - component: {fileID: 367746331} - component: {fileID: 367746330} - component: {fileID: 367746329} + - component: {fileID: 367746334} + - component: {fileID: 367746333} m_Layer: 0 m_Name: Player 2 m_TagString: Untagged @@ -421,6 +540,8 @@ MonoBehaviour: boostDuration: 0.25 lastBoostTime: 0 lockBoost: 0 + boostSound: {fileID: 8300000, guid: 381b83f48d13a2e4a9315848144c9b9e, type: 3} + pitchModifier: {x: 0.2, y: 0.3} --- !u!4 &367746332 Transform: m_ObjectHideFlags: 0 @@ -438,6 +559,121 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!114 &367746333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367746328} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b77cfee0db7d5ec4a87421b180b83cd7, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 367746334} + collisionSounds: + - {fileID: 8300000, guid: 81c023438803f984abf14e807b485e73, type: 3} + - {fileID: 8300000, guid: 6cef3062b893fc64cbc7e7b707b20218, type: 3} + - {fileID: 8300000, guid: 24cfc2e8f3df43642a3ecf98cd38100a, type: 3} + - {fileID: 8300000, guid: 11369db0f03d06a41b94d37f12a01a1a, type: 3} + - {fileID: 8300000, guid: 225dff5c48b88164a84497136d337530, type: 3} +--- !u!82 &367746334 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367746328} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 0.3 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 2 + 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: 1 + 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!1 &384291585 GameObject: m_ObjectHideFlags: 0 @@ -1167,6 +1403,8 @@ GameObject: - component: {fileID: 708460347} - component: {fileID: 708460346} - component: {fileID: 708460345} + - component: {fileID: 708460349} + - component: {fileID: 708460348} m_Layer: 0 m_Name: Player 3 m_TagString: Untagged @@ -1242,6 +1480,123 @@ MonoBehaviour: boostDuration: 0.25 lastBoostTime: 0 lockBoost: 0 + boostSound: {fileID: 8300000, guid: 381b83f48d13a2e4a9315848144c9b9e, type: 3} + pitchModifier: {x: 0.2, y: 0.3} +--- !u!114 &708460348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708460343} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b77cfee0db7d5ec4a87421b180b83cd7, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 708460349} + collisionSounds: + - {fileID: 8300000, guid: 81c023438803f984abf14e807b485e73, type: 3} + - {fileID: 8300000, guid: 6cef3062b893fc64cbc7e7b707b20218, type: 3} + - {fileID: 8300000, guid: 24cfc2e8f3df43642a3ecf98cd38100a, type: 3} + - {fileID: 8300000, guid: 11369db0f03d06a41b94d37f12a01a1a, type: 3} + - {fileID: 8300000, guid: 225dff5c48b88164a84497136d337530, type: 3} +--- !u!82 &708460349 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708460343} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 0.3 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 2 + 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: 1 + 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!1 &929235626 GameObject: m_ObjectHideFlags: 0 @@ -1312,6 +1667,8 @@ MonoBehaviour: boostDuration: 0.25 lastBoostTime: 0 lockBoost: 0 + boostSound: {fileID: 0} + pitchModifier: {x: 0, y: 0} --- !u!4 &929235630 Transform: m_ObjectHideFlags: 0 @@ -1696,6 +2053,7 @@ GameObject: m_Component: - component: {fileID: 1228665502} - component: {fileID: 1228665501} + - component: {fileID: 1228665503} m_Layer: 0 m_Name: GameManager m_TagString: GameManager @@ -1715,6 +2073,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55bf84c610791ef4080484d67d35c0c4, type: 3} m_Name: m_EditorClassIdentifier: + goalSound: {fileID: 8300000, guid: a5697d77f43e8274f9672298044e2efa, type: 3} scorePlayer1: 0 scorePlayer2: 0 maxGoals: 10 @@ -1740,6 +2099,102 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1228665503 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228665500} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + 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!1 &1248323373 GameObject: m_ObjectHideFlags: 0 @@ -1860,6 +2315,7 @@ GameObject: - component: {fileID: 1463368304} - component: {fileID: 1463368303} - component: {fileID: 1463368302} + - component: {fileID: 1463368307} m_Layer: 0 m_Name: ForceZone m_TagString: Untagged @@ -1954,6 +2410,102 @@ Transform: m_Father: {fileID: 367746332} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1463368307 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463368301} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + 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!1 &1485996209 GameObject: m_ObjectHideFlags: 0 @@ -2212,6 +2764,7 @@ GameObject: - component: {fileID: 1831066459} - component: {fileID: 1831066458} - component: {fileID: 1831066457} + - component: {fileID: 1831066461} m_Layer: 0 m_Name: ForceZone m_TagString: Untagged @@ -2306,6 +2859,102 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1831066455} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!82 &1831066461 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1831066455} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + 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!1 &1880081385 GameObject: m_ObjectHideFlags: 0 @@ -2317,6 +2966,7 @@ GameObject: - component: {fileID: 1880081386} - component: {fileID: 1880081388} - component: {fileID: 1880081387} + - component: {fileID: 1880081389} m_Layer: 5 m_Name: WinText m_TagString: Untagged @@ -2385,6 +3035,102 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1880081385} m_CullTransparentMesh: 0 +--- !u!82 &1880081389 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1880081385} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + 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!1 &1885071193 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CollisionSound.cs b/Assets/Scripts/CollisionSound.cs new file mode 100644 index 0000000..7731b83 --- /dev/null +++ b/Assets/Scripts/CollisionSound.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(AudioSource))] + +public class CollisionSound : MonoBehaviour +{ + + public AudioSource audioSource; + public AudioClip[] collisionSounds; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + private void OnCollisionEnter(Collision collision) + { + this.audioSource.clip = this.collisionSounds[Random.Range(0, this.collisionSounds.Length)]; + this.audioSource.Play(); + } +} diff --git a/Assets/Scripts/CollisionSound.cs.meta b/Assets/Scripts/CollisionSound.cs.meta new file mode 100644 index 0000000..5b097ab --- /dev/null +++ b/Assets/Scripts/CollisionSound.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b77cfee0db7d5ec4a87421b180b83cd7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index cf044e0..add3bb9 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -3,8 +3,12 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using UnityEngine.SceneManagement; + +[RequireComponent(typeof(AudioSource))] public class GameManager : MonoBehaviour { + public AudioClip goalSound; + public int scorePlayer1 = 0; public int scorePlayer2 = 0; public int maxGoals = 1; @@ -19,9 +23,11 @@ public class GameManager : MonoBehaviour public Text scoreLabel; public Text winLabel; + private AudioSource audioSource; // Start is called before the first frame update void Start() { + this.audioSource = GetComponent(); this.player1Initial = new GameObject().transform; this.player1Initial.position = this.player1.position; this.player1Initial.rotation = this.player1.rotation; @@ -39,6 +45,8 @@ public class GameManager : MonoBehaviour // Update is called once per frame void Update() { + Debug.Log("Calculating matrix: Vector(" + Time.deltaTime * Random.Range(12, 123) + ")"); + Debug.Log("Hacking pentagon: in pr0gress..."); this.scoreLabel.text = "Score: " + this.scorePlayer1 + " : " + this.scorePlayer2; if (this.scorePlayer1 >= maxGoals) @@ -67,6 +75,9 @@ public class GameManager : MonoBehaviour public void ResetPositions() { + this.audioSource.clip = this.goalSound; + this.audioSource.Play(); + this.player1.position = this.player1Initial.position; this.player1.rotation = this.player1Initial.rotation; this.player1.GetComponent().velocity = Vector3.zero; diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 1abd543..9f2466f 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -14,9 +14,15 @@ public class PlayerController : MonoBehaviour public float boostDuration = 0; public float lastBoostTime = 0; public bool lockBoost = false; + public AudioClip boostSound; + public Vector2 pitchModifier; + + private AudioSource audioSource; + // Start is called before the first frame update void Start() { + this.audioSource = this.forceZone.transform.GetComponent(); this.rb = GetComponent(); } @@ -27,7 +33,7 @@ public class PlayerController : MonoBehaviour float movementDirection = Input.GetAxis("Vertical" + this.playerNumber); if (this.useController) { - Debug.Log(Input.GetAxis("VerticalBack" + this.playerNumber)); + //Debug.Log(Input.GetAxis("VerticalBack" + this.playerNumber)); movementDirection = Input.GetAxis("VerticalBack" + this.playerNumber) > 0 ? -1 : movementDirection; } @@ -58,8 +64,11 @@ public class PlayerController : MonoBehaviour //Boost if (Input.GetButtonDown("Boost" + this.playerNumber) && !this.lockBoost) { + this.audioSource.clip = this.boostSound; + this.audioSource.pitch = Random.Range(this.pitchModifier.x, this.pitchModifier.y); this.rb.AddRelativeForce(Vector3.forward * this.boostSpeed * Time.deltaTime, ForceMode.Impulse); this.forceZone.SetActive(true); + this.audioSource.Play(); this.lastBoostTime = Time.time; this.lockBoost = true; } diff --git a/Assets/Sfx.meta b/Assets/Sfx.meta new file mode 100644 index 0000000..0d82373 --- /dev/null +++ b/Assets/Sfx.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd856b16853d60e418f8809d176a6013 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/boost.wav b/Assets/Sfx/boost.wav new file mode 100644 index 0000000..2005084 --- /dev/null +++ b/Assets/Sfx/boost.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a08846d67244fc4714a5aebb66858104555a36fccbdc16c3b6d69acacf8924d1 +size 72748 diff --git a/Assets/Sfx/boost.wav.meta b/Assets/Sfx/boost.wav.meta new file mode 100644 index 0000000..95264b9 --- /dev/null +++ b/Assets/Sfx/boost.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 381b83f48d13a2e4a9315848144c9b9e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/desktop.ini.meta b/Assets/Sfx/desktop.ini.meta new file mode 100644 index 0000000..9fdcb84 --- /dev/null +++ b/Assets/Sfx/desktop.ini.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 601c9af28f9d51245ae90169da292cba +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/goal.wav b/Assets/Sfx/goal.wav new file mode 100644 index 0000000..7c9ee76 --- /dev/null +++ b/Assets/Sfx/goal.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7dc36d5777439f8b08ba597bd375df617a8c2969c39503ca242fae5938c3a6d +size 35618 diff --git a/Assets/Sfx/goal.wav.meta b/Assets/Sfx/goal.wav.meta new file mode 100644 index 0000000..be1e475 --- /dev/null +++ b/Assets/Sfx/goal.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a5697d77f43e8274f9672298044e2efa +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/hit1.wav b/Assets/Sfx/hit1.wav new file mode 100644 index 0000000..8a062a0 --- /dev/null +++ b/Assets/Sfx/hit1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d4a2a49b0d9e7909a737d177cb83bb70401d5c3e04d6d419d54b5a1ff920d0d +size 10188 diff --git a/Assets/Sfx/hit1.wav.meta b/Assets/Sfx/hit1.wav.meta new file mode 100644 index 0000000..1d7410b --- /dev/null +++ b/Assets/Sfx/hit1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 81c023438803f984abf14e807b485e73 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/hit2.wav b/Assets/Sfx/hit2.wav new file mode 100644 index 0000000..5b548f5 --- /dev/null +++ b/Assets/Sfx/hit2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:588345d07a2b41a80b4cb14c19d2bf2fb1987162527551e6e540c85f43cf64b7 +size 17970 diff --git a/Assets/Sfx/hit2.wav.meta b/Assets/Sfx/hit2.wav.meta new file mode 100644 index 0000000..baff329 --- /dev/null +++ b/Assets/Sfx/hit2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6cef3062b893fc64cbc7e7b707b20218 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/hit3.wav b/Assets/Sfx/hit3.wav new file mode 100644 index 0000000..c24efa7 --- /dev/null +++ b/Assets/Sfx/hit3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffff2ffb2cbd38998b7475302b8541ef6079636ab6b29ed4e547fe4aaee41626 +size 19652 diff --git a/Assets/Sfx/hit3.wav.meta b/Assets/Sfx/hit3.wav.meta new file mode 100644 index 0000000..b0e4945 --- /dev/null +++ b/Assets/Sfx/hit3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 24cfc2e8f3df43642a3ecf98cd38100a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/hit4.wav b/Assets/Sfx/hit4.wav new file mode 100644 index 0000000..65f5c13 --- /dev/null +++ b/Assets/Sfx/hit4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7819dcca9133006afb8f5a5522f74f5443781973d8b51871f2a1905f181e88ff +size 17040 diff --git a/Assets/Sfx/hit4.wav.meta b/Assets/Sfx/hit4.wav.meta new file mode 100644 index 0000000..c732970 --- /dev/null +++ b/Assets/Sfx/hit4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 11369db0f03d06a41b94d37f12a01a1a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/hit5.wav b/Assets/Sfx/hit5.wav new file mode 100644 index 0000000..4b0448f --- /dev/null +++ b/Assets/Sfx/hit5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd1bcdcbe5ba511f8518def427299b1fcd959b046cf8045b152dd971177815cb +size 21264 diff --git a/Assets/Sfx/hit5.wav.meta b/Assets/Sfx/hit5.wav.meta new file mode 100644 index 0000000..52884bd --- /dev/null +++ b/Assets/Sfx/hit5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 225dff5c48b88164a84497136d337530 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 89bc7a8..3aa001a 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ