diff --git a/2D Winter Adventure/Assets/Animations/Image.controller b/2D Winter Adventure/Assets/Animations/Image.controller new file mode 100644 index 0000000000000000000000000000000000000000..65cca84020c44f5956dd338990a392ef130a4237 --- /dev/null +++ b/2D Winter Adventure/Assets/Animations/Image.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Image + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6686519614073463844} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &680220378635649114 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Menu + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 06003d324030a744f9c148a048b85c87, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &6686519614073463844 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 680220378635649114} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 680220378635649114} diff --git a/2D Winter Adventure/Assets/Animations/Image.controller.meta b/2D Winter Adventure/Assets/Animations/Image.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..999bc2ecb9b45ba1964d16d2a2d714e0719de13f --- /dev/null +++ b/2D Winter Adventure/Assets/Animations/Image.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52e481c9301a01746aaf41fceb9a347c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2D Winter Adventure/Assets/Animations/Menu.anim b/2D Winter Adventure/Assets/Animations/Menu.anim new file mode 100644 index 0000000000000000000000000000000000000000..7e8540777ee639d0c7368ce91ee483e649674a80 --- /dev/null +++ b/2D Winter Adventure/Assets/Animations/Menu.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Menu + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 72de0c64f2c6a498096698322c976a67, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: c8a742c1f2ebb43b9afe34a47304c051, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 077f0469c420a4365bc67943783293df, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 8bc3c2c2a565342aab778fd8e874313a, type: 3} + attribute: m_Sprite + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 2015549526 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 72de0c64f2c6a498096698322c976a67, type: 3} + - {fileID: 21300000, guid: c8a742c1f2ebb43b9afe34a47304c051, type: 3} + - {fileID: 21300000, guid: 077f0469c420a4365bc67943783293df, type: 3} + - {fileID: 21300000, guid: 8bc3c2c2a565342aab778fd8e874313a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.33333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/2D Winter Adventure/Assets/Animations/Menu.anim.meta b/2D Winter Adventure/Assets/Animations/Menu.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..144839455c1eb29b2a56a068495df0d2923c7971 --- /dev/null +++ b/2D Winter Adventure/Assets/Animations/Menu.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06003d324030a744f9c148a048b85c87 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2D Winter Adventure/Assets/Audio/Achievement_02.wav b/2D Winter Adventure/Assets/Audio/Achievement_02.wav new file mode 100644 index 0000000000000000000000000000000000000000..ebe134cc53ff3a4c80e514416da61338ee4251b6 Binary files /dev/null and b/2D Winter Adventure/Assets/Audio/Achievement_02.wav differ diff --git a/2D Winter Adventure/Assets/Audio/Achievement_02.wav.meta b/2D Winter Adventure/Assets/Audio/Achievement_02.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..b192889a97d87dc000af9429a846413b7ea2a5e3 --- /dev/null +++ b/2D Winter Adventure/Assets/Audio/Achievement_02.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 2acb75d7981b62840bb3b6449fed5623 +timeCreated: 1547423141 +licenseType: Store +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/2D Winter Adventure/Assets/Audio/Collectable.wav b/2D Winter Adventure/Assets/Audio/Collectable.wav new file mode 100644 index 0000000000000000000000000000000000000000..7e01a42ad033dac6ef4557d6650560609410a724 Binary files /dev/null and b/2D Winter Adventure/Assets/Audio/Collectable.wav differ diff --git a/2D Winter Adventure/Assets/Audio/Collectable.wav.meta b/2D Winter Adventure/Assets/Audio/Collectable.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..15a7a15e8d4217e6d34387296462180e4d4121ab --- /dev/null +++ b/2D Winter Adventure/Assets/Audio/Collectable.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: af5f8b64e3f58f24c87ff8f789b04f6c +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/2D Winter Adventure/Assets/Audio/Hit for enemy 1.wav b/2D Winter Adventure/Assets/Audio/Hit for enemy 1.wav new file mode 100644 index 0000000000000000000000000000000000000000..04202b585e16ad9de11f0f7202140444feccb62a Binary files /dev/null and b/2D Winter Adventure/Assets/Audio/Hit for enemy 1.wav differ diff --git a/2D Winter Adventure/Assets/Audio/Hit for enemy 1.wav.meta b/2D Winter Adventure/Assets/Audio/Hit for enemy 1.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..3c514af429c9b1826ed89bd7e10143fa0df7ce5a --- /dev/null +++ b/2D Winter Adventure/Assets/Audio/Hit for enemy 1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ae904c7305df7344d86b2092c0cb3a26 +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/2D Winter Adventure/Assets/Audio/Hit for enemy 2.wav b/2D Winter Adventure/Assets/Audio/Hit for enemy 2.wav new file mode 100644 index 0000000000000000000000000000000000000000..6faaf8eb92ddb65f095d17d04f1ee1edc637664d Binary files /dev/null and b/2D Winter Adventure/Assets/Audio/Hit for enemy 2.wav differ diff --git a/2D Winter Adventure/Assets/Audio/Hit for enemy 2.wav.meta b/2D Winter Adventure/Assets/Audio/Hit for enemy 2.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..14fb384dfc86d13ffe60500983ecb8ecf816d561 --- /dev/null +++ b/2D Winter Adventure/Assets/Audio/Hit for enemy 2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 709a835b61b848644946696fdd5e5a4d +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/2D Winter Adventure/Assets/Audio/Player Hit.wav b/2D Winter Adventure/Assets/Audio/Player Hit.wav new file mode 100644 index 0000000000000000000000000000000000000000..b6b96e75ba6f1eefba9daecd7e6c103d4140cec6 Binary files /dev/null and b/2D Winter Adventure/Assets/Audio/Player Hit.wav differ diff --git a/2D Winter Adventure/Assets/Audio/Player Hit.wav.meta b/2D Winter Adventure/Assets/Audio/Player Hit.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..153158875bf1193e39efa024250729fa6b4d3805 --- /dev/null +++ b/2D Winter Adventure/Assets/Audio/Player Hit.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9b1bb1f450b7d444fa4a8019d13519a7 +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/2D Winter Adventure/Assets/Audio/Quest Complete.wav b/2D Winter Adventure/Assets/Audio/Quest Complete.wav new file mode 100644 index 0000000000000000000000000000000000000000..9c9c4b4e5a9fef93cb248b29dda129e55bd6b0a7 Binary files /dev/null and b/2D Winter Adventure/Assets/Audio/Quest Complete.wav differ diff --git a/2D Winter Adventure/Assets/Audio/Quest Complete.wav.meta b/2D Winter Adventure/Assets/Audio/Quest Complete.wav.meta new file mode 100644 index 0000000000000000000000000000000000000000..e1679612b300efaf825174a5607e677ba3c6640c --- /dev/null +++ b/2D Winter Adventure/Assets/Audio/Quest Complete.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f987bfc0b774d3f4e82dc47e91f78584 +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/2D Winter Adventure/Assets/Audio/Sneaky Adventure.mp3 b/2D Winter Adventure/Assets/Audio/Sneaky Adventure.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..5f9eea2e3653143f23abefea72291a14122572fc Binary files /dev/null and b/2D Winter Adventure/Assets/Audio/Sneaky Adventure.mp3 differ diff --git a/2D Winter Adventure/Assets/Audio/Sneaky Adventure.mp3.meta b/2D Winter Adventure/Assets/Audio/Sneaky Adventure.mp3.meta new file mode 100644 index 0000000000000000000000000000000000000000..66a54874ffd4d4227551657414de713adc016ec4 --- /dev/null +++ b/2D Winter Adventure/Assets/Audio/Sneaky Adventure.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 32f0791859af41f49a115a81015eb542 +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/2D Winter Adventure/Assets/Prefabs/Cherry.prefab b/2D Winter Adventure/Assets/Prefabs/Cherry.prefab index 055963e21d6bcfdaf50aa356432db7446550dde6..836501963d861d45d70cb370cd37223979c39d63 100644 --- a/2D Winter Adventure/Assets/Prefabs/Cherry.prefab +++ b/2D Winter Adventure/Assets/Prefabs/Cherry.prefab @@ -141,3 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26980b983dccccd458659f3d31fbe6de, type: 3} m_Name: m_EditorClassIdentifier: + collectedClip: {fileID: 8300000, guid: 2acb75d7981b62840bb3b6449fed5623, type: 3} diff --git a/2D Winter Adventure/Assets/Prefabs/GameManager.prefab b/2D Winter Adventure/Assets/Prefabs/GameManager.prefab index 2a4f7634c69c4870f77f364af41dfc3187880997..2533e1e5e94bd495978b4d92131aa211812931b7 100644 --- a/2D Winter Adventure/Assets/Prefabs/GameManager.prefab +++ b/2D Winter Adventure/Assets/Prefabs/GameManager.prefab @@ -45,3 +45,5 @@ MonoBehaviour: m_EditorClassIdentifier: restartDelay: 1 completeLevelUI: {fileID: 0} + audiofader: {fileID: 0} + gameoverClip: {fileID: 8300000, guid: 709a835b61b848644946696fdd5e5a4d, type: 3} diff --git a/2D Winter Adventure/Assets/Prefabs/Gem.prefab b/2D Winter Adventure/Assets/Prefabs/Gem.prefab index 35697633e5ec0bea210e79528ecb3cdc68afdf91..eea8d28cc5639812b99fc91a51e9fe0418cbbddf 100644 --- a/2D Winter Adventure/Assets/Prefabs/Gem.prefab +++ b/2D Winter Adventure/Assets/Prefabs/Gem.prefab @@ -141,3 +141,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fbc0939bc749b9040864120ff84b90eb, type: 3} m_Name: m_EditorClassIdentifier: + gemClip: {fileID: 8300000, guid: af5f8b64e3f58f24c87ff8f789b04f6c, type: 3} diff --git a/2D Winter Adventure/Assets/Prefabs/Player.prefab b/2D Winter Adventure/Assets/Prefabs/Player.prefab index d4a3be9d38df21bce6637ede7845f78fd8a9235b..bcc4e1867552cf2fe9e362cc9bf96226febe4d9d 100644 --- a/2D Winter Adventure/Assets/Prefabs/Player.prefab +++ b/2D Winter Adventure/Assets/Prefabs/Player.prefab @@ -47,6 +47,7 @@ GameObject: - component: {fileID: 5335329042344907596} - component: {fileID: 5335329042344907597} - component: {fileID: 5335329042344907598} + - component: {fileID: 5162732165576455276} m_Layer: 8 m_Name: Player m_TagString: Untagged @@ -164,6 +165,7 @@ MonoBehaviour: maxHealth: 3 animator: {fileID: 5335329042344907574} controller: {fileID: 0} + audioClip: {fileID: 8300000, guid: 9b1bb1f450b7d444fa4a8019d13519a7, type: 3} OnLandEvent: m_PersistentCalls: m_Calls: @@ -282,6 +284,102 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 472bde7f6f8b35b4facbc55c7d9d2ca1, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!82 &5162732165576455276 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5335329042344907573} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + 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!1 &5335329043638960545 GameObject: m_ObjectHideFlags: 0 diff --git a/2D Winter Adventure/Assets/Scenes/Credits.unity b/2D Winter Adventure/Assets/Scenes/Credits.unity index aee57d8ba17852a4687e53c5775d00406c2cc608..6fb11934e9ad6cc19646705165e577ed6d3a8c66 100644 --- a/2D Winter Adventure/Assets/Scenes/Credits.unity +++ b/2D Winter Adventure/Assets/Scenes/Credits.unity @@ -990,8 +990,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 2637444149 - m_fontColor: {r: 0.20754719, g: 0.2046102, b: 0.2046102, a: 0.6156863} + rgba: 3369502242 + m_fontColor: {r: 0.13238695, g: 0.52725214, b: 0.8392157, a: 0.78431374} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1077,6 +1077,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1420551918} m_CullTransparentMesh: 0 +--- !u!1001 &1446959749 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7356272244859295632, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_Volume + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalPosition.x + value: 462.38367 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalPosition.y + value: 322.9906 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalPosition.z + value: -12.9375 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295635, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_Name + value: BackgroundMusic + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 951f65b2a7f421f49bb9bbd44dcc238a, type: 3} --- !u!1 &1814303634 GameObject: m_ObjectHideFlags: 0 diff --git a/2D Winter Adventure/Assets/Scenes/Level01.unity b/2D Winter Adventure/Assets/Scenes/Level01.unity index bee0d360cce2681ab6bb8f0b98cd2ee03b31508e..c69c08f11ed2138e606161a897d8eeca858df89c 100644 --- a/2D Winter Adventure/Assets/Scenes/Level01.unity +++ b/2D Winter Adventure/Assets/Scenes/Level01.unity @@ -7855,6 +7855,11 @@ PrefabInstance: propertyPath: audiofader value: objectReference: {fileID: 1994277102} + - target: {fileID: 7330222830062786312, guid: 4429e565929242a43a6951f6aa8f4607, + type: 3} + propertyPath: gameoverClip + value: + objectReference: {fileID: 8300000, guid: 709a835b61b848644946696fdd5e5a4d, type: 3} - target: {fileID: 7330222830062786312, guid: 4429e565929242a43a6951f6aa8f4607, type: 3} propertyPath: completeLevelUI @@ -7928,7 +7933,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 1641110972} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 2015215804} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dffeb4dc5f1248445b72b451a5aeb9c1, type: 3} @@ -8773,6 +8778,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5335329042344907571, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: audioClip + value: + objectReference: {fileID: 8300000, guid: 9b1bb1f450b7d444fa4a8019d13519a7, type: 3} - target: {fileID: 5335329042344907573, guid: 05457588931ed6149a021a456ded96f7, type: 3} propertyPath: m_Name @@ -9110,6 +9120,108 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1e5ee0d3600b74a46b6cc6b574011c44, type: 3} +--- !u!1 &2015215804 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7330222830062786313, guid: 4429e565929242a43a6951f6aa8f4607, + type: 3} + m_PrefabInstance: {fileID: 1641110972} + m_PrefabAsset: {fileID: 0} +--- !u!82 &2015215806 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2015215804} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + 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!1001 &2024961977 PrefabInstance: m_ObjectHideFlags: 0 @@ -9922,6 +10034,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 7356272244859295632, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_Volume + value: 0.72 + objectReference: {fileID: 0} - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, type: 3} propertyPath: m_RootOrder diff --git a/2D Winter Adventure/Assets/Scenes/Level02.unity b/2D Winter Adventure/Assets/Scenes/Level02.unity index ac08ca8a6c1f40187a00b05a51f546f374abf7bf..11cb5934d3fba652541a72b0ec0ba2532d708dc2 100644 --- a/2D Winter Adventure/Assets/Scenes/Level02.unity +++ b/2D Winter Adventure/Assets/Scenes/Level02.unity @@ -2747,7 +2747,7 @@ PrefabInstance: - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, type: 3} @@ -3295,6 +3295,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 465933093} m_PrefabAsset: {fileID: 0} +--- !u!114 &470919512 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5335329042344907571, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + m_PrefabInstance: {fileID: 1430917306} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaf90326dcfe56408293f8b90d7c16c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &472176373 GameObject: m_ObjectHideFlags: 0 @@ -3481,7 +3493,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe60f950fc5edb044ac6aacd0d714843, type: 3} m_Name: m_EditorClassIdentifier: - controller: {fileID: 891860031} + controller: {fileID: 470919512} cherriesText: {fileID: 492231689} --- !u!114 &492231689 MonoBehaviour: @@ -3886,7 +3898,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 1797953156} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1305393904} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dffeb4dc5f1248445b72b451a5aeb9c1, type: 3} @@ -3976,7 +3988,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563797540} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.234111, y: 0.012265086, z: -10} + m_LocalPosition: {x: 2.356642, y: 0.005494833, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -4775,7 +4787,7 @@ Transform: - {fileID: 1030460651} - {fileID: 843456077} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &812719432 GameObject: @@ -5386,258 +5398,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be60ebc01ee8d0649b7ee202a70258db, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &891860025 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 891860028} - - component: {fileID: 891860027} - - component: {fileID: 891860026} - - component: {fileID: 891860031} - - component: {fileID: 891860030} - - component: {fileID: 891860029} - - component: {fileID: 891860032} - - component: {fileID: 891860033} - - component: {fileID: 891860034} - m_Layer: 8 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &891860026 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 891860025} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 42e671c6a02b7fe49b294f223b988d0a, 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 &891860027 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 891860025} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - 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: 5 - m_Sprite: {fileID: 21300000, guid: 72de0c64f2c6a498096698322c976a67, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.33, y: 0.32} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &891860028 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 891860025} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.33, y: -0.42, z: 0} - m_LocalScale: {x: 3.6682243, y: 3.6682243, z: 3.6682243} - m_Children: - - {fileID: 1745839790} - - {fileID: 1017158644} - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &891860029 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 891860025} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 699fb3b0c6a9032469e4f1ef7720ec45, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.0037306398, y: -0.08595395} - serializedVersion: 2 - m_Radius: 0.06909132 ---- !u!61 &891860030 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 891860025} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 699fb3b0c6a9032469e4f1ef7720ec45, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.0027734935, y: -0.022696394} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.33, y: 0.32} - newSize: {x: 0.33, y: 0.32} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.1340937, y: 0.11917191} - m_EdgeRadius: 0 ---- !u!114 &891860031 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 891860025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1eaf90326dcfe56408293f8b90d7c16c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_JumpForce: 700 - m_CrouchSpeed: 0.36 - m_MovementSmoothing: 0.05 - m_AirControl: 1 - m_WhatIsGround: - serializedVersion: 2 - m_Bits: 512 - m_GroundCheck: {fileID: 1017158644} - m_CeilingCheck: {fileID: 1745839790} - m_CrouchDisableCollider: {fileID: 891860030} - maxHealth: 3 - animator: {fileID: 891860026} - controller: {fileID: 0} - OnLandEvent: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 891860033} - m_MethodName: OnLanding - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - OnCrouchEvent: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 891860033} - m_MethodName: OnCrouching - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!50 &891860032 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 891860025} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 3 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 1 - m_Constraints: 4 ---- !u!114 &891860033 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 891860025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f763789811c09b64a9ade476becbef4c, type: 3} - m_Name: - m_EditorClassIdentifier: - controller: {fileID: 891860031} - runSpeed: 40 - animator: {fileID: 891860026} ---- !u!114 &891860034 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 891860025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 472bde7f6f8b35b4facbc55c7d9d2ca1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &898157641 stripped Transform: m_CorrespondingSourceObject: {fileID: 560722224044076160, guid: ce7cc9080fb5a894288ac52e639bfa56, @@ -7676,36 +7436,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4afc2bd612eb0d043bb3addb95248e30, type: 3} ---- !u!1 &1017158643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1017158644} - m_Layer: 8 - m_Name: GroundCheck - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1017158644 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1017158643} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.16, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 891860028} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1029541733 PrefabInstance: m_ObjectHideFlags: 0 @@ -7837,7 +7567,7 @@ Transform: - {fileID: 1155557824} - {fileID: 1840917141} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1087414973 GameObject: @@ -8254,7 +7984,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1194515403 GameObject: @@ -8293,7 +8023,7 @@ MonoBehaviour: m_Priority: 10 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} - m_Follow: {fileID: 891860028} + m_Follow: {fileID: 1430917307} m_Lens: FieldOfView: 60 OrthographicSize: 5 @@ -8317,12 +8047,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1194515403} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.33, y: 0.7800001, z: -10} + m_LocalPosition: {x: -3.3730004, y: -1.2119999, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 27452507} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1194515406 MonoBehaviour: @@ -8676,6 +8406,108 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 6.9472065, y: 0.5820427} m_EdgeRadius: 0 +--- !u!1 &1305393904 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7330222830062786313, guid: 4429e565929242a43a6951f6aa8f4607, + type: 3} + m_PrefabInstance: {fileID: 1797953156} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1305393905 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1305393904} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + 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!1 &1318269205 GameObject: m_ObjectHideFlags: 0 @@ -8888,6 +8720,81 @@ EdgeCollider2D: m_Points: - {x: -1.3947754, y: -2.5273476} - {x: 0.7354672, y: -1.4441987} +--- !u!1001 &1430917306 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_RootOrder + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.373 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.412 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335329042344907573, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 05457588931ed6149a021a456ded96f7, type: 3} +--- !u!4 &1430917307 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335329042344907568, guid: 05457588931ed6149a021a456ded96f7, + type: 3} + m_PrefabInstance: {fileID: 1430917306} + m_PrefabAsset: {fileID: 0} --- !u!1 &1440297251 GameObject: m_ObjectHideFlags: 0 @@ -9139,7 +9046,7 @@ Transform: - {fileID: 35762866} - {fileID: 1007866870} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1551420184 PrefabInstance: @@ -9444,7 +9351,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1603916681 PrefabInstance: @@ -10113,36 +10020,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4afc2bd612eb0d043bb3addb95248e30, type: 3} ---- !u!1 &1745839789 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1745839790} - m_Layer: 8 - m_Name: CeilingCheck - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1745839790 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1745839789} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.011, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 891860028} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1750663716 PrefabInstance: m_ObjectHideFlags: 0 @@ -10150,6 +10027,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 7356272244859295632, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_Volume + value: 0.8 + objectReference: {fileID: 0} - target: {fileID: 7356272244859295632, guid: 951f65b2a7f421f49bb9bbd44dcc238a, type: 3} propertyPath: m_audioClip @@ -10158,7 +10040,7 @@ PrefabInstance: - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, type: 3} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, type: 3} @@ -10242,7 +10124,7 @@ PrefabInstance: - target: {fileID: 7330222830062786319, guid: 4429e565929242a43a6951f6aa8f4607, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 7330222830062786319, guid: 4429e565929242a43a6951f6aa8f4607, type: 3} @@ -10487,7 +10369,7 @@ PrefabInstance: - target: {fileID: 1337350838357145725, guid: be11091170b92b945bff404c375ef3c4, type: 3} propertyPath: m_RootOrder - value: 14 + value: 13 objectReference: {fileID: 0} - target: {fileID: 1337350838357145725, guid: be11091170b92b945bff404c375ef3c4, type: 3} @@ -10815,7 +10697,7 @@ Transform: - {fileID: 1551420185} - {fileID: 1940935221} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2001025962 PrefabInstance: @@ -11434,7 +11316,7 @@ RectTransform: - {fileID: 492231687} - {fileID: 891355400} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11492,7 +11374,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5049b566daa8b2b4181f3e0fb38afe88, type: 3} m_Name: m_EditorClassIdentifier: - controller: {fileID: 891860031} + controller: {fileID: 470919512} scoreText: {fileID: 2106759824} --- !u!114 &2106759824 MonoBehaviour: diff --git a/2D Winter Adventure/Assets/Scenes/Menu.unity b/2D Winter Adventure/Assets/Scenes/Menu.unity index c8b90508f250e740d599538754118390b1002728..c8c984c6c8f56835538a89d65045e6149cb4806c 100644 --- a/2D Winter Adventure/Assets/Scenes/Menu.unity +++ b/2D Winter Adventure/Assets/Scenes/Menu.unity @@ -156,7 +156,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -21.452354, y: -19.307037} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &194478830 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.9137255} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.74509805} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -236,7 +236,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -119} + m_AnchoredPosition: {x: 0, y: -99} m_SizeDelta: {x: 136.0846, y: 51.637367} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &205243626 @@ -345,6 +345,174 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 205243624} m_CullTransparentMesh: 0 +--- !u!1001 &273415565 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5785038344251470592, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: secondsToFadeOut + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6635763981767305866, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_Name + value: AudioFader + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalPosition.x + value: 462.38367 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalPosition.y + value: 322.9906 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalPosition.z + value: -12.9375 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8973303232104547704, guid: 5efe4dd143376554d9e3f060ca4a9267, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5efe4dd143376554d9e3f060ca4a9267, type: 3} +--- !u!1 &281478337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 281478338} + - component: {fileID: 281478341} + - component: {fileID: 281478340} + - component: {fileID: 281478339} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &281478338 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281478337} + 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_Children: [] + m_Father: {fileID: 654820987} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -3, y: 121} + m_SizeDelta: {x: 72.11206, y: 72.112} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &281478339 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281478337} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 52e481c9301a01746aaf41fceb9a347c, 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!114 &281478340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281478337} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 8bc3c2c2a565342aab778fd8e874313a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &281478341 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281478337} + m_CullTransparentMesh: 0 --- !u!1 &654820983 GameObject: m_ObjectHideFlags: 0 @@ -436,6 +604,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1019650839} + - {fileID: 281478338} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -478,7 +647,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -8.7, y: 91} + m_AnchoredPosition: {x: -8.7, y: 29} m_SizeDelta: {x: 658.3734, y: 155.51645} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &752487193 @@ -531,8 +700,8 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -804,7 +973,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 7} + m_AnchoredPosition: {x: 0, y: -6} m_SizeDelta: {x: 640.9734, y: 138.43723} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1420551920 @@ -989,3 +1158,82 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1892457995 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7356272244859295632, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_Volume + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295632, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: 05701b094367edb4e9f4f5c6d8882fcd, type: 3} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalPosition.x + value: 462.38367 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalPosition.y + value: 322.9906 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalPosition.z + value: -12.9375 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295633, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356272244859295635, guid: 951f65b2a7f421f49bb9bbd44dcc238a, + type: 3} + propertyPath: m_Name + value: BackgroundMusic + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 951f65b2a7f421f49bb9bbd44dcc238a, type: 3} diff --git a/2D Winter Adventure/Assets/Scripts/CherryCollectible.cs b/2D Winter Adventure/Assets/Scripts/CherryCollectible.cs index f40ccaba6552f4d30ac27d3df501ef6641d606d6..3b4ba23e94b985898a354b3adb61215b198cba0f 100644 --- a/2D Winter Adventure/Assets/Scripts/CherryCollectible.cs +++ b/2D Winter Adventure/Assets/Scripts/CherryCollectible.cs @@ -4,6 +4,7 @@ using UnityEngine; public class CherryCollectible : MonoBehaviour { + public AudioClip collectedClip; private void OnTriggerEnter2D(Collider2D other) { PlayerController controller = other.GetComponent<PlayerController>(); @@ -14,6 +15,8 @@ public class CherryCollectible : MonoBehaviour { controller.ChangeHealth(1); Destroy(gameObject); + + controller.PlaySound(collectedClip); } } diff --git a/2D Winter Adventure/Assets/Scripts/GameManager.cs b/2D Winter Adventure/Assets/Scripts/GameManager.cs index d4d21d0ed1877acd9c3fe2dd79770e99abf9ec58..8cd140e9c8bced664ed9c98280638a5bd7cca8bc 100644 --- a/2D Winter Adventure/Assets/Scripts/GameManager.cs +++ b/2D Winter Adventure/Assets/Scripts/GameManager.cs @@ -7,6 +7,8 @@ public class GameManager : MonoBehaviour public float restartDelay = 3f; public GameObject completeLevelUI; public AudioFader audiofader; + public AudioClip gameoverClip; + private AudioSource audioSource; public void CompleteLevel() { @@ -16,9 +18,12 @@ public class GameManager : MonoBehaviour public void EndGame() { + audioSource = GetComponent<AudioSource>(); + if (gameHasEnded == false) { gameHasEnded = true; + audioSource.PlayOneShot(gameoverClip); Debug.Log("GAME OVER!"); Invoke("Restart", restartDelay); } diff --git a/2D Winter Adventure/Assets/Scripts/GemCollectible.cs b/2D Winter Adventure/Assets/Scripts/GemCollectible.cs index 346d21d97163961c642bc3696b6083d3e6f4a4a0..4d94524bd336c15f503487487c1a6ca92b5dc329 100644 --- a/2D Winter Adventure/Assets/Scripts/GemCollectible.cs +++ b/2D Winter Adventure/Assets/Scripts/GemCollectible.cs @@ -4,6 +4,8 @@ using UnityEngine; public class GemCollectible : MonoBehaviour { + public AudioClip gemClip; + private void OnTriggerEnter2D(Collider2D other) { PlayerController controller = other.GetComponent<PlayerController>(); @@ -11,6 +13,7 @@ public class GemCollectible : MonoBehaviour if (controller != null) { controller.ChangeDiamondAmount(); + controller.PlaySound(gemClip); Destroy(gameObject); } } diff --git a/2D Winter Adventure/Assets/Scripts/Menu.cs b/2D Winter Adventure/Assets/Scripts/Menu.cs index 0f66e6644daa9d8ef55cf9ee42b946233c89427e..b47fa16dd51d7eb4c7b0318bbe08df86d7fb7bb0 100644 --- a/2D Winter Adventure/Assets/Scripts/Menu.cs +++ b/2D Winter Adventure/Assets/Scripts/Menu.cs @@ -3,8 +3,12 @@ using UnityEngine.SceneManagement; public class Menu : MonoBehaviour { + AudioFader audiofader; + public void StartGame() { + audiofader = GameObject.Find("AudioFader").GetComponent<AudioFader>(); + audiofader.findAudio(); SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1); } } diff --git a/2D Winter Adventure/Assets/Scripts/PlayerController.cs b/2D Winter Adventure/Assets/Scripts/PlayerController.cs index 8bc1d239c8908369a70e606fb52d2ee1a1c5c916..22324a49daab0b80626cf34573c890da6eccd2d8 100644 --- a/2D Winter Adventure/Assets/Scripts/PlayerController.cs +++ b/2D Winter Adventure/Assets/Scripts/PlayerController.cs @@ -28,6 +28,8 @@ public class PlayerController : MonoBehaviour private int currentHealth; public Animator animator; public PlayerController controller; + private AudioSource audioSource; + public AudioClip audioClip; [Header("Events")] @@ -46,6 +48,7 @@ public class PlayerController : MonoBehaviour controller = gameObject.GetComponent<PlayerController>(); animator = GetComponent<Animator>(); currentHealth = maxHealth; + audioSource = GetComponent<AudioSource>(); } private void Awake() @@ -179,12 +182,14 @@ public class PlayerController : MonoBehaviour if (currentHealth == 0) { animator.SetTrigger("Hit"); + diamondAmount = 0; FindObjectOfType<GameManager>().EndGame(); } else if (prevHealth > currentHealth) { animator.SetTrigger("Hit"); + PlaySound(audioClip); Debug.Log(currentHealth + "/" + maxHealth); } else @@ -193,6 +198,11 @@ public class PlayerController : MonoBehaviour } } + public void PlaySound(AudioClip clip) + { + audioSource.PlayOneShot(clip); + } + } // Source: https://github.com/Brackeys/2D-Character-Controller/blob/master/CharacterController2D.cs \ No newline at end of file