From 36d9c98a2b308b18df1e999dbcaae2e5ea193723 Mon Sep 17 00:00:00 2001 From: Vladdie Date: Sun, 1 May 2022 06:46:35 -0500 Subject: [PATCH] 50% audio implement --- .../Prefabs/Environment/Archer/Archer.prefab | 4 + .../Prefabs/Environment/Archer/Arrow.prefab | 8 +- .../Bumpers/Circle Bumpers/Blue Bumper.prefab | 98 ++++ .../Bumpers/Circle Bumpers/Cyan Bumper.prefab | 98 ++++ .../Circle Bumpers/Green Bumper.prefab | 98 ++++ .../Bumpers/Circle Bumpers/Red Bumper.prefab | 98 ++++ .../Bumpers/Flipper/Blue Flipper.prefab | 98 ++++ .../Bumpers/Flipper/Cyan Flipper.prefab | 98 ++++ .../Bumpers/Flipper/Green Flipper.prefab | 98 ++++ .../Bumpers/Flipper/Red Flipper.prefab | 98 ++++ .../Triangle Bumpers/Blue Tri Bumper.prefab | 98 ++++ .../Triangle Bumpers/Cyan Tri Bumper.prefab | 98 ++++ .../Triangle Bumpers/Green Tri Bumper.prefab | 98 ++++ .../Triangle Bumpers/Red Tri Bumper.prefab | 98 ++++ .../Player/NetworkSMPlayerPrefab.prefab | 446 ++++++++++++------ Assets/Scenes/Game-Mountain.unity | 14 +- Assets/Scripts/Enemy scripts/Arrow.cs | 2 +- Assets/Scripts/KingScripts/Bumper.cs | 4 +- .../AerialState/AerialStateManager.cs | 1 + .../MovementState/MoveStateManager.cs | 21 + .../OffenseState/OffenseStateManager.cs | 6 + UserSettings/EditorUserSettings.asset | 14 +- 22 files changed, 1550 insertions(+), 146 deletions(-) diff --git a/Assets/Prefabs/Environment/Archer/Archer.prefab b/Assets/Prefabs/Environment/Archer/Archer.prefab index ce90c98..e74302e 100644 --- a/Assets/Prefabs/Environment/Archer/Archer.prefab +++ b/Assets/Prefabs/Environment/Archer/Archer.prefab @@ -916,6 +916,10 @@ PrefabInstance: propertyPath: speed value: 90 objectReference: {fileID: 0} + - target: {fileID: 26604539265034266, guid: 0e61ec06fdabb014bb1868596534f8b7, type: 3} + propertyPath: bumpPower + value: 30 + objectReference: {fileID: 0} - target: {fileID: 26604539265034267, guid: 0e61ec06fdabb014bb1868596534f8b7, type: 3} propertyPath: m_RootOrder value: 9 diff --git a/Assets/Prefabs/Environment/Archer/Arrow.prefab b/Assets/Prefabs/Environment/Archer/Arrow.prefab index 3053afe..217a2a4 100644 --- a/Assets/Prefabs/Environment/Archer/Arrow.prefab +++ b/Assets/Prefabs/Environment/Archer/Arrow.prefab @@ -31,7 +31,7 @@ Transform: m_GameObject: {fileID: 26604539265034264} m_LocalRotation: {x: 0, y: 1, z: -0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: -1} + m_LocalScale: {x: 1.5, y: 1.5, z: -1.5} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -97,7 +97,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 02284dc7b53e4b840931d425c06be734, type: 3} m_Name: m_EditorClassIdentifier: - speed: 35 + target: {x: 0, y: 0, z: 0} + isLive: 0 + dir: {x: 0, y: 0, z: 0} + speed: 135 + bumpPower: 25 --- !u!114 &2287528990630677962 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Blue Bumper.prefab b/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Blue Bumper.prefab index ab8f0cb..b38d48b 100644 --- a/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Blue Bumper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Blue Bumper.prefab @@ -46,6 +46,7 @@ GameObject: - component: {fileID: 3018986470493193256} - component: {fileID: 5267562593315414984} - component: {fileID: 5267562593315414987} + - component: {fileID: 1627940918281677824} m_Layer: 0 m_Name: bumperTop2 m_TagString: Untagged @@ -144,6 +145,103 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 1627940918281677824} +--- !u!82 &1627940918281677824 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5267562593315414985} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 &6268814204314165303 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Cyan Bumper.prefab b/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Cyan Bumper.prefab index 1ad6375..df4c887 100644 --- a/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Cyan Bumper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Cyan Bumper.prefab @@ -176,6 +176,7 @@ GameObject: - component: {fileID: 6720255489465850585} - component: {fileID: 6720255489465850882} - component: {fileID: 6720255489465850868} + - component: {fileID: 1235371620083677497} m_Layer: 0 m_Name: bumperTop3 m_TagString: Untagged @@ -274,6 +275,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 1235371620083677497} --- !u!114 &6720255489465850868 MonoBehaviour: m_ObjectHideFlags: 0 @@ -291,6 +293,102 @@ MonoBehaviour: PrefabHashGenerator: TempBumper AlwaysReplicateAsRoot: 0 DontDestroyWithOwner: 0 +--- !u!82 &1235371620083677497 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6720255489465850216} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 &7645174191388724163 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Green Bumper.prefab b/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Green Bumper.prefab index e35542a..ed96834 100644 --- a/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Green Bumper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Green Bumper.prefab @@ -208,6 +208,7 @@ GameObject: - component: {fileID: 1898827296083766790} - component: {fileID: 4578976054868738157} - component: {fileID: 4578976054868738158} + - component: {fileID: 1976355312519974710} m_Layer: 0 m_Name: bumperTop4 m_TagString: Untagged @@ -306,3 +307,100 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 1976355312519974710} +--- !u!82 &1976355312519974710 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4578976054868738159} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 diff --git a/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Red Bumper.prefab b/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Red Bumper.prefab index b37cda4..3e7df96 100644 --- a/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Red Bumper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Circle Bumpers/Red Bumper.prefab @@ -46,6 +46,7 @@ GameObject: - component: {fileID: 2986776816312776642} - component: {fileID: 3168800981632544862} - component: {fileID: 3168800981632544863} + - component: {fileID: 500874458999057011} m_Layer: 0 m_Name: bumperTop1 m_TagString: Untagged @@ -144,6 +145,103 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 500874458999057011} +--- !u!82 &500874458999057011 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3168800981632544860} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 &6284748660703086556 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/Bumpers/Flipper/Blue Flipper.prefab b/Assets/Prefabs/Environment/Bumpers/Flipper/Blue Flipper.prefab index e0febcc..7bdb494 100644 --- a/Assets/Prefabs/Environment/Bumpers/Flipper/Blue Flipper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Flipper/Blue Flipper.prefab @@ -94,6 +94,7 @@ GameObject: - component: {fileID: 7715295168681803912} - component: {fileID: 6639352510686710078} - component: {fileID: 3978269070183776026} + - component: {fileID: 7479581734881931897} m_Layer: 0 m_Name: Blue Flipper m_TagString: Untagged @@ -192,3 +193,100 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 7479581734881931897} +--- !u!82 &7479581734881931897 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6262962793188084755} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 diff --git a/Assets/Prefabs/Environment/Bumpers/Flipper/Cyan Flipper.prefab b/Assets/Prefabs/Environment/Bumpers/Flipper/Cyan Flipper.prefab index 40593b0..e3e5331 100644 --- a/Assets/Prefabs/Environment/Bumpers/Flipper/Cyan Flipper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Flipper/Cyan Flipper.prefab @@ -94,6 +94,7 @@ GameObject: - component: {fileID: 3312388050188634431} - component: {fileID: 8342791065783525251} - component: {fileID: 7988194008633837859} + - component: {fileID: 5011464867878448014} m_Layer: 0 m_Name: Cyan Flipper m_TagString: Untagged @@ -192,3 +193,100 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 5011464867878448014} +--- !u!82 &5011464867878448014 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3497820501032045263} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 diff --git a/Assets/Prefabs/Environment/Bumpers/Flipper/Green Flipper.prefab b/Assets/Prefabs/Environment/Bumpers/Flipper/Green Flipper.prefab index c2009da..0ff394d 100644 --- a/Assets/Prefabs/Environment/Bumpers/Flipper/Green Flipper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Flipper/Green Flipper.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 5937401600174055204} - component: {fileID: 7860290454710910359} - component: {fileID: 139046031254075422} + - component: {fileID: 8801961175456676784} m_Layer: 0 m_Name: Green Flipper m_TagString: Untagged @@ -111,6 +112,103 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 8801961175456676784} +--- !u!82 &8801961175456676784 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2476789574764312670} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 &4995933381876827000 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/Bumpers/Flipper/Red Flipper.prefab b/Assets/Prefabs/Environment/Bumpers/Flipper/Red Flipper.prefab index dad3f95..e8fb2b3 100644 --- a/Assets/Prefabs/Environment/Bumpers/Flipper/Red Flipper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Flipper/Red Flipper.prefab @@ -94,6 +94,7 @@ GameObject: - component: {fileID: 8086086003626158630} - component: {fileID: 3564381112896593860} - component: {fileID: 8173846060535895439} + - component: {fileID: 8975307022421797737} m_Layer: 0 m_Name: Red Flipper m_TagString: Untagged @@ -192,3 +193,100 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 8975307022421797737} +--- !u!82 &8975307022421797737 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8998935744917805973} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 diff --git a/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Blue Tri Bumper.prefab b/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Blue Tri Bumper.prefab index 7306040..a6749ab 100644 --- a/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Blue Tri Bumper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Blue Tri Bumper.prefab @@ -177,6 +177,7 @@ GameObject: - component: {fileID: 4271873736727136819} - component: {fileID: 7364294795453968190} - component: {fileID: 7364294795453968161} + - component: {fileID: 1540074772103391410} m_Layer: 0 m_Name: Blue Tri Bumper m_TagString: Untagged @@ -276,3 +277,100 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 1540074772103391410} +--- !u!82 &1540074772103391410 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7364294795453968160} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 diff --git a/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Cyan Tri Bumper.prefab b/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Cyan Tri Bumper.prefab index 954ccb0..cdd14c9 100644 --- a/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Cyan Tri Bumper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Cyan Tri Bumper.prefab @@ -177,6 +177,7 @@ GameObject: - component: {fileID: 7244194108686563745} - component: {fileID: 4214412935783138203} - component: {fileID: 4214412935783138196} + - component: {fileID: 9119045683556637719} m_Layer: 0 m_Name: Cyan Tri Bumper m_TagString: Untagged @@ -276,3 +277,100 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 9119045683556637719} +--- !u!82 &9119045683556637719 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4214412935783138197} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 diff --git a/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Green Tri Bumper.prefab b/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Green Tri Bumper.prefab index df92432..6e29b20 100644 --- a/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Green Tri Bumper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Green Tri Bumper.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 4842790498879533100} - component: {fileID: 964679775086043648} - component: {fileID: 964679775086043649} + - component: {fileID: 2843159734189735838} m_Layer: 0 m_Name: Green Tri Bumper m_TagString: Untagged @@ -112,6 +113,103 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 2843159734189735838} +--- !u!82 &2843159734189735838 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964679775086043678} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: b5cac7d89a180194cbe3f024155b9f83, type: 3} + m_PlayOnAwake: 0 + 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 &5920196470724539399 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Red Tri Bumper.prefab b/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Red Tri Bumper.prefab index c986edf..6d3dea8 100644 --- a/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Red Tri Bumper.prefab +++ b/Assets/Prefabs/Environment/Bumpers/Triangle Bumpers/Red Tri Bumper.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 4891627767831021660} - component: {fileID: 948028823854614713} - component: {fileID: 948028823854614714} + - component: {fileID: 2817481773294060254} m_Layer: 0 m_Name: Red Tri Bumper m_TagString: Untagged @@ -112,6 +113,103 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 2817481773294060254} +--- !u!82 &2817481773294060254 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 948028823854614715} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + 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 &2410551525968897288 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab index 8628f2e..f979fcd 100644 --- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab @@ -2072,7 +2072,6 @@ GameObject: m_Component: - component: {fileID: 3669633515805984294} - component: {fileID: 5460551618552195018} - - component: {fileID: 3184697568310969975} m_Layer: 3 m_Name: NetworkSMPlayerPrefab m_TagString: Player @@ -2116,102 +2115,6 @@ MonoBehaviour: PrefabHashGenerator: PlayerPrefab AlwaysReplicateAsRoot: 0 DontDestroyWithOwner: 0 ---- !u!82 &3184697568310969975 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2080873442886702253} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: a7356406376c0a74ea55179edb5cd780, 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!1 &2127015448850559388 GameObject: m_ObjectHideFlags: 0 @@ -2427,7 +2330,9 @@ Transform: - {fileID: 5284131052713740097} - {fileID: 2291141989623207601} - {fileID: 7076713120775683148} + - {fileID: 7055816792039764495} - {fileID: 3491033165239851714} + - {fileID: 4193719227832468680} m_Father: {fileID: 3669633515805984294} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7296,6 +7201,133 @@ CapsuleCollider: m_Height: 0.09 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6841710040379387093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7055816792039764495} + - component: {fileID: 8855552260963600785} + m_Layer: 0 + m_Name: slide + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7055816792039764495 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6841710040379387093} + 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: 9119836264208165486} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8855552260963600785 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6841710040379387093} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 53a527c638820a54e9c5db92951a40a9, type: 3} + m_PlayOnAwake: 0 + 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 &6873715991476134738 GameObject: m_ObjectHideFlags: 0 @@ -7943,7 +7975,7 @@ Transform: - {fileID: 6620426488542611320} - {fileID: 2354598683906146285} m_Father: {fileID: 9119836264208165486} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7688428083034862386 GameObject: @@ -8240,6 +8272,26 @@ MonoBehaviour: sensitivity: 200 dirHit: {x: 0, y: 0, z: 0} distToGround: 0 + slideAudio: {fileID: 8855552260963600785} + skateAudio: {fileID: 4018440573389908601} + dirtStep1: {fileID: 3529063055828840195} + dirtStep2: {fileID: 5901764518880721763} + dirtStep3: {fileID: 4864341464515080888} + dirtStep4: {fileID: 417378354444922311} + dirtStep5: {fileID: 6403760183301988594} + dirtStep6: {fileID: 6985106654889541546} + rainStep1: {fileID: 6681332925504738132} + rainStep2: {fileID: 8169423336604399348} + rainStep3: {fileID: 5300406381687621140} + rainStep4: {fileID: 8179639531121132756} + rainStep5: {fileID: 4547677146291873599} + rainStep6: {fileID: 2004974617382142939} + snowStep1: {fileID: 5866221799431162174} + snowStep2: {fileID: 824578241289139079} + snowStep3: {fileID: 6649430454979223809} + snowStep4: {fileID: 6406344828811918556} + snowStep5: {fileID: 7325690257266214265} + snowStep6: {fileID: 7400019177382702626} --- !u!114 &7688428083034862389 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8297,6 +8349,7 @@ MonoBehaviour: pStats: {fileID: 0} mSM: {fileID: 0} aSM: {fileID: 0} + kickSound: {fileID: 8273366662753135532} --- !u!114 &7391821093297401085 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8633,6 +8686,133 @@ SkinnedMeshRenderer: m_Center: {x: -6.9849193e-10, y: 0.012098646, z: 0.0026351595} m_Extent: {x: 0.0033820346, y: 0.0055587008, z: 0.0049631405} m_DirtyAABB: 0 +--- !u!1 &7890344249002186771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4193719227832468680} + - component: {fileID: 8273366662753135532} + m_Layer: 0 + m_Name: kick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4193719227832468680 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7890344249002186771} + 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: 9119836264208165486} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8273366662753135532 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7890344249002186771} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 4d229624b44cab64fb5dd3c6e8d52a38, type: 3} + m_PlayOnAwake: 0 + 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 &8169585938549385392 GameObject: m_ObjectHideFlags: 0 @@ -10382,16 +10562,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3} ---- !u!1 &6875021042914849118 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2093932219337445725, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3} - m_PrefabInstance: {fileID: 4785038822358179843} - m_PrefabAsset: {fileID: 0} --- !u!4 &6062737464147454948 stripped Transform: m_CorrespondingSourceObject: {fileID: 1604676674583710695, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3} m_PrefabInstance: {fileID: 4785038822358179843} m_PrefabAsset: {fileID: 0} +--- !u!1 &6875021042914849118 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2093932219337445725, guid: ddf4d42a9a2c263479d1c9f39daf2a19, type: 3} + m_PrefabInstance: {fileID: 4785038822358179843} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4830657648032301096 PrefabInstance: m_ObjectHideFlags: 0 @@ -10481,16 +10661,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d7355c5228e28647aa095e17f561af5, type: 3} ---- !u!4 &6704846395655065150 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2163302100881722902, guid: 1d7355c5228e28647aa095e17f561af5, type: 3} - m_PrefabInstance: {fileID: 4830657648032301096} - m_PrefabAsset: {fileID: 0} --- !u!1 &6217138924534649988 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1535243000795960492, guid: 1d7355c5228e28647aa095e17f561af5, type: 3} m_PrefabInstance: {fileID: 4830657648032301096} m_PrefabAsset: {fileID: 0} +--- !u!4 &6704846395655065150 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2163302100881722902, guid: 1d7355c5228e28647aa095e17f561af5, type: 3} + m_PrefabInstance: {fileID: 4830657648032301096} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4836376107028638556 PrefabInstance: m_ObjectHideFlags: 0 @@ -10750,16 +10930,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d7355c5228e28647aa095e17f561af5, type: 3} ---- !u!1 &6375705567088181487 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1535243000795960492, guid: 1d7355c5228e28647aa095e17f561af5, type: 3} - m_PrefabInstance: {fileID: 5563433242999952451} - m_PrefabAsset: {fileID: 0} --- !u!4 &5994536030789032533 stripped Transform: m_CorrespondingSourceObject: {fileID: 2163302100881722902, guid: 1d7355c5228e28647aa095e17f561af5, type: 3} m_PrefabInstance: {fileID: 5563433242999952451} m_PrefabAsset: {fileID: 0} +--- !u!1 &6375705567088181487 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1535243000795960492, guid: 1d7355c5228e28647aa095e17f561af5, type: 3} + m_PrefabInstance: {fileID: 5563433242999952451} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5579957051104421435 PrefabInstance: m_ObjectHideFlags: 0 @@ -10833,16 +11013,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} ---- !u!4 &855589473399002154 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} - m_PrefabInstance: {fileID: 5579957051104421435} - m_PrefabAsset: {fileID: 0} --- !u!1 &41793241492917904 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5619234375883385003, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} m_PrefabInstance: {fileID: 5579957051104421435} m_PrefabAsset: {fileID: 0} +--- !u!4 &855589473399002154 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5093667145548640785, guid: 72eb82d9a6b887c4fa96ee9c454ab292, type: 3} + m_PrefabInstance: {fileID: 5579957051104421435} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6535069772724261017 PrefabInstance: m_ObjectHideFlags: 0 @@ -10987,16 +11167,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 74924aacfb27f3148ba8b3f167f36376, type: 3} ---- !u!4 &9121014309015368976 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2544442401980233185, guid: 74924aacfb27f3148ba8b3f167f36376, type: 3} - m_PrefabInstance: {fileID: 6763270648998691057} - m_PrefabAsset: {fileID: 0} --- !u!1 &8493659828129755050 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2883566338755358555, guid: 74924aacfb27f3148ba8b3f167f36376, type: 3} m_PrefabInstance: {fileID: 6763270648998691057} m_PrefabAsset: {fileID: 0} +--- !u!4 &9121014309015368976 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2544442401980233185, guid: 74924aacfb27f3148ba8b3f167f36376, type: 3} + m_PrefabInstance: {fileID: 6763270648998691057} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8833099045870683019 PrefabInstance: m_ObjectHideFlags: 0 @@ -11070,11 +11250,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc28f9eb916e5f040b110c2f8523596f, type: 3} ---- !u!4 &1297835615514477272 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7536684185707184467, guid: cc28f9eb916e5f040b110c2f8523596f, type: 3} - m_PrefabInstance: {fileID: 8833099045870683019} - m_PrefabAsset: {fileID: 0} --- !u!1 &1821994332528777314 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7195765914217864169, guid: cc28f9eb916e5f040b110c2f8523596f, type: 3} @@ -11085,6 +11260,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7405935079727367147, guid: cc28f9eb916e5f040b110c2f8523596f, type: 3} m_PrefabInstance: {fileID: 8833099045870683019} m_PrefabAsset: {fileID: 0} +--- !u!4 &1297835615514477272 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7536684185707184467, guid: cc28f9eb916e5f040b110c2f8523596f, type: 3} + m_PrefabInstance: {fileID: 8833099045870683019} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8919283626837962284 PrefabInstance: m_ObjectHideFlags: 0 @@ -11158,16 +11338,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} ---- !u!4 &5381215068677189563 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} - m_PrefabInstance: {fileID: 8919283626837962284} - m_PrefabAsset: {fileID: 0} --- !u!1 &4748546854517208321 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4188790787953761069, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} m_PrefabInstance: {fileID: 8919283626837962284} m_PrefabAsset: {fileID: 0} +--- !u!4 &5381215068677189563 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3560732860612198807, guid: fe26ba5444ee2684b85a308896cd2ef2, type: 3} + m_PrefabInstance: {fileID: 8919283626837962284} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9107985823699293408 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index 74915ed..c791619 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -12733,6 +12733,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!1001 &117125392 PrefabInstance: m_ObjectHideFlags: 0 @@ -48320,6 +48321,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!114 &335361151 MonoBehaviour: m_ObjectHideFlags: 0 @@ -49589,6 +49591,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!1 &348809013 GameObject: m_ObjectHideFlags: 0 @@ -65357,6 +65360,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!114 &448605929 MonoBehaviour: m_ObjectHideFlags: 0 @@ -68476,7 +68480,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4784627840501882966, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: speed - value: 90 + value: 100 objectReference: {fileID: 0} - target: {fileID: 6313754771726110875, guid: 96c2075f01b997847922f482f584a6b0, type: 3} propertyPath: m_RootOrder @@ -69734,6 +69738,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!1001 &480503842 PrefabInstance: m_ObjectHideFlags: 0 @@ -105041,6 +105046,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!114 &670650705 MonoBehaviour: m_ObjectHideFlags: 0 @@ -163273,6 +163279,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!114 &1074719746 MonoBehaviour: m_ObjectHideFlags: 0 @@ -174182,6 +174189,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!114 &1127557575 MonoBehaviour: m_ObjectHideFlags: 0 @@ -234621,6 +234629,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!114 &1496628557 MonoBehaviour: m_ObjectHideFlags: 0 @@ -242160,6 +242169,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!114 &1553143901 MonoBehaviour: m_ObjectHideFlags: 0 @@ -265995,6 +266005,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!114 &1682121596 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339436,6 +339447,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: bumpPower: 30 + bumpNoise: {fileID: 0} --- !u!114 &2114992221 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Enemy scripts/Arrow.cs b/Assets/Scripts/Enemy scripts/Arrow.cs index 92dfe3f..1958b83 100644 --- a/Assets/Scripts/Enemy scripts/Arrow.cs +++ b/Assets/Scripts/Enemy scripts/Arrow.cs @@ -8,7 +8,7 @@ public class Arrow : NetworkBehaviour { public bool isLive = false; public Vector3 dir = Vector3.zero; - public float speed = 90f; + public float speed; [SerializeField] public float bumpPower = 30; diff --git a/Assets/Scripts/KingScripts/Bumper.cs b/Assets/Scripts/KingScripts/Bumper.cs index 169d4bb..c096602 100644 --- a/Assets/Scripts/KingScripts/Bumper.cs +++ b/Assets/Scripts/KingScripts/Bumper.cs @@ -5,7 +5,7 @@ using UnityEngine; public class Bumper : MonoBehaviour { public float bumpPower = 30; - + public AudioSource bumpNoise; // Is called whenever something collides with the bumper void OnTriggerEnter(Collider objectHit) { if (objectHit.gameObject.tag == "ArcherTarget") {//Checks if the other object is the player @@ -19,7 +19,7 @@ public class Bumper : MonoBehaviour { if(dirBump.x == 0 && dirBump.z == 0){ dirBump = new Vector3(1,.1f,1); } - + bumpNoise.Play(); playerMovement.GetHit(dirBump.normalized, bumpPower); // } diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs index 384c186..af19133 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs @@ -622,6 +622,7 @@ public class AerialStateManager : NetworkBehaviour { //Debug.Log("Found Hook"); hookPoint = hookPoints[hookPointIndex]; //The point we are grappling from + grappleSound.Play(); return true; } } diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs index a9ebea0..1a9a01e 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs @@ -83,6 +83,13 @@ public class MoveStateManager : NetworkBehaviour public float distToGround; // distance to ground //// + //audio set + public AudioSource slideAudio; + public AudioSource skateAudio; + public AudioSource dirtStep1, dirtStep2, dirtStep3, dirtStep4, dirtStep5, dirtStep6; + public AudioSource rainStep1, rainStep2, rainStep3, rainStep4, rainStep5, rainStep6; + public AudioSource snowStep1, snowStep2, snowStep3, snowStep4, snowStep5, snowStep6; + bool hasPlayed; void Awake(){ @@ -336,8 +343,22 @@ public class MoveStateManager : NetworkBehaviour Vector3 moveXZ = new Vector3(vel.x, 0, vel.z); driftVel = Vector3.Lerp(driftVel, moveXZ, pStats.CurTraction * Time.deltaTime); + + //True false set here to stop the audio from playing each time = to FPS + if (hasPlayed == false) + { + hasPlayed = true; + slideAudio.Play(); + } + + else + { + hasPlayed = false; + } + //Actually move he player moveController.Move(driftVel); + } //Camera and player rotation diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs index ffcf2b3..aa4e0bc 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs @@ -43,6 +43,9 @@ public class OffenseStateManager : NetworkBehaviour private AnimationManager animationManager; //// + /// audio + public AudioSource kickSound; + //// Variables Section private GameObject[] players; @@ -111,6 +114,9 @@ public class OffenseStateManager : NetworkBehaviour currentState = state; animationManager.updateCurrentPriority(); currentState.EnterState(this, previousState); + + + } //Collision checker for the leg diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 19e0db6..fced0f3 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,23 +18,23 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a - flags: 0 - RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0