diff --git a/Game/Assets/Prefabs/PlayerDroplet.prefab b/Game/Assets/Prefabs/PlayerDroplet.prefab index f76e71a..4675e23 100644 --- a/Game/Assets/Prefabs/PlayerDroplet.prefab +++ b/Game/Assets/Prefabs/PlayerDroplet.prefab @@ -15,6 +15,8 @@ GameObject: - component: {fileID: -8535381027169538} - component: {fileID: 5971260404453589572} - component: {fileID: 4218697106962905645} + - component: {fileID: -2923017547529843297} + - component: {fileID: 6923417058730395781} m_Layer: 0 m_Name: PlayerDroplet m_TagString: Player @@ -189,6 +191,7 @@ MonoBehaviour: dashingCooldown: 1 tr: {fileID: 0} animator: {fileID: 4218697106962905645} + fallingAnimationVelocityThreshold: 3 --- !u!111 &5971260404453589572 Animation: m_ObjectHideFlags: 0 @@ -229,3 +232,121 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!82 &-2923017547529843297 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141180002423843430} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: a2bc0335c81b4244397158d9fcb5f586, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &6923417058730395781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141180002423843430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b3b9fc97a2d39d2d84c4be43a79247a, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::DamageHandler + threshold: 12 + multiplier: 0.1 + maxHealth: 1 + health: 0 + minSize: 0.4 + maxFallingTime: 2 + fallingAnimTreshold: 0.2 + speaker: {fileID: -2923017547529843297} + fallsound: {fileID: 8300000, guid: a2bc0335c81b4244397158d9fcb5f586, type: 3} diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index 53f9fca..3e9993c 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -1987,97 +1987,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3} ---- !u!1 &356922750 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 356922751} - - component: {fileID: 356922752} - m_Layer: 0 - m_Name: RootPlaceholder_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &356922751 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 356922750} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.8141, y: 8.40522, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1971744273} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &356922752 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 356922750} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_Sprite: {fileID: 7024218491085898663, guid: b814efef9b884f24c8d7e5c2fb610405, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 38.399998, y: 19.73} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 --- !u!1001 &361290210 PrefabInstance: m_ObjectHideFlags: 0 @@ -4237,6 +4146,8 @@ MonoBehaviour: minSize: 0.4 maxFallingTime: 2 fallingAnimTreshold: 0.2 + speaker: {fileID: 0} + fallsound: {fileID: 0} --- !u!1001 &687478031 PrefabInstance: m_ObjectHideFlags: 0 @@ -9883,10 +9794,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} propertyPath: m_SortingOrder value: 2 @@ -9931,9 +9838,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} insertIndex: -1 addedObject: {fileID: 1293808330} - - targetCorrespondingSourceObject: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} - insertIndex: -1 - addedObject: {fileID: 1971744273} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} insertIndex: -1 @@ -11674,85 +11578,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3} m_PrefabInstance: {fileID: 84215940} m_PrefabAsset: {fileID: 0} ---- !u!1 &1971744272 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1971744273} - - component: {fileID: 1971744274} - m_Layer: 0 - m_Name: EndScene - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1971744273 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1971744272} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 356922751} - m_Father: {fileID: 526821486} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1971744274 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1971744272} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: -1.5349579, y: -0.75377536} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 33.672714, y: 1.3563313} - m_EdgeRadius: 0 --- !u!1001 &1979875377 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Game/Assets/Scenes/4_Fall down scene.unity b/Game/Assets/Scenes/4_Fall down scene.unity index 31092db..00ca5f4 100644 --- a/Game/Assets/Scenes/4_Fall down scene.unity +++ b/Game/Assets/Scenes/4_Fall down scene.unity @@ -130,6 +130,7 @@ GameObject: - component: {fileID: 709184035} - component: {fileID: 709184034} - component: {fileID: 709184033} + - component: {fileID: 709184036} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -211,8 +212,195 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &709184036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709184032} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!1 &1371773278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1371773279} + - component: {fileID: 1371773281} + - component: {fileID: 1371773280} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1371773279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371773278} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1371773280 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371773278} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: c1cd8375a68188e4e87dcd9e361257cd, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1371773281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371773278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d46cd926be38836499dc229fa9707a83, type: 3} + m_Name: + m_EditorClassIdentifier: '::' --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 709184035} + - {fileID: 1371773279} diff --git a/Game/Assets/Scenes/NikolaScene.unity b/Game/Assets/Scenes/NikolaScene.unity index 68969a7..62a8787 100644 --- a/Game/Assets/Scenes/NikolaScene.unity +++ b/Game/Assets/Scenes/NikolaScene.unity @@ -590,6 +590,119 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: be3a9de7cfa00b3c4b66acee4ff178f6, type: 3} +--- !u!1 &1110649766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1110649769} + - component: {fileID: 1110649768} + - component: {fileID: 1110649767} + m_Layer: 0 + m_Name: Ground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1110649767 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110649766} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 0.2} + m_Center: {x: 0, y: 0, z: 0} +--- !u!212 &1110649768 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110649766} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.25, g: 0.085794665, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!4 &1110649769 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1110649766} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.69473, y: -0.72, z: 0} + m_LocalScale: {x: 26.08, y: 4.6, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1124127124 stripped Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} @@ -798,7 +911,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} propertyPath: m_LocalPosition.y - value: 6.31478 + value: 12.41 objectReference: {fileID: 0} - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} propertyPath: m_LocalPosition.z @@ -1104,3 +1217,4 @@ SceneRoots: - {fileID: 750131492} - {fileID: 488250683} - {fileID: 767577602} + - {fileID: 1110649769} diff --git a/Game/Assets/Scripts/DamageHandler.cs b/Game/Assets/Scripts/DamageHandler.cs index 91a8d49..ec6db82 100644 --- a/Game/Assets/Scripts/DamageHandler.cs +++ b/Game/Assets/Scripts/DamageHandler.cs @@ -19,6 +19,10 @@ public class DamageHandler : MonoBehaviour public float maxFallingTime = 2f; public float fallingAnimTreshold = 0.2f; + //audio stuff + public AudioSource speaker; + public AudioClip fallsound; + private void Awake() { @@ -69,16 +73,28 @@ public class DamageHandler : MonoBehaviour } private void OnCollisionEnter2D(Collision2D other) - { - // Debug.LogWarning("collide"); - //on collision check fall damage - float fallSpeed = lastYVelocity; - if (fallSpeed < -threshold) - { - float fallDamage = (-fallSpeed - threshold) * multiplier; - UpdateHealth(health - fallDamage); - } - } +{ + float fallSpeed = lastYVelocity; + + // Check if we hit hard enough + if (fallSpeed < -threshold) + { + Debug.Log("Impact detected! Speed: " + fallSpeed); + + if (speaker != null && fallsound != null) + { + speaker.PlayOneShot(fallsound); + Debug.Log("Sound played successfully."); + } + else + { + Debug.LogWarning("AudioSource or AudioClip is missing in the Inspector!"); + } + + float fallDamage = (-fallSpeed - threshold) * multiplier; + UpdateHealth(health - fallDamage); + } +} private void OnTriggerEnter2D(Collider2D other) { diff --git a/Game/Assets/Scripts/FalldownScene.cs b/Game/Assets/Scripts/FalldownScene.cs new file mode 100644 index 0000000..b5a4584 --- /dev/null +++ b/Game/Assets/Scripts/FalldownScene.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +public class FalldownScene : MonoBehaviour +{ + void Awake() + { + // This tells Unity NOT to destroy this object when loading a new scene + DontDestroyOnLoad(gameObject); + } +} diff --git a/Game/Assets/Scripts/FalldownScene.cs.meta b/Game/Assets/Scripts/FalldownScene.cs.meta new file mode 100644 index 0000000..b3df212 --- /dev/null +++ b/Game/Assets/Scripts/FalldownScene.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d46cd926be38836499dc229fa9707a83 \ No newline at end of file diff --git a/Game/Assets/Scripts/StartScene.cs b/Game/Assets/Scripts/StartScene.cs index 62c5f16..0c99ae0 100644 --- a/Game/Assets/Scripts/StartScene.cs +++ b/Game/Assets/Scripts/StartScene.cs @@ -23,7 +23,7 @@ public class StartScene : MonoBehaviour mySpeaker.PlayOneShot(jingle); // 2. Wait for the length of the sound clip (or a fixed time) - yield return new WaitForSeconds(jingle.length - 0.5f); + yield return new WaitForSeconds(0.4f); // 3. Now it is safe to load the scene SceneManager.LoadScene(0, LoadSceneMode.Single); diff --git a/Game/Assets/Scripts/TreeDecorations.cs b/Game/Assets/Scripts/TreeDecorations.cs deleted file mode 100644 index bd47449..0000000 --- a/Game/Assets/Scripts/TreeDecorations.cs +++ /dev/null @@ -1,43 +0,0 @@ -using UnityEngine; - -public class TreeDecorations : MonoBehaviour -{ - public GameObject[] decorationPrefabs; - - public int minAmount = 2; - public int maxAmount = 6; - - public float minY = -4f; - public float maxY = 4f; - - public float minScale = 0.5f; - public float maxScale = 1.5f; - - void Start() - { - int amount = Random.Range(minAmount, maxAmount + 1); - - for (int i = 0; i < amount; i++) - { - GameObject prefab = decorationPrefabs[ - Random.Range(0, decorationPrefabs.Length) - ]; - - float randomY = Random.Range(minY, maxY); - - float side = Random.value < 0.5f ? -1f : 1f; - float randomX = side * Random.Range(1.5f, 3f); - - Vector3 spawnPos = transform.position + new Vector3(randomX, randomY, 0); - - GameObject decoration = Instantiate(prefab, spawnPos, Quaternion.identity, transform); - - float randomScale = Random.Range(minScale, maxScale); - decoration.transform.localScale = new Vector3( - randomScale * side, - randomScale, - 1 - ); - } - } -} \ No newline at end of file diff --git a/Game/Assets/Scripts/TreeDecorations.cs.meta b/Game/Assets/Scripts/TreeDecorations.cs.meta deleted file mode 100644 index d64b543..0000000 --- a/Game/Assets/Scripts/TreeDecorations.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 727394ee11af15e40a3af3dee3fbb28a \ No newline at end of file diff --git a/music/BGmusic_rainy_loop.mp3 b/music/BGmusic_rainy_loop.mp3 new file mode 100644 index 0000000..65a1b0f Binary files /dev/null and b/music/BGmusic_rainy_loop.mp3 differ