diff --git a/Assets/Prefabs/SoundManager.prefab b/Assets/Prefabs/SoundManager.prefab new file mode 100644 index 0000000..adb6ee6 --- /dev/null +++ b/Assets/Prefabs/SoundManager.prefab @@ -0,0 +1,142 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6603081752101321713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6603081752101321718} + - component: {fileID: 6603081752101321719} + - component: {fileID: 6603081752101321712} + m_Layer: 0 + m_Name: SoundManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6603081752101321718 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6603081752101321713} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -11.69, y: 11.77, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &6603081752101321719 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6603081752101321713} + 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: 0 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &6603081752101321712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6603081752101321713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc9d3b5f9d5d60b4596f3d065b900e30, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/SoundManager.prefab.meta b/Assets/Prefabs/SoundManager.prefab.meta new file mode 100644 index 0000000..7116266 --- /dev/null +++ b/Assets/Prefabs/SoundManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3543bd0d0fe807c46a035ef0791d04e6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Slam.ogg b/Assets/Resources/Audio/Slam.ogg new file mode 100644 index 0000000..e117389 Binary files /dev/null and b/Assets/Resources/Audio/Slam.ogg differ diff --git a/Assets/Resources/Audio/Slam.ogg.meta b/Assets/Resources/Audio/Slam.ogg.meta new file mode 100644 index 0000000..89626ab --- /dev/null +++ b/Assets/Resources/Audio/Slam.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: afe1dd2f6e050034cab722c63e5d6449 +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/Scenes/GameIntro.unity b/Assets/Scenes/GameIntro.unity index 4588731..991a5aa 100644 --- a/Assets/Scenes/GameIntro.unity +++ b/Assets/Scenes/GameIntro.unity @@ -424,6 +424,75 @@ Transform: m_Father: {fileID: 987286083} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &946343795 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6603081752101321713, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_Name + value: SoundManager + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalPosition.x + value: -11.69 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalPosition.y + value: 11.77 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3543bd0d0fe807c46a035ef0791d04e6, type: 3} --- !u!4 &987286083 stripped Transform: m_CorrespondingSourceObject: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11, @@ -590,6 +659,133 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1688094721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1688094723} + - component: {fileID: 1688094722} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1688094722 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688094721} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: a01c0a314f63f5c4aaf9d28a33e9d2f2, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.386 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 171 + 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!4 &1688094723 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1688094721} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 94.12082, y: 3.8204193, z: -42.97514} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1767155643 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index aee1917..5f4daec 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -2592,6 +2592,127 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc74a3ff6f657d842b5731190a6074d7, type: 3} +--- !u!1001 &813755750 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1692173778} + m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.x + value: 0.032886505 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.x + value: 0.95738983 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.51 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.y + value: 1.31913 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Name + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.x + value: 203 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.y + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &813755751 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 813755750} + m_PrefabAsset: {fileID: 0} --- !u!4 &851631687 stripped Transform: m_CorrespondingSourceObject: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, @@ -2811,146 +2932,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1486274757} m_PrefabAsset: {fileID: 0} ---- !u!1 &925144586 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 925144589} - - component: {fileID: 925144588} - - component: {fileID: 925144587} - m_Layer: 0 - m_Name: SoundManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &925144587 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 925144586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc9d3b5f9d5d60b4596f3d065b900e30, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!82 &925144588 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 925144586} - 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: 0 - 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!4 &925144589 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 925144586} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -11.69, y: 11.77, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &951888604 PrefabInstance: m_ObjectHideFlags: 0 @@ -3203,12 +3184,12 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x - value: 132.502 + value: 132.5 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.y - value: 37.694 + value: 39 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -49414,6 +49395,127 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &1396451305 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1692173778} + m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.x + value: 0.032886505 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.x + value: 0.95738983 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Offset.y + value: -0.51 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Size.y + value: 1.31913 + objectReference: {fileID: 0} + - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_Name + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_TagString + value: Coffee + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.x + value: 33.5 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.y + value: 32.5 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &1396451306 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + m_PrefabInstance: {fileID: 1396451305} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1486274757 PrefabInstance: m_ObjectHideFlags: 0 @@ -49798,7 +49900,7 @@ MonoBehaviour: runErrorThreshold: 0.05 startHealth: 3 startStamina: 100 - coffeValuePercent: 10 + coffeValuePercent: 25 bugStaminaDamagePercent: 15 hurtVelocity: 20 fightSoundLength: 5 @@ -49871,6 +49973,8 @@ Transform: - {fileID: 1031922257} - {fileID: 856721814} - {fileID: 411222883} + - {fileID: 1396451306} + - {fileID: 813755751} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -51519,6 +51623,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} +--- !u!1001 &6603081751415254523 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6603081752101321713, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_Name + value: SoundManager + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalPosition.x + value: -11.69 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalPosition.y + value: 11.77 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6603081752101321718, guid: 3543bd0d0fe807c46a035ef0791d04e6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3543bd0d0fe807c46a035ef0791d04e6, type: 3} --- !u!1001 &7653345758327600075 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameIntroCutscene.cs b/Assets/Scripts/GameIntroCutscene.cs index cc381fe..e5c6b82 100644 --- a/Assets/Scripts/GameIntroCutscene.cs +++ b/Assets/Scripts/GameIntroCutscene.cs @@ -79,6 +79,7 @@ public class GameIntroCutscene : Cutscene yield return new WaitForSeconds(.8f); sceneC.sprite = sprites[3]; + SoundManagerScript.PlaySound("slam"); Shake(15); yield return new WaitForSeconds(1f); @@ -120,6 +121,7 @@ public class GameIntroCutscene : Cutscene sceneC.sprite = sprites[2]; sceneB.sprite = sprites[6]; + SoundManagerScript.PlaySound("slam"); Shake(20); yield return new WaitForSeconds(1.5f); diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 77d77bc..5f65f0b 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -53,28 +53,6 @@ public class Player : MonoBehaviour private void Update() { MovePlayer(); - - //if (IsPlayerOnWall(true)) - //{ - // if (collider.sharedMaterial == null || collider.sharedMaterial.friction != 0f) - // { - // collider.sharedMaterial = new PhysicsMaterial2D(); - // collider.sharedMaterial.friction = 0f; - // collider.enabled = false; - // collider.enabled = true; - // } - //} - //else - //{ - // if (collider.sharedMaterial == null || collider.sharedMaterial.friction == 0f) - // { - // collider.sharedMaterial = new PhysicsMaterial2D(); - // collider.sharedMaterial.friction = 0.5f; - // collider.enabled = false; - // collider.enabled = true; - // } - //} - } public void OnConsumable(Collider2D collision) diff --git a/Assets/Scripts/SoundManagerScript.cs b/Assets/Scripts/SoundManagerScript.cs index b2f7347..b37a9ae 100644 --- a/Assets/Scripts/SoundManagerScript.cs +++ b/Assets/Scripts/SoundManagerScript.cs @@ -7,7 +7,7 @@ public class SoundManagerScript : MonoBehaviour public static AudioClip jumpSound, screamSound, wrongButtonSound, bugLaughSound, drinkSound, eatSound, punchSound, hardPunchSound, - slapSound, hardSlapSound, winSound; + slapSound, hardSlapSound, winSound, slamSound; public static AudioSource audioSrc; // Start is called before the first frame update @@ -24,6 +24,7 @@ public class SoundManagerScript : MonoBehaviour slapSound = Resources.Load("Audio/Slap"); hardSlapSound = Resources.Load("Audio/HardSlap"); winSound = Resources.Load("Audio/Win"); + slamSound = Resources.Load("Audio/Slam"); audioSrc = GetComponent(); } @@ -72,6 +73,9 @@ public class SoundManagerScript : MonoBehaviour case "win": sound = winSound; break; + case "slam": + sound = slamSound; + break; }