diff --git a/Assets/Audio Mixers/MainMixer.mixer b/Assets/Audio Mixers/MainMixer.mixer index c1f131c..67746ea 100644 --- a/Assets/Audio Mixers/MainMixer.mixer +++ b/Assets/Audio Mixers/MainMixer.mixer @@ -181,8 +181,10 @@ AudioMixerSnapshotController: m_FloatValues: 8f482920c408fd34e9c8792cf526bf12: 115 b58fd3f8e205ca64aa5718e8bc864bc6: 0 + 350b5ae92de31b14eaf685d0e95ddd9b: 10 6ca751ba6a985aa4eb7f21b4ec43b475: -6898 2889b28bff25e764f9db668c9c682f67: -7135 + ad60b42d334c4ab41b80946c48f104a3: 4 fd01f6bdeaa870c4688fa6fcad7c3e41: 0 m_TransitionOverrides: {} --- !u!243 &586271417499195193 @@ -199,6 +201,7 @@ AudioMixerGroupController: m_Pitch: 1af3136670aece3419669e966058f72f m_Send: 00000000000000000000000000000000 m_Effects: + - {fileID: 2148697290076279156} - {fileID: 3705997264899357636} m_UserColorIndex: 6 m_Mute: 0 @@ -218,6 +221,28 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &2148697290076279156 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: a830f85cb83717544af39b456bdab5d2 + m_EffectName: Compressor + m_MixLevel: a94ecbbafadce114c93416299ece3027 + m_Parameters: + - m_ParameterName: Threshold + m_GUID: e2b09988f7ce87e47a2b2cc6f7416848 + - m_ParameterName: Attack + m_GUID: f7a99808176a7984f9c52d15826dcfaa + - m_ParameterName: Release + m_GUID: ba6efedb616a2854891f9518183e7eb5 + - m_ParameterName: Make up gain + m_GUID: ad60b42d334c4ab41b80946c48f104a3 + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &3581666672454972537 AudioMixerEffectController: m_ObjectHideFlags: 3 diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index 74abde5..ea94a8a 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -44,50 +44,6 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &348633210077192417 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1126784636528541765} - - component: {fileID: 1162020271666891315} - m_Layer: 11 - m_Name: Keep Alive Transfrom (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1126784636528541765 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348633210077192417} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 40} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3141763353809520921} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &1162020271666891315 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348633210077192417} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 0 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1057583362089800098 GameObject: m_ObjectHideFlags: 0 @@ -132,94 +88,6 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &2197822004148279662 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5394010786608129485} - - component: {fileID: 7252705610779177971} - m_Layer: 11 - m_Name: Keep Alive Transfrom (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5394010786608129485 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2197822004148279662} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 20, y: 0, z: 40} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3141763353809520921} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &7252705610779177971 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2197822004148279662} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 0 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &2502255080720208753 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8176200447245835517} - - component: {fileID: 6378768524508873711} - m_Layer: 11 - m_Name: Keep Alive Transfrom (8) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8176200447245835517 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2502255080720208753} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -40, y: 0, z: 40} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3141763353809520921} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &6378768524508873711 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2502255080720208753} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 0 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2861789733652061628 GameObject: m_ObjectHideFlags: 0 @@ -251,61 +119,14 @@ Transform: - {fileID: 8678474047183707600} - {fileID: 7943859381021257470} - {fileID: 5691969424643599792} - - {fileID: 1126784636528541765} - - {fileID: 5394010786608129485} - - {fileID: 6694720010889880444} - - {fileID: 1714814158818370277} - - {fileID: 8176200447245835517} - - {fileID: 770455908488971121} - - {fileID: 8281861711062244863} - - {fileID: 3963350117226868500} + - {fileID: 2141595520079752625} + - {fileID: 5001111495459213892} + - {fileID: 8888317252785736816} + - {fileID: 6686210173505003585} + - {fileID: 3434104991777237373} m_Father: {fileID: 6125707630481988396} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2939237098782545637 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1714814158818370277} - - component: {fileID: 893568576611142582} - m_Layer: 11 - m_Name: Keep Alive Transfrom (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1714814158818370277 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2939237098782545637} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 40, y: 0, z: 40} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3141763353809520921} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &893568576611142582 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2939237098782545637} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 0 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4063427199230185944 GameObject: m_ObjectHideFlags: 0 @@ -336,50 +157,6 @@ Transform: m_Father: {fileID: 6125707628839966534} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -20, y: -20, z: 0} ---- !u!1 &4726785473631957706 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3963350117226868500} - - component: {fileID: 3724922992614155179} - m_Layer: 11 - m_Name: Keep Alive Transfrom (11) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3963350117226868500 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4726785473631957706} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -20, y: 0, z: 60} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3141763353809520921} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &3724922992614155179 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4726785473631957706} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 0 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4952248939254261606 GameObject: m_ObjectHideFlags: 0 @@ -424,6 +201,50 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &5475264282018854540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3434104991777237373} + - component: {fileID: 3985197436390914503} + m_Layer: 11 + m_Name: Keep Alive Transfrom (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3434104991777237373 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5475264282018854540} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -10, y: 0, z: 20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3141763353809520921} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &3985197436390914503 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5475264282018854540} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 0 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5528187573320198087 GameObject: m_ObjectHideFlags: 0 @@ -468,50 +289,6 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &5558558450438575958 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6694720010889880444} - - component: {fileID: 347181795325260091} - m_Layer: 11 - m_Name: Keep Alive Transfrom (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6694720010889880444 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5558558450438575958} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -20, y: 0, z: 40} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3141763353809520921} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &347181795325260091 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5558558450438575958} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 0 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5768207841704116667 GameObject: m_ObjectHideFlags: 0 @@ -962,8 +739,21 @@ MonoBehaviour: Moving: 0 InAir: 0 FootstepSource: {fileID: 827982312027890955} - RightFootstepClips: [] - LeftFootstepClips: [] + LandingFootstepClips: + - {fileID: 8300000, guid: 3e307d22d58319f458ba09d796ad7649, type: 3} + - {fileID: 8300000, guid: 652c0852712c8e241a4bf111931dcdc7, type: 3} + RightFootstepClips: + - {fileID: 8300000, guid: c92b3484b26d18a4c86c115c987baea2, type: 3} + - {fileID: 8300000, guid: 8d2867b5448d3f8429c1842a5a404ea3, type: 3} + - {fileID: 8300000, guid: 591c00be04f77d64985257e52a71b1c0, type: 3} + - {fileID: 8300000, guid: ccb965fdbe7d94d41b5a100db50c66b5, type: 3} + - {fileID: 8300000, guid: 65932210a5db99d44963e46e19d19d22, type: 3} + LeftFootstepClips: + - {fileID: 8300000, guid: 6ee0ec5c010245240a88327b2125b4ad, type: 3} + - {fileID: 8300000, guid: e89bb2aa1af07f249bb8f41770a5ead0, type: 3} + - {fileID: 8300000, guid: b9719981d9d94fa44bc7e71b89d94235, type: 3} + - {fileID: 8300000, guid: 0081506f5c0be9a43bad8a45ad196489, type: 3} + - {fileID: 8300000, guid: 598c5a1ed658e1344910dbf5a96063b2, type: 3} LastStep: 0 --- !u!114 &8702400494665140028 MonoBehaviour: @@ -979,7 +769,6 @@ MonoBehaviour: m_EditorClassIdentifier: Loraces: [] ChunkKeepAliveTransformsParent: {fileID: 3141763353809520921} - ChunkKeepAliveTransforms: [] --- !u!1 &6687183487362402551 GameObject: m_ObjectHideFlags: 0 @@ -1010,7 +799,7 @@ Transform: m_Father: {fileID: 6125707628839966534} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -20, y: -20, z: 0} ---- !u!1 &7831615558971931466 +--- !u!1 &6732858706986533675 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1018,43 +807,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8281861711062244863} - - component: {fileID: 132562802410719940} + - component: {fileID: 5001111495459213892} + - component: {fileID: 6552547734537293407} m_Layer: 11 - m_Name: Keep Alive Transfrom (10) + m_Name: Keep Alive Transfrom (5) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8281861711062244863 +--- !u!4 &5001111495459213892 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7831615558971931466} + m_GameObject: {fileID: 6732858706986533675} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 20, y: 0, z: 60} + m_LocalPosition: {x: 10, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3141763353809520921} - m_RootOrder: 10 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &132562802410719940 +--- !u!135 &6552547734537293407 SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7831615558971931466} + m_GameObject: {fileID: 6732858706986533675} m_Material: {fileID: 0} m_IsTrigger: 1 m_Enabled: 0 serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &8115798808653193613 +--- !u!1 &7196573737289587106 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1062,36 +851,124 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 770455908488971121} - - component: {fileID: 9199188776661120843} + - component: {fileID: 8888317252785736816} + - component: {fileID: 7957303170195902836} m_Layer: 11 - m_Name: Keep Alive Transfrom (9) + m_Name: Keep Alive Transfrom (6) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &770455908488971121 +--- !u!4 &8888317252785736816 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8115798808653193613} + m_GameObject: {fileID: 7196573737289587106} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 60} + m_LocalPosition: {x: -10, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3141763353809520921} - m_RootOrder: 9 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &9199188776661120843 +--- !u!135 &7957303170195902836 SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8115798808653193613} + m_GameObject: {fileID: 7196573737289587106} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 0 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8576716471363164543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6686210173505003585} + - component: {fileID: 1074813043709230151} + m_Layer: 11 + m_Name: Keep Alive Transfrom (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6686210173505003585 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8576716471363164543} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 10, y: 0, z: 20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3141763353809520921} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &1074813043709230151 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8576716471363164543} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 0 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8654728011135292786 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2141595520079752625} + - component: {fileID: 4934886654013332668} + m_Layer: 11 + m_Name: Keep Alive Transfrom (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2141595520079752625 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8654728011135292786} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3141763353809520921} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &4934886654013332668 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8654728011135292786} m_Material: {fileID: 0} m_IsTrigger: 1 m_Enabled: 0 diff --git a/Assets/Scripts/CameraBobber.cs b/Assets/Scripts/CameraBobber.cs index 4ee3332..3b1d1cd 100644 --- a/Assets/Scripts/CameraBobber.cs +++ b/Assets/Scripts/CameraBobber.cs @@ -18,6 +18,7 @@ public class CameraBobber : MonoBehaviour { public bool InAir = false; public AudioSource FootstepSource; // TODO: Vary by ground material + public AudioClip[] LandingFootstepClips; public AudioClip[] RightFootstepClips; public AudioClip[] LeftFootstepClips; @@ -57,9 +58,12 @@ public class CameraBobber : MonoBehaviour { } CameraTransform.localPosition = Vector3.Lerp(CameraTransform.localPosition, TargetPosition, 10f * Time.deltaTime); - if ((Moving != WasMoving && !InAir) || WasInAir != InAir) { + if (Moving != WasMoving && !InAir) { AlternateStep(); PlayStepSound(GetClips(LastStep), 0.7f); + } else if (WasInAir != InAir) { + AlternateStep(); + PlayStepSound(LandingFootstepClips, 1f); } WasMoving = Moving; diff --git a/Assets/Scripts/GameOverMenu.cs b/Assets/Scripts/GameOverMenu.cs index 3db760f..9dc7910 100644 --- a/Assets/Scripts/GameOverMenu.cs +++ b/Assets/Scripts/GameOverMenu.cs @@ -20,6 +20,7 @@ public class GameOverMenu : MonoBehaviour { bool IsGameOver = GameState.Current == State.GameOver; Canvas.alpha = Mathf.Lerp(Canvas.alpha, IsGameOver ? 1 : 0, instantTransition ? 1 : 2f * Time.deltaTime); Canvas.blocksRaycasts = IsGameOver; + Canvas.interactable = IsGameOver; } public void Replay() { diff --git a/Assets/Scripts/LoraxCuller.cs b/Assets/Scripts/LoraxCuller.cs index 4381d0a..64c043d 100644 --- a/Assets/Scripts/LoraxCuller.cs +++ b/Assets/Scripts/LoraxCuller.cs @@ -21,8 +21,10 @@ public class LoraxCuller : MonoBehaviour { Lorax Lorax = Loraces[LoraxIndex]; for (int ChunkIndex = 0; ChunkIndex < ChunkKeepAliveTransforms.Count; ChunkIndex++) { Vector3 KeepAlivePosition = ChunkKeepAliveTransforms[ChunkIndex].position; + Debug.DrawLine(KeepAlivePosition, KeepAlivePosition + Vector3.up * 5, Color.red); GameObject NewChunk = Lorax.GetChunkAt(KeepAlivePosition.x, KeepAlivePosition.z); + if (EnabledChunks[LoraxIndex, ChunkIndex] != NewChunk) { if (EnabledChunks[LoraxIndex, ChunkIndex] != null) { EnabledChunks[LoraxIndex, ChunkIndex].SetActive(false); diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index 6089dbd..d464dbf 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -44,6 +44,7 @@ public class PauseMenu : MonoBehaviour { private void Fade(bool instant) { Canvas.alpha = Mathf.Lerp(Canvas.alpha, Paused ? 1 : 0, instant ? 1 : 10f * Time.unscaledDeltaTime); Canvas.blocksRaycasts = Paused; + Canvas.interactable = Paused; } public void Resume() { diff --git a/Assets/Sounds/Footsteps.meta b/Assets/Sounds/Footsteps.meta new file mode 100644 index 0000000..8277116 --- /dev/null +++ b/Assets/Sounds/Footsteps.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2165435941fc8c4f8a592eb113f4714 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Footsteps/Footstep01.ogg b/Assets/Sounds/Footsteps/Footstep01.ogg new file mode 100644 index 0000000..b2d7bfa Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep01.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep01.ogg.meta b/Assets/Sounds/Footsteps/Footstep01.ogg.meta new file mode 100644 index 0000000..f422648 --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep01.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c92b3484b26d18a4c86c115c987baea2 +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/Sounds/Footsteps/Footstep02.ogg b/Assets/Sounds/Footsteps/Footstep02.ogg new file mode 100644 index 0000000..9fc2a2e Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep02.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep02.ogg.meta b/Assets/Sounds/Footsteps/Footstep02.ogg.meta new file mode 100644 index 0000000..de0403a --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep02.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6ee0ec5c010245240a88327b2125b4ad +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/Sounds/Footsteps/Footstep03.ogg b/Assets/Sounds/Footsteps/Footstep03.ogg new file mode 100644 index 0000000..611581e Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep03.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep03.ogg.meta b/Assets/Sounds/Footsteps/Footstep03.ogg.meta new file mode 100644 index 0000000..04b0c9b --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep03.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8d2867b5448d3f8429c1842a5a404ea3 +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/Sounds/Footsteps/Footstep04.ogg b/Assets/Sounds/Footsteps/Footstep04.ogg new file mode 100644 index 0000000..b8b0e9e Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep04.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep04.ogg.meta b/Assets/Sounds/Footsteps/Footstep04.ogg.meta new file mode 100644 index 0000000..48d1d2f --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep04.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e89bb2aa1af07f249bb8f41770a5ead0 +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/Sounds/Footsteps/Footstep05.ogg b/Assets/Sounds/Footsteps/Footstep05.ogg new file mode 100644 index 0000000..5b4507f Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep05.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep05.ogg.meta b/Assets/Sounds/Footsteps/Footstep05.ogg.meta new file mode 100644 index 0000000..a295859 --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep05.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 591c00be04f77d64985257e52a71b1c0 +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/Sounds/Footsteps/Footstep06.ogg b/Assets/Sounds/Footsteps/Footstep06.ogg new file mode 100644 index 0000000..85f010e Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep06.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep06.ogg.meta b/Assets/Sounds/Footsteps/Footstep06.ogg.meta new file mode 100644 index 0000000..658bb2a --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep06.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b9719981d9d94fa44bc7e71b89d94235 +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/Sounds/Footsteps/Footstep07.ogg b/Assets/Sounds/Footsteps/Footstep07.ogg new file mode 100644 index 0000000..f525480 Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep07.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep07.ogg.meta b/Assets/Sounds/Footsteps/Footstep07.ogg.meta new file mode 100644 index 0000000..7c23a92 --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep07.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ccb965fdbe7d94d41b5a100db50c66b5 +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/Sounds/Footsteps/Footstep08.ogg b/Assets/Sounds/Footsteps/Footstep08.ogg new file mode 100644 index 0000000..dc7b6b7 Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep08.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep08.ogg.meta b/Assets/Sounds/Footsteps/Footstep08.ogg.meta new file mode 100644 index 0000000..12c4c9f --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep08.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 0081506f5c0be9a43bad8a45ad196489 +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/Sounds/Footsteps/Footstep09.ogg b/Assets/Sounds/Footsteps/Footstep09.ogg new file mode 100644 index 0000000..336b83f Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep09.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep09.ogg.meta b/Assets/Sounds/Footsteps/Footstep09.ogg.meta new file mode 100644 index 0000000..ad24fd8 --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep09.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 65932210a5db99d44963e46e19d19d22 +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/Sounds/Footsteps/Footstep10.ogg b/Assets/Sounds/Footsteps/Footstep10.ogg new file mode 100644 index 0000000..37e6f71 Binary files /dev/null and b/Assets/Sounds/Footsteps/Footstep10.ogg differ diff --git a/Assets/Sounds/Footsteps/Footstep10.ogg.meta b/Assets/Sounds/Footsteps/Footstep10.ogg.meta new file mode 100644 index 0000000..1aba5ef --- /dev/null +++ b/Assets/Sounds/Footsteps/Footstep10.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 598c5a1ed658e1344910dbf5a96063b2 +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/Sounds/Footsteps/FootstepAbrupt01.ogg b/Assets/Sounds/Footsteps/FootstepAbrupt01.ogg new file mode 100644 index 0000000..e19d9a5 Binary files /dev/null and b/Assets/Sounds/Footsteps/FootstepAbrupt01.ogg differ diff --git a/Assets/Sounds/Footsteps/FootstepAbrupt01.ogg.meta b/Assets/Sounds/Footsteps/FootstepAbrupt01.ogg.meta new file mode 100644 index 0000000..63d3bd5 --- /dev/null +++ b/Assets/Sounds/Footsteps/FootstepAbrupt01.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 70afe4110ccbea44585111b0a2c885d4 +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/Sounds/Footsteps/FootstepLanding01.ogg b/Assets/Sounds/Footsteps/FootstepLanding01.ogg new file mode 100644 index 0000000..a166e3a Binary files /dev/null and b/Assets/Sounds/Footsteps/FootstepLanding01.ogg differ diff --git a/Assets/Sounds/Footsteps/FootstepLanding01.ogg.meta b/Assets/Sounds/Footsteps/FootstepLanding01.ogg.meta new file mode 100644 index 0000000..bff0104 --- /dev/null +++ b/Assets/Sounds/Footsteps/FootstepLanding01.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3e307d22d58319f458ba09d796ad7649 +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/Sounds/Footsteps/FootstepLanding02.ogg b/Assets/Sounds/Footsteps/FootstepLanding02.ogg new file mode 100644 index 0000000..03bb92c Binary files /dev/null and b/Assets/Sounds/Footsteps/FootstepLanding02.ogg differ diff --git a/Assets/Sounds/Footsteps/FootstepLanding02.ogg.meta b/Assets/Sounds/Footsteps/FootstepLanding02.ogg.meta new file mode 100644 index 0000000..3d92fbb --- /dev/null +++ b/Assets/Sounds/Footsteps/FootstepLanding02.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 652c0852712c8e241a4bf111931dcdc7 +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/CREDITS.md b/CREDITS.md new file mode 100644 index 0000000..31bead5 --- /dev/null +++ b/CREDITS.md @@ -0,0 +1,3 @@ +External assets used: +- Campfire sounds from the Yle archive: https://freesound.org/people/YleArkisto/sounds/299266/ +- Footsteps by revolt2563: https://freesound.org/people/revolt2563/sounds/352870/