diff --git a/Assets/Resources/Audio/Story.mp3 b/Assets/Resources/Audio/Story.mp3 new file mode 100644 index 0000000..77b7cba Binary files /dev/null and b/Assets/Resources/Audio/Story.mp3 differ diff --git a/Assets/Resources/Audio/Story.mp3.meta b/Assets/Resources/Audio/Story.mp3.meta new file mode 100644 index 0000000..69573d7 --- /dev/null +++ b/Assets/Resources/Audio/Story.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a01c0a314f63f5c4aaf9d28a33e9d2f2 +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/GameOver.unity b/Assets/Scenes/GameOver.unity index ac639bb..3932586 100644 --- a/Assets/Scenes/GameOver.unity +++ b/Assets/Scenes/GameOver.unity @@ -283,7 +283,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1027433821 GameObject: @@ -363,7 +363,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1182104965 GameObject: @@ -599,7 +599,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1373063663 GameObject: @@ -690,6 +690,7 @@ GameObject: - component: {fileID: 1451273279} - component: {fileID: 1451273278} - component: {fileID: 1451273277} + - component: {fileID: 1451273280} m_Layer: 5 m_Name: Try Again Button m_TagString: Untagged @@ -796,6 +797,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1451273275} m_CullTransparentMesh: 1 +--- !u!114 &1451273280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451273275} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 14c874c8615088f458e5473b40714b56, type: 3} + m_Name: + m_EditorClassIdentifier: + button: {fileID: 1451273277} --- !u!1 &1774738188 GameObject: m_ObjectHideFlags: 0 @@ -895,7 +909,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1820456174 GameObject: @@ -1018,107 +1032,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &1946254062 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1946254065} - - component: {fileID: 1946254064} - - component: {fileID: 1946254063} - m_Layer: 0 - m_Name: GioBug0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &1946254063 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1946254062} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: c5cc1a1814d7d10428497366abbb55b6, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &1946254064 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1946254062} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, - type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.1875, y: 2.6875} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1946254065 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1946254062} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.00009226799, y: -3.7574763, 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!1 &1865143210 GameObject: m_ObjectHideFlags: 0 @@ -1246,6 +1159,107 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1946254062 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1946254065} + - component: {fileID: 1946254064} + - component: {fileID: 1946254063} + m_Layer: 0 + m_Name: GioBug0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &1946254063 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946254062} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c5cc1a1814d7d10428497366abbb55b6, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &1946254064 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946254062} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.1875, y: 2.6875} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1946254065 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946254062} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.00009226799, y: -3.7574763, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2106947132 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index b49a56e..650b826 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -1774,6 +1774,7 @@ Transform: - {fileID: 193535121} - {fileID: 1247097598} - {fileID: 851631687} + - {fileID: 1934521842} - {fileID: 8021909} - {fileID: 951888605} - {fileID: 1200440357} @@ -48034,6 +48035,12 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!4 &1934521842 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + m_PrefabInstance: {fileID: 1879087608} + m_PrefabAsset: {fileID: 0} --- !u!1 &2086987803 GameObject: m_ObjectHideFlags: 0 @@ -48144,12 +48151,12 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.x - value: 54.1 + value: 41.86 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.y - value: 32.6 + value: 22.8 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} diff --git a/Assets/Scripts/SceneLodarManual.cs b/Assets/Scripts/SceneLodarManual.cs new file mode 100644 index 0000000..44d1e2f --- /dev/null +++ b/Assets/Scripts/SceneLodarManual.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +public class SceneLodarManual : MonoBehaviour +{ + public Button button; + + // Start is called before the first frame update + void Start() + { + button.onClick.AddListener(LoadScene); + } + + void LoadScene() + { + SceneManager.LoadScene("LevelOne"); + } +} diff --git a/Assets/Scripts/SceneLodarManual.cs.meta b/Assets/Scripts/SceneLodarManual.cs.meta new file mode 100644 index 0000000..8bae9ec --- /dev/null +++ b/Assets/Scripts/SceneLodarManual.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 14c874c8615088f458e5473b40714b56 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SoundManagerScript.cs b/Assets/Scripts/SoundManagerScript.cs index 91d6ce5..b2f7347 100644 --- a/Assets/Scripts/SoundManagerScript.cs +++ b/Assets/Scripts/SoundManagerScript.cs @@ -36,43 +36,46 @@ public class SoundManagerScript : MonoBehaviour public static void PlaySound(string clip) { + AudioClip sound = null; switch (clip) { case "jump": - audioSrc.PlayOneShot(jumpSound); + sound = jumpSound; break; case "scream": - audioSrc.PlayOneShot(screamSound); + sound = screamSound; break; case "wrong": - audioSrc.PlayOneShot(wrongButtonSound); + sound = wrongButtonSound; break; case "bug laugh": - audioSrc.PlayOneShot(bugLaughSound); + sound = bugLaughSound; break; case "drink": - audioSrc.PlayOneShot(drinkSound); + sound = drinkSound; break; case "eat": - audioSrc.PlayOneShot(eatSound); + sound = eatSound; break; case "punch": - audioSrc.PlayOneShot(punchSound); + sound = punchSound; break; case "hard punch": - audioSrc.PlayOneShot(hardPunchSound); + sound = hardPunchSound; break; case "slap": - audioSrc.PlayOneShot(slapSound); + sound = slapSound; break; case "hard slap": - audioSrc.PlayOneShot(hardSlapSound); + sound = hardSlapSound; break; case "win": - audioSrc.clip = winSound; - audioSrc.PlayOneShot(winSound); + sound = winSound; break; } + + audioSrc.clip = sound; + audioSrc.PlayOneShot(sound); } }