diff --git a/Assets/Prefabs/Characters/Gardener.prefab b/Assets/Prefabs/Characters/Gardener.prefab index 915194d7..618d478a 100644 --- a/Assets/Prefabs/Characters/Gardener.prefab +++ b/Assets/Prefabs/Characters/Gardener.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 216298859848564559} - component: {fileID: 7540245671263622866} - component: {fileID: 4324904235553461363} + - component: {fileID: 6510906053583315767} m_Layer: 10 m_Name: Gardener m_TagString: Untagged @@ -121,6 +122,24 @@ MonoBehaviour: OnLastStateExited: m_PersistentCalls: m_Calls: [] +--- !u!114 &6510906053583315767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1102400833121127473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f0f1834ce0c7b0b42b633a6d2bd67698, type: 3} + m_Name: + m_EditorClassIdentifier: '::' + gardenerAudioPlayer: {fileID: 2263287369158035129} + mowerAudioPlayer: {fileID: 647208781616539222} + mowerStartAudio: {fileID: 8300000, guid: 082fcd5bdadf2884e9aefc6abf4a5cc5, type: 3} + mowerLoopAudio: {fileID: 8300000, guid: aed79daa951bce74196ce04da2990b22, type: 3} + gardenerFleeAudioClip: {fileID: 6418180475301049370, guid: 4949348ce86bb9e43a4251c06c1cb5d1, type: 2} + gardenerChaseAudioClip: {fileID: 6418180475301049370, guid: 97ccaa2fcf396f446aa7fde8586d225a, type: 2} --- !u!1 &1251257928845417300 GameObject: m_ObjectHideFlags: 0 @@ -183,6 +202,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -204,6 +225,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -286,6 +308,7 @@ Transform: - {fileID: 5409891338185859165} - {fileID: 3150182414053579701} - {fileID: 1667791532132169314} + - {fileID: 3539173003033760347} m_Father: {fileID: 2264394306674147778} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &20943836391379072 @@ -316,6 +339,9 @@ MonoBehaviour: GardenerObject: {fileID: 5409891338185859165} chaseDuration: 2 chaseDelay: 0 + animator: {fileID: 0} + lawnMowerRef: {fileID: 0} + audioController: {fileID: 0} --- !u!114 &8670311030271649807 MonoBehaviour: m_ObjectHideFlags: 0 @@ -399,6 +425,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -420,6 +448,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -501,6 +530,8 @@ SkinnedMeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -522,6 +553,7 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -617,6 +649,8 @@ SkinnedMeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -638,6 +672,7 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -730,6 +765,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -751,6 +788,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -829,6 +867,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -850,6 +890,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -866,6 +907,135 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5980d28f81eb545d78e1d84e1449a10f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &8590192324315186055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3539173003033760347} + - component: {fileID: 647208781616539222} + m_Layer: 0 + m_Name: MowerSFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3539173003033760347 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8590192324315186055} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.5896003, y: -4.9567494, z: 0} + m_LocalScale: {x: 0.7142856, y: 0.7142856, z: 0.7142856} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8242272023601642381} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &647208781616539222 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8590192324315186055} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 1171626333864818265, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 20 + MaxDistance: 50.5 + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &9197792684223820912 GameObject: m_ObjectHideFlags: 0 @@ -1005,7 +1175,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} propertyPath: m_LocalPosition.y - value: -3.364711 + value: -3.3647113 objectReference: {fileID: 0} - target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} propertyPath: m_LocalPosition.z @@ -1062,6 +1232,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} insertIndex: -1 addedObject: {fileID: 7341880855800055810} + - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 2263287369158035129} m_SourcePrefab: {fileID: 100100000, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} --- !u!1 &1789599716509294674 stripped GameObject: @@ -1080,6 +1253,103 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!82 &2263287369158035129 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1789599716509294674} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3533147658878909314, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 20 + MaxDistance: 50 + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!4 &5409891338185859165 stripped Transform: m_CorrespondingSourceObject: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 73d1983a..1de6552f 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -433957,6 +433957,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 2264394306674147778, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} m_PrefabInstance: {fileID: 1101333109} m_PrefabAsset: {fileID: 0} +--- !u!114 &430675504 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + m_PrefabInstance: {fileID: 1101333109} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 430675494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f0f1834ce0c7b0b42b633a6d2bd67698, type: 3} + m_Name: + m_EditorClassIdentifier: '::' --- !u!1 &437446538 GameObject: m_ObjectHideFlags: 0 @@ -440322,7 +440333,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 47259b63379fb1b40aa2650a13f01fd1, type: 3} m_Name: m_EditorClassIdentifier: '::' - birdsLeftInLevel: 0 + birdsFoundInLevel: 0 --- !u!4 &708284666 Transform: m_ObjectHideFlags: 0 @@ -443045,6 +443056,135 @@ Transform: m_CorrespondingSourceObject: {fileID: 5507990123417429516, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} m_PrefabInstance: {fileID: 1428802629} m_PrefabAsset: {fileID: 0} +--- !u!1 &872605978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 872605980} + - component: {fileID: 872605979} + m_Layer: 0 + m_Name: MowerSFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &872605979 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872605978} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 1171626333864818265, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: 082fcd5bdadf2884e9aefc6abf4a5cc5, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 10 + MaxDistance: 30 + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &872605980 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872605978} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: 0.21643952, w: 0.97629607} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1481757350} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &874984580 GameObject: m_ObjectHideFlags: 0 @@ -448265,6 +448405,38 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 11.47 objectReference: {fileID: 0} + - target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: gardenerSprite + value: + objectReference: {fileID: 2122075110} + - target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: mowerLoopAudio + value: + objectReference: {fileID: 8300000, guid: d28a7eebafdc6064ba95bde0f6056d56, type: 3} + - target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: mowerStartAudio + value: + objectReference: {fileID: 8300000, guid: 082fcd5bdadf2884e9aefc6abf4a5cc5, type: 3} + - target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: mowerAudioPlayer + value: + objectReference: {fileID: 872605979} + - target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: gardenerAudioPlayer + value: + objectReference: {fileID: 1682591190} + - target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: gardenerFleeAudioClip + value: + objectReference: {fileID: 6418180475301049370, guid: 4949348ce86bb9e43a4251c06c1cb5d1, type: 2} + - target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: gardenerChaseAudioClip + value: + objectReference: {fileID: 6418180475301049370, guid: 97ccaa2fcf396f446aa7fde8586d225a, type: 2} + - target: {fileID: 6510906053583315767, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} + propertyPath: m_EditorClassIdentifier + value: '::' + objectReference: {fileID: 0} - target: {fileID: 7508885060277519207, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_Enabled value: 1 @@ -454684,6 +454856,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1417937103223012543, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} m_PrefabInstance: {fileID: 4912039252317080710} m_PrefabAsset: {fileID: 0} +--- !u!4 &1481757350 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6004009293778554413, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} + m_PrefabInstance: {fileID: 4912039252317080710} + m_PrefabAsset: {fileID: 0} --- !u!4 &1482548983 stripped Transform: m_CorrespondingSourceObject: {fileID: 7902426247424835304, guid: e958998c2a0c82246b6269c32eb2a297, type: 3} @@ -458748,6 +458925,7 @@ GameObject: - component: {fileID: 1682591187} - component: {fileID: 1682591186} - component: {fileID: 1682591189} + - component: {fileID: 1682591190} m_Layer: 10 m_Name: GardenerRunning m_TagString: Untagged @@ -458815,6 +458993,7 @@ MonoBehaviour: chaseDelay: 0 animator: {fileID: 2122075109} lawnMowerRef: {fileID: 1481757349} + audioController: {fileID: 430675504} --- !u!114 &1682591189 MonoBehaviour: m_ObjectHideFlags: 0 @@ -458827,6 +459006,103 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!82 &1682591190 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682591184} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3533147658878909314, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 6418180475301049370, guid: 97ccaa2fcf396f446aa7fde8586d225a, type: 2} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 10 + MaxDistance: 50 + 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!1001 &1687785381 PrefabInstance: m_ObjectHideFlags: 0 @@ -467947,6 +468223,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} insertIndex: -1 addedObject: {fileID: 2122075108} + - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 2122075111} m_SourcePrefab: {fileID: 100100000, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} --- !u!4 &2122075106 stripped Transform: @@ -467975,6 +468254,24 @@ Animator: m_CorrespondingSourceObject: {fileID: 6340229455764265142, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} m_PrefabInstance: {fileID: 2122075105} m_PrefabAsset: {fileID: 0} +--- !u!212 &2122075110 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 5570919883172852520, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} + m_PrefabInstance: {fileID: 2122075105} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2122075111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122075107} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52a39ff5639315a499266196941d6894, type: 3} + m_Name: + m_EditorClassIdentifier: '::' + gardenerAudioController: {fileID: 430675504} --- !u!1001 &2125265433 PrefabInstance: m_ObjectHideFlags: 0 @@ -470191,6 +470488,10 @@ PrefabInstance: propertyPath: startPercentage value: 0.315 objectReference: {fileID: 0} + - target: {fileID: 3850626409469703279, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} + propertyPath: gardenerAudioController + value: + objectReference: {fileID: 430675504} - target: {fileID: 5810231361239686933, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].x value: 5.2875137 @@ -470333,6 +470634,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 106062057957134378, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} insertIndex: 0 addedObject: {fileID: 713720584} + - targetCorrespondingSourceObject: {fileID: 6004009293778554413, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} + insertIndex: -1 + addedObject: {fileID: 872605980} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3} --- !u!1001 &5288063114372713135 diff --git a/Assets/Scripts/Animation/GardenerChaseBehavior.cs b/Assets/Scripts/Animation/GardenerChaseBehavior.cs index b96401bb..ad639719 100644 --- a/Assets/Scripts/Animation/GardenerChaseBehavior.cs +++ b/Assets/Scripts/Animation/GardenerChaseBehavior.cs @@ -11,10 +11,14 @@ public class GardenerChaseBehavior : MonoBehaviour [SerializeField] private Animator animator; [SerializeField] public GameObject lawnMowerRef; private TweenBase tweenRef; + public GardenerAudioController audioController; + + // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { tweenRef = Tween.Spline (ChaseSpline, GardenerObject, 0, 1, false, chaseDuration, chaseDelay, Tween.EaseLinear, Tween.LoopType.None, HandleTweenStarted, HandleTweenFinished); + } void HandleTweenFinished () diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs b/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs index aeb9561c..78b7cabe 100644 --- a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs +++ b/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnMowerChaseBehaviour.cs @@ -21,6 +21,7 @@ public class LawnMowerChaseBehaviour : MonoBehaviour public GameObject gardenerRef = null; public Animator gardenerAnimator = null; public bool gardenerChasing = true; + public GardenerAudioController gardenerAudioController; void Start() { @@ -28,6 +29,7 @@ public class LawnMowerChaseBehaviour : MonoBehaviour float distanceToStart = Mathf.Abs(startPercentage - 0f); float distanceToEnd = Mathf.Abs(startPercentage - 1f); + gardenerAudioController.StartMowerSound(); if (distanceToStart < distanceToEnd) { diff --git a/Assets/Scripts/Sound/GardenerAudioController.cs b/Assets/Scripts/Sound/GardenerAudioController.cs new file mode 100644 index 00000000..b83dfab9 --- /dev/null +++ b/Assets/Scripts/Sound/GardenerAudioController.cs @@ -0,0 +1,62 @@ +using AudioSourceEvents; +using System; +using System.Diagnostics.Tracing; +using UnityEngine; +using UnityEngine.Audio; + +public class GardenerAudioController : MonoBehaviour +{ + + public AudioSource gardenerAudioPlayer; + public AudioSource mowerAudioPlayer; + public AudioResource mowerStartAudio; + public AudioResource mowerLoopAudio; + public AudioResource gardenerFleeAudioClip; + public AudioResource gardenerChaseAudioClip; + + public SpriteRenderer gardenerSprite; + + private IAudioEventSource _eventSource; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + } + + void GardenerIsOnScreen() + { + Debug.Log("Gardener spotted!"); + } + + public void StartMowerSound() + { + mowerAudioPlayer.Play(); + _eventSource = mowerAudioPlayer.RequestEventHandlers(); + _eventSource.AudioStopped += PlayMowerLoop; + + } + + private void PlayMowerLoop(object sender, EventArgs e) + { + _eventSource.AudioStopped -= PlayMowerLoop; + mowerAudioPlayer.resource = mowerLoopAudio; + mowerAudioPlayer.loop = true; + mowerAudioPlayer.Play(); + } + + public void PlayGardenerVOClip(bool fleeing) + { + if (gardenerAudioPlayer.isPlaying) { return; } + if (fleeing) { + gardenerAudioPlayer.resource = gardenerFleeAudioClip; + gardenerAudioPlayer.Play(); + } + if (!fleeing) + { + gardenerAudioPlayer.resource = gardenerChaseAudioClip; + gardenerAudioPlayer.Play(); + + } + + } +} diff --git a/Assets/Scripts/Sound/GardenerAudioController.cs.meta b/Assets/Scripts/Sound/GardenerAudioController.cs.meta new file mode 100644 index 00000000..34db7ff6 --- /dev/null +++ b/Assets/Scripts/Sound/GardenerAudioController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f0f1834ce0c7b0b42b633a6d2bd67698 \ No newline at end of file diff --git a/Assets/Scripts/Sound/GardenerVisibilityDetection.cs b/Assets/Scripts/Sound/GardenerVisibilityDetection.cs new file mode 100644 index 00000000..c3ecc466 --- /dev/null +++ b/Assets/Scripts/Sound/GardenerVisibilityDetection.cs @@ -0,0 +1,21 @@ +using TMPro; +using UnityEngine; + + +public class GardenerVisibilityDetection : MonoBehaviour +{ + public GardenerAudioController gardenerAudioController; + private Animator _animator; + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + _animator = GetComponent(); + } + + private void OnBecameVisible() + { + gardenerAudioController.PlayGardenerVOClip(_animator.GetBool("IsScared?")); + + } + +} diff --git a/Assets/Scripts/Sound/GardenerVisibilityDetection.cs.meta b/Assets/Scripts/Sound/GardenerVisibilityDetection.cs.meta new file mode 100644 index 00000000..b3675f07 --- /dev/null +++ b/Assets/Scripts/Sound/GardenerVisibilityDetection.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 52a39ff5639315a499266196941d6894 \ No newline at end of file diff --git a/Assets/Sound/Quarry/TEMPAUDIO/mower_loop.wav b/Assets/Sound/Quarry/TEMPAUDIO/mower_loop.wav new file mode 100644 index 00000000..9f6df0b1 Binary files /dev/null and b/Assets/Sound/Quarry/TEMPAUDIO/mower_loop.wav differ diff --git a/Assets/Sound/Quarry/TEMPAUDIO/mower_loop.wav.meta b/Assets/Sound/Quarry/TEMPAUDIO/mower_loop.wav.meta new file mode 100644 index 00000000..d6d11be3 --- /dev/null +++ b/Assets/Sound/Quarry/TEMPAUDIO/mower_loop.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d28a7eebafdc6064ba95bde0f6056d56 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Quarry/TEMPAUDIO/mower_start.wav b/Assets/Sound/Quarry/TEMPAUDIO/mower_start.wav new file mode 100644 index 00000000..c86e901d Binary files /dev/null and b/Assets/Sound/Quarry/TEMPAUDIO/mower_start.wav differ diff --git a/Assets/Sound/Quarry/TEMPAUDIO/mower_start.wav.meta b/Assets/Sound/Quarry/TEMPAUDIO/mower_start.wav.meta new file mode 100644 index 00000000..1c77345c --- /dev/null +++ b/Assets/Sound/Quarry/TEMPAUDIO/mower_start.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 082fcd5bdadf2884e9aefc6abf4a5cc5 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Quarry/Voices/Gardener/gardener_chase.asset b/Assets/Sound/Quarry/Voices/Gardener/gardener_chase.asset new file mode 100644 index 00000000..686ec1af --- /dev/null +++ b/Assets/Sound/Quarry/Voices/Gardener/gardener_chase.asset @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1233149941 &-6300757241535428918 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gotcha4_{-6300757241535428918} + m_AudioClip: {fileID: 8300000, guid: 3eaabdc2b752b7749abe43bfeb9a76b2, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1233149941 &-6130579406768192317 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gotcha3_{-6130579406768192317} + m_AudioClip: {fileID: 8300000, guid: 2b0efcb56ff88244faf00f7af02d55fc, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1233149941 &-2401993488800243936 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gotcha2_{-2401993488800243936} + m_AudioClip: {fileID: 8300000, guid: 221a0aefd729ae94588acfb9b337e7cf, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1307931743 &6418180475301049370 +AudioRandomContainer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: gardener_chase + m_Volume: 0 + m_Pitch: 0 + m_AutomaticTriggerTime: 4 + m_LoopCount: 1 + m_VolumeRandomizationRange: {x: 0, y: 0} + m_PitchRandomizationRange: {x: 0, y: 0} + m_AutomaticTriggerTimeRandomizationRange: {x: 0, y: 4} + m_LoopCountRandomizationRange: {x: 0, y: 0} + m_Elements: + - {fileID: 7674516443378238336} + - {fileID: -2401993488800243936} + - {fileID: -6130579406768192317} + - {fileID: -6300757241535428918} + m_AvoidRepeatingLast: 2 + m_PlaybackMode: 2 + m_TriggerMode: 0 + m_AutomaticTriggerMode: 1 + m_LoopMode: 0 + m_VolumeRandomizationEnabled: 0 + m_PitchRandomizationEnabled: 0 + m_AutomaticTriggerTimeRandomizationEnabled: 0 + m_LoopCountRandomizationEnabled: 0 +--- !u!1233149941 &7674516443378238336 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gotcha1_{7674516443378238336} + m_AudioClip: {fileID: 8300000, guid: ceba6c129ddad3e42be967ca02d8a2bd, type: 3} + m_Volume: 0 + m_Enabled: 1 diff --git a/Assets/Sound/Quarry/Voices/Gardener/gardener_chase.asset.meta b/Assets/Sound/Quarry/Voices/Gardener/gardener_chase.asset.meta new file mode 100644 index 00000000..b6c7fada --- /dev/null +++ b/Assets/Sound/Quarry/Voices/Gardener/gardener_chase.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97ccaa2fcf396f446aa7fde8586d225a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6418180475301049370 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Quarry/Voices/Gardener/gardener_flee.asset b/Assets/Sound/Quarry/Voices/Gardener/gardener_flee.asset new file mode 100644 index 00000000..b3f83525 --- /dev/null +++ b/Assets/Sound/Quarry/Voices/Gardener/gardener_flee.asset @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1233149941 &-9006445417435446222 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ohno3_{-9006445417435446222} + m_AudioClip: {fileID: 8300000, guid: e82ce780c4bb0f749974b62cb30c471b, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1233149941 &-3577357751735622808 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ohno2_{-3577357751735622808} + m_AudioClip: {fileID: 8300000, guid: 1f8c0cce139cfdf42adc6676ea43b66d, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1233149941 &-2397706616386917472 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Longscream_{-2397706616386917472} + m_AudioClip: {fileID: 8300000, guid: af2f268ef07101049ad6268eb7c94b0d, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1233149941 &3731748606425802519 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ohno1_{3731748606425802519} + m_AudioClip: {fileID: 8300000, guid: aaa2a2b734528d24c9994f0e5273ad1a, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1233149941 &5536817073655588610 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ohno4_{5536817073655588610} + m_AudioClip: {fileID: 8300000, guid: b7e96231be2f34a4d8f41357550117a4, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1307931743 &6418180475301049370 +AudioRandomContainer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: gardener_flee + m_Volume: 0 + m_Pitch: 0 + m_AutomaticTriggerTime: 4 + m_LoopCount: 1 + m_VolumeRandomizationRange: {x: 0, y: 0} + m_PitchRandomizationRange: {x: 0, y: 0} + m_AutomaticTriggerTimeRandomizationRange: {x: 0, y: 0} + m_LoopCountRandomizationRange: {x: 0, y: 0} + m_Elements: + - {fileID: -2397706616386917472} + - {fileID: 3731748606425802519} + - {fileID: -3577357751735622808} + - {fileID: -9006445417435446222} + - {fileID: 5536817073655588610} + m_AvoidRepeatingLast: 2 + m_PlaybackMode: 2 + m_TriggerMode: 0 + m_AutomaticTriggerMode: 1 + m_LoopMode: 2 + m_VolumeRandomizationEnabled: 0 + m_PitchRandomizationEnabled: 0 + m_AutomaticTriggerTimeRandomizationEnabled: 0 + m_LoopCountRandomizationEnabled: 0 diff --git a/Assets/Sound/Quarry/Voices/Gardener/gardener_flee.asset.meta b/Assets/Sound/Quarry/Voices/Gardener/gardener_flee.asset.meta new file mode 100644 index 00000000..a92fb980 --- /dev/null +++ b/Assets/Sound/Quarry/Voices/Gardener/gardener_flee.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4949348ce86bb9e43a4251c06c1cb5d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6418180475301049370 + userData: + assetBundleName: + assetBundleVariant: