From 82152a79dfc69d588dc419b36bada37df02bf7f6 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Wed, 9 Oct 2024 18:26:48 +0530 Subject: [PATCH 01/18] Added Run and Idle animation --- Assets/Animate.meta | 8 + Assets/Animate/Player.controller | 101 ++ Assets/Animate/Player.controller.meta | 8 + Assets/Animate/PlayerIdle.anim | 114 ++ Assets/Animate/PlayerIdle.anim.meta | 8 + Assets/Animate/PlayerRun.anim | 135 ++ Assets/Animate/PlayerRun.anim.meta | 8 + Assets/Animate/Scene.unity | 290 ++++ Assets/Animate/Scene.unity.meta | 7 + .../Ellen/EllenAtlas.spriteatlas | 211 ++- .../Ellen/EllenCutsceneAtlas.spriteatlas | 68 +- .../Enemies/ChomperAtlas.spriteatlas | 74 +- .../Enemies/SpitterAtlas.spriteatlas | 64 +- Assets/Prefab.meta | 8 + Assets/Prefab/Player.prefab | 108 ++ Assets/Prefab/Player.prefab.meta | 7 + Packages/manifest.json | 17 +- Packages/packages-lock.json | 60 +- .../com.unity.services.core/Settings.json} | 0 ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/SceneTemplateSettings.json | 121 ++ UserSettings/EditorUserSettings.asset | 4 + UserSettings/Layouts/default-2022.dwlt | 1162 +++++++++++++++++ UserSettings/Search.settings | 1 + 24 files changed, 2540 insertions(+), 48 deletions(-) create mode 100644 Assets/Animate.meta create mode 100644 Assets/Animate/Player.controller create mode 100644 Assets/Animate/Player.controller.meta create mode 100644 Assets/Animate/PlayerIdle.anim create mode 100644 Assets/Animate/PlayerIdle.anim.meta create mode 100644 Assets/Animate/PlayerRun.anim create mode 100644 Assets/Animate/PlayerRun.anim.meta create mode 100644 Assets/Animate/Scene.unity create mode 100644 Assets/Animate/Scene.unity.meta create mode 100644 Assets/Prefab.meta create mode 100644 Assets/Prefab/Player.prefab create mode 100644 Assets/Prefab/Player.prefab.meta rename ProjectSettings/{boot.config => Packages/com.unity.services.core/Settings.json} (100%) create mode 100644 ProjectSettings/SceneTemplateSettings.json create mode 100644 UserSettings/Layouts/default-2022.dwlt create mode 100644 UserSettings/Search.settings diff --git a/Assets/Animate.meta b/Assets/Animate.meta new file mode 100644 index 0000000000..a7bab0ff06 --- /dev/null +++ b/Assets/Animate.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee8ebcaf145c80547903fd50abce96d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Player.controller b/Assets/Animate/Player.controller new file mode 100644 index 0000000000..90bf77d160 --- /dev/null +++ b/Assets/Animate/Player.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-5536339182766939842 +AnimatorStateMachine: + serializedVersion: 6 + 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: 6289191237812598881} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8949746722948261927} + m_Position: {x: 235, y: 65, 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: 6289191237812598881} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5536339182766939842} + 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 &6289191237812598881 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Animation + 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: 6dbc19db559c7f34aa45aba5fe7503ca, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8949746722948261927 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerRun + 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: d90a5de4d9b75ef4eb984355bc4f696f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animate/Player.controller.meta b/Assets/Animate/Player.controller.meta new file mode 100644 index 0000000000..9162b57b77 --- /dev/null +++ b/Assets/Animate/Player.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87df67ff1c3df244f8bd842fb1cc4f51 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/PlayerIdle.anim b/Assets/Animate/PlayerIdle.anim new file mode 100644 index 0000000000..cf337a02f5 --- /dev/null +++ b/Assets/Animate/PlayerIdle.anim @@ -0,0 +1,114 @@ +%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: PlayerIdle + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 1fa29ad54380226498c2250e612fec93, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: 76089009971280441963c2a3a55b5071, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} + - time: 0.6333333 + value: {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} + - time: 0.68333334 + value: {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} + - {fileID: 21300000, guid: 1fa29ad54380226498c2250e612fec93, type: 3} + - {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} + - {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} + - {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} + - {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} + - {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} + - {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} + - {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} + - {fileID: 21300000, guid: 76089009971280441963c2a3a55b5071, type: 3} + - {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} + - {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} + - {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} + - {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} + - {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.7 + 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/Assets/Animate/PlayerIdle.anim.meta b/Assets/Animate/PlayerIdle.anim.meta new file mode 100644 index 0000000000..c9c6ab49b5 --- /dev/null +++ b/Assets/Animate/PlayerIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6dbc19db559c7f34aa45aba5fe7503ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/PlayerRun.anim b/Assets/Animate/PlayerRun.anim new file mode 100644 index 0000000000..291f6a5ac6 --- /dev/null +++ b/Assets/Animate/PlayerRun.anim @@ -0,0 +1,135 @@ +%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: PlayerRun + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: ff33d6adfeac52e419af23fad2d0abfd, type: 3} + - time: 0.016666668 + value: {fileID: 21300000, guid: 12ea17332fa174442af48960686e1769, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 45ed26a75477df843a013176e95192a9, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 3a5b7c781691c8642af63e9c1e6c14de, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 87e29b609bb169245a2df3d89266630c, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: a4cfd522aaaa4ac45980e1828c8dea2c, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 2eaa4938329e1204ca267982a8cdb3fa, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: dfd2eca0b8de7a443a0b28c6466f55ba, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 301fc9f2a0405ee45ad84f7b550051d5, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 05df8025a12814d46b434681a6989133, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 5d25d9e1de070994db63a462e89932d7, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 9989c37dedfecfa4591fd9f1821713cb, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: 89339a864e8d9994ea7c9531ae92e67e, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 453c8803862e72b43ad3652b8fe03437, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: eb350ede4895d6d418689eb126b772cb, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: 79d7163dfd26ad748bf88cdc6b98d2f5, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 690102d87edd7d047824362d73a02788, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 5cdf5107efb2e8c4d980153f752a57c1, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 3b3834ff0aab3d849bca2adc0c0d5f84, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: d3c1e30225625c14e9bf351c35be2fd9, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: 88f2ac18ae0c71845bc1d47bd924f8a8, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 37547022c0607c544915b3089832635d, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: ff33d6adfeac52e419af23fad2d0abfd, type: 3} + - {fileID: 21300000, guid: 12ea17332fa174442af48960686e1769, type: 3} + - {fileID: 21300000, guid: 45ed26a75477df843a013176e95192a9, type: 3} + - {fileID: 21300000, guid: 3a5b7c781691c8642af63e9c1e6c14de, type: 3} + - {fileID: 21300000, guid: 87e29b609bb169245a2df3d89266630c, type: 3} + - {fileID: 21300000, guid: a4cfd522aaaa4ac45980e1828c8dea2c, type: 3} + - {fileID: 21300000, guid: 2eaa4938329e1204ca267982a8cdb3fa, type: 3} + - {fileID: 21300000, guid: dfd2eca0b8de7a443a0b28c6466f55ba, type: 3} + - {fileID: 21300000, guid: 301fc9f2a0405ee45ad84f7b550051d5, type: 3} + - {fileID: 21300000, guid: 05df8025a12814d46b434681a6989133, type: 3} + - {fileID: 21300000, guid: 5d25d9e1de070994db63a462e89932d7, type: 3} + - {fileID: 21300000, guid: 9989c37dedfecfa4591fd9f1821713cb, type: 3} + - {fileID: 21300000, guid: 89339a864e8d9994ea7c9531ae92e67e, type: 3} + - {fileID: 21300000, guid: 453c8803862e72b43ad3652b8fe03437, type: 3} + - {fileID: 21300000, guid: eb350ede4895d6d418689eb126b772cb, type: 3} + - {fileID: 21300000, guid: 79d7163dfd26ad748bf88cdc6b98d2f5, type: 3} + - {fileID: 21300000, guid: 690102d87edd7d047824362d73a02788, type: 3} + - {fileID: 21300000, guid: 5cdf5107efb2e8c4d980153f752a57c1, type: 3} + - {fileID: 21300000, guid: 3b3834ff0aab3d849bca2adc0c0d5f84, type: 3} + - {fileID: 21300000, guid: d3c1e30225625c14e9bf351c35be2fd9, type: 3} + - {fileID: 21300000, guid: 88f2ac18ae0c71845bc1d47bd924f8a8, type: 3} + - {fileID: 21300000, guid: 37547022c0607c544915b3089832635d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4 + 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/Assets/Animate/PlayerRun.anim.meta b/Assets/Animate/PlayerRun.anim.meta new file mode 100644 index 0000000000..500af06523 --- /dev/null +++ b/Assets/Animate/PlayerRun.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d90a5de4d9b75ef4eb984355bc4f696f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity new file mode 100644 index 0000000000..eecf14c7d3 --- /dev/null +++ b/Assets/Animate/Scene.unity @@ -0,0 +1,290 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1260965266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1260965269} + - component: {fileID: 1260965268} + - component: {fileID: 1260965267} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1260965267 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260965266} + m_Enabled: 1 +--- !u!20 &1260965268 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260965266} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1260965269 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260965266} + 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!1001 &3967004074362709419 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.15 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.22 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1260965269} + - {fileID: 3967004074362709419} diff --git a/Assets/Animate/Scene.unity.meta b/Assets/Animate/Scene.unity.meta new file mode 100644 index 0000000000..7c683f1093 --- /dev/null +++ b/Assets/Animate/Scene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cacf87822d5d7cd4598de741ac3398e5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas index 0b6cb5b9b9..ee5cd57194 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas @@ -21,7 +21,7 @@ SpriteAtlas: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 m_BuildTarget: DefaultTexturePlatform m_MaxTextureSize: 8192 m_ResizeAlgorithm: 0 @@ -31,7 +31,9 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +41,215 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 1 enableTightPacking: 1 + enableAlphaDilation: 0 + secondaryTextureSettings: {} variantMultiplier: 1 packables: - {fileID: 102900000, guid: 7b200a58dfffd8d45b54454b1cb82151, type: 3} - totalSpriteSurfaceArea: 98929035 bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - e4381a10685b28d4f906cc686ecbc2c7: 21300000 + - d366315072065fc4891bc2f5281daca4: 21300000 + - b2d03960805e00146a93e7a607cc5f72: 21300000 + - 87e29b609bb169245a2df3d89266630c: 21300000 + - 63543f60a4c70d546a5c4a0f63a2ad29: 21300000 + - 967004704d0400c45945b1dc74fc5eb6: 21300000 + - 8fc33c704bf75524facc770a491ffd2f: 21300000 + - 7ab12a808aa8d054aaf50c2741246de0: 21300000 + - e679c4902023e7a48b2cf79741a51fda: 21300000 + - f3b094a028c28604382b41bfab29604a: 21300000 + - dfd2eca0b8de7a443a0b28c6466f55ba: 21300000 + - 591e3ea0fd60a1442bfbe969a16d4d74: 21300000 + - a53475b08393802498550588cf70ef5e: 21300000 + - 129972c0ed661da47bd600512df59822: 21300000 + - e7f298e049bf3bb41bca4bbd8ceee9ad: 21300000 + - 28b55e113ed8d2e499533bc878cf9c3e: 21300000 + - b38254315edf5904d987dbca58a71ca0: 21300000 + - 5d25d9e1de070994db63a462e89932d7: 21300000 + - d3c1e30225625c14e9bf351c35be2fd9: 21300000 + - cb80a3123f378f743841b1f9fda37c83: 21300000 + - fffa3e12c34c2ee448d46f5c9db142e6: 21300000 + - 37547022c0607c544915b3089832635d: 21300000 + - a4cfd522aaaa4ac45980e1828c8dea2c: 21300000 + - 7d008f32d5ec4f444bf86f436666060d: 21300000 + - 5b1c7342d6504e3448979307c3f6a639: 21300000 + - 2350b442f31bb1741b68a6b77d09d40b: 21300000 + - 4d25e8426524e5d43a92fe2d594e4912: 21300000 + - 28e829622ce5c974bbf154a278a2be22: 21300000 + - 190f2e72bd4df1945b2d504efccde46c: 21300000 + - 55e66892de31d424885bc2c774f07ef7: 21300000 + - 51ba71b24b0a67641b799a9e958697b0: 21300000 + - 5edee3b2ea56ae64881eacb7f58be021: 21300000 + - 80583dd2d497d144b8d2282bf2184cc2: 21300000 + - 7568b5e22ac6e1b4687bb661ac8f0d74: 21300000 + - 658639e2f4d2568479631f3a888fc691: 21300000 + - 301fc9f2a0405ee45ad84f7b550051d5: 21300000 + - 453c8803862e72b43ad3652b8fe03437: 21300000 + - 575f490323d76254ab8d5d4cd472a3ea: 21300000 + - 7dcbef0330b37354dae1c1071956813a: 21300000 + - a9f05e230fdd41b4f99ac0e0b7c4fa2b: 21300000 + - 12ea17332fa174442af48960686e1769: 21300000 + - 4b74c95301673024c9dbf47514f2cb5b: 21300000 + - 6f8b0a53ff8c9e94f9d4af829e2ad6f3: 21300000 + - c93003632dfb3f346ae28336c8748cc1: 21300000 + - ed4c6463819f7cb4b85a6a44dc35c9cf: 21300000 + - baa7eb63e6b2764408c3c44ea0b180ac: 21300000 + - 27bc49736a5db6d44b8ae392a1ee34dd: 21300000 + - 3bcc6973de396d247a99745a0c323d38: 21300000 + - e701f6d3a4296e040ad8604e7ceaad2a: 21300000 + - 1877f93426f7f3848a2d0ec5ec6ee4a1: 21300000 + - 3fc8ba344d4587942a0b607b47985569: 21300000 + - ae6184443cb4d0f439bab73e9e76df4a: 21300000 + - affa4f4470b317440b7cb5187df710ef: 21300000 + - 83fab85494452284baf4ef65fc8b0273: 21300000 + - 774282641b60d9d4daddad7c6ad7ae69: 21300000 + - 78a64664c88ec60478ced92e86dbb784: 21300000 + - fe80dd64b9b2e1647b367fe8da273bf7: 21300000 + - 19b07ba4ccec70d4ebe4ed5e538cd326: 21300000 + - eef4c8c406166bd4c848e87480efa2bd: 21300000 + - 665bd6d4ae06fea488861b4bdad2f04d: 21300000 + - 929a47e4f89792c4aa28ae41634348c3: 21300000 + - 6469e4f4bdda7e8488924cf6ef74c464: 21300000 + - 32713ff48a4e8dc42a32b9d4d19ea5fe: 21300000 + - c195730543b85df41953d682fee276b3: 21300000 + - 92fbfb056ce42c940aa543cf14a9084a: 21300000 + - 7fb83f0538f2eaf4a9c6f3b08b60cab4: 21300000 + - 46fc6025308929d4b878bfb4b81ead12: 21300000 + - 05df8025a12814d46b434681a6989133: 21300000 + - 92f985257d4b81740b246818800efccd: 21300000 + - 57585d65d25175a4b82cdcd9092545ca: 21300000 + - bce1db75cf9f0c7448eb419ad2e38c8a: 21300000 + - 0adb3b85a77225b42823314ce0caedd3: 21300000 + - 1d7a01952b6b7e4409c83ade1ead91db: 21300000 + - 0b26c4d5c6b04e940932afa1ffa8284f: 21300000 + - 1fa29ad54380226498c2250e612fec93: 21300000 + - fcec6de5f73f3b74480aa66ffac97f43: 21300000 + - 97b570f5218f6d94cadf8a8d195dd50d: 21300000 + - 9391e70638fb9084ebf61e843059fdf1: 21300000 + - ca897d165bbb9094584da008d90d3df5: 21300000 + - 41c27046edf6d694e875b5766f672a8f: 21300000 + - 69997956b171bc04495e5a4782e4669f: 21300000 + - 5f800286e4f0550478208c51d0a48d0f: 21300000 + - 89339a864e8d9994ea7c9531ae92e67e: 21300000 + - 8def3b866cd238f4a928439e0a5a8907: 21300000 + - d4e307e6ea003de4bbc0d28256e6a032: 21300000 + - 221d99e63cd1a414bad8cd6c93cb95c2: 21300000 + - 5f51f8f690669d84cacaeab399fce579: 21300000 + - 5cdf5107efb2e8c4d980153f752a57c1: 21300000 + - b0cff70733e6b0b41a5ad812ead6cd8b: 21300000 + - bb6a891737c56e6438e808fb4e716321: 21300000 + - 9528c4275cc1a114f9e755b4d9084936: 21300000 + - 881250471e7213f42819ba1d7bb1d4e0: 21300000 + - c4d7d6470acd7bf45971042161c6e018: 21300000 + - f3e9585781fa62242a3018cd3dd529dd: 21300000 + - c6b584771aee7a148bcf2885a6f347ba: 21300000 + - 49594577334bdee479b8dd58aedf1d60: 21300000 + - ec7d0c8717f6c3b428b3f277de956cea: 21300000 + - 45ed26a75477df843a013176e95192a9: 21300000 + - cb0f74b7e0e21ee47b09fdb24a83094f: 21300000 + - 686160c7c3cfd5040a8ea08b867ff56c: 21300000 + - b0acf1d76f96df547a6135841ee354f8: 21300000 + - 1eb8ffe712da55942b19d29be7a6e5da: 21300000 + - fe5165f702e35144684bf593203a031c: 21300000 + - 63290ff7381eab84eb49e7b9345c809f: 21300000 + - 455b6008820c4b143bdc7ed7c6cd29c4: 21300000 + - 5767e2180fcbb7a4d9980e9a37e3d588: 21300000 + - 88f2ac18ae0c71845bc1d47bd924f8a8: 21300000 + - dcc9002875a3a244eacb72418d292f8e: 21300000 + - bcd729389571a684eb0951d69a67af73: 21300000 + - 2eaa4938329e1204ca267982a8cdb3fa: 21300000 + - a9c37448b62c0d149aced6ded9e44e4a: 21300000 + - b5b9f448600b9aa4daa1d9fd5069a764: 21300000 + - c995874838013244cac3056d42ced345: 21300000 + - d0505258bec70ac40b68ec355beaff76: 21300000 + - 3a5b7c781691c8642af63e9c1e6c14de: 21300000 + - 5c8d87881ea3aca4c9cea0978e1867ba: 21300000 + - 6b594b886c601ff4db79a8ffa0673177: 21300000 + - 753548c84e6e0264da62aca9c26f94c4: 21300000 + - 690102d87edd7d047824362d73a02788: 21300000 + - 0f341be85736cdc4bba911e059e0d16a: 21300000 + - 4ad59af83f2bcde4681baeba9d0d90c8: 21300000 + - 76089009971280441963c2a3a55b5071: 21300000 + - e9154409f452b244b9db4c7de97dff28: 21300000 + - 4214a14962bcf4943baf9e184b9b928e: 21300000 + - a9e9e74909b5a0947a093069d6a017cc: 21300000 + - 59b767590592a9e4685835a20cf41d69: 21300000 + - 82bf8779d3330604c9cec1bf2f219329: 21300000 + - 8feedb9983dae0d49a492dae5bbbf6d6: 21300000 + - e62f4ca9760884b4cb9ff0c3025838db: 21300000 + - c63c69d9fdf411147aede23769d5fcfc: 21300000 + - bb0dc30aba14f084b9f20cd11d7f59d8: 21300000 + - 852dea1a4d9a29a45b32e544647320ad: 21300000 + - c865be1abede9a048a20b6904ee2219a: 21300000 + - 13aa9a4a1bc68064c9e5e17a86df2666: 21300000 + - 3db4a46ab9121ab4c82e33ae0f3d8710: 21300000 + - b38d007a84ef48c45b4026b9be16e76b: 21300000 + - d2d936bae69c599429ee1a386892a9f0: 21300000 + - f645b6da0a4688d4288e29bcffabc941: 21300000 + - e94248daa5c32774fbf35a1cb4ecc4de: 21300000 + - 35322bfa3901c9145821274537244b1d: 21300000 + - 6b460d0b7c81b4d4cb5f131f7eeda623: 21300000 + - ec69df1b25263e844aa6c00cbb388ea6: 21300000 + - bf9cb13b45f6dfe41970b547e98bb782: 21300000 + - 6dcde73b5ddc21d4582ec3468a22cda5: 21300000 + - 438b3b4b88bde4f4c9770d84b50b772b: 21300000 + - 634ae46b18d6e8e42a8359e8219fa81c: 21300000 + - 5b13d17b360e2a64cbc7b4a2ac4cd375: 21300000 + - e67c667b7a6a3664a8f22db00d76ad38: 21300000 + - aacc218bfa62aef41920035f78af31e8: 21300000 + - 86106dab9033ac7448f28ca19c407c2a: 21300000 + - b53b9dcb8117dfe4ab1c5a250703548c: 21300000 + - cf749edb05d158d47a3e523439809960: 21300000 + - c66090fb301d69046ba811b94979feab: 21300000 + - 365443fb827749b4db671a5038ff79b1: 21300000 + - 64afd51ca9828034f8c64a261e4b99b9: 21300000 + - 898a532c97728b244b14ffccd83b6f7e: 21300000 + - a1c0872c2cf7825428b1f301727f4e1b: 21300000 + - 9346fa5c7f34ca845954029ac6857a12: 21300000 + - 7f64c56c59a2fd7429f7ec776a4213a2: 21300000 + - 0a78267c907b61449a0367178cabe70c: 21300000 + - c39af18c1c6c80841b32ec80316d1e87: 21300000 + - cd65a99c817869946969cd216cab2115: 21300000 + - 79d7163dfd26ad748bf88cdc6b98d2f5: 21300000 + - 8f8e5b3d53a0deb4d88a6a25a3db5ac4: 21300000 + - 049cab3d3a32a3a45856ca44f223ced1: 21300000 + - dfa5e44dcbacc1b4794ca05e7f7e3478: 21300000 + - aa9e3d4d344a1c548a75a061ab69c3fb: 21300000 + - 31d88d4dbed3d9546898b42447a63e77: 21300000 + - 9989c37dedfecfa4591fd9f1821713cb: 21300000 + - ff33d6adfeac52e419af23fad2d0abfd: 21300000 + - 60a2cfad92429cc4b9d2f6ce7148c37a: 21300000 + - df6f54cd95dfdf148a5c4cc0aca6d49f: 21300000 + - 614b90dda34ee634893a6168082923be: 21300000 + - e79c55edf28318b44b614f2eaf6cbb45: 21300000 + - c7cf710ee57c1ae45aac513a85fcff07: 21300000 + - 904a520e37320ab4aa482b623e1d52f4: 21300000 + - a4d1991ea98b3684c99f8728d28ec652: 21300000 + - 2d24972ef326cbf4d95898e1bee82f8e: 21300000 + - 0b69f35e166d1704f987340b84eaefe6: 21300000 + - 6b56e26ee92b18e4aa775af7975a9b17: 21300000 + - 5b31577ecf5954448b0d92a2c8a0501b: 21300000 + - 5a1cef7e9c9ed034da742d0e08ea786a: 21300000 + - 9d98f19e89667e84fa99ae2d2c01ad66: 21300000 + - af68c0be2e67f3846bcdf33841f8312b: 21300000 + - d9c068be09f82944db652218d2ef1c52: 21300000 + - 1ffccabe7b991aa4283e4106fca8f9bb: 21300000 + - 0b6c45ce7a9a03d4d8f457818ab57430: 21300000 + - 39f2b1de192463d41a4339ee2b5f2074: 21300000 + - eb350ede4895d6d418689eb126b772cb: 21300000 + - 1b0ea6ee3d93339468688584fa8f3bb9: 21300000 + - 657c921f612637e4f8ba1c8c4123d11d: 21300000 + - 8a9b494f275a2954aba6b318fc17d9bd: 21300000 + - f7f3915fcb9a6744a9a147ed3ee26ebe: 21300000 + - a3b4037f6cee2ac4fb949a47aa4a4d76: 21300000 + - d6e05ebf12ef9164c9b792b7088c0bdd: 21300000 + - 261da5cf99e3c864e9079de55f67a437: 21300000 + - aefc8fcf439e0ae40bab5098679276b5: 21300000 + - 7d37e1dfeba60ea4a8803c12675079b6: 21300000 + - 3b3834ff0aab3d849bca2adc0c0d5f84: 21300000 + - b5a42cffd70ab6441a230c8e772f3c56: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} @@ -447,5 +653,6 @@ SpriteAtlas: - Anim_CROUCH_00007 - ELLEN_RUN_NoGun_19 - Anim_DEATH_00017 + m_RenderDataMap: {} m_Tag: EllenAtlas m_IsVariant: 0 diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas index 6264694945..1dd13439fa 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas @@ -21,7 +21,7 @@ SpriteAtlas: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 m_BuildTarget: DefaultTexturePlatform m_MaxTextureSize: 8192 m_ResizeAlgorithm: 0 @@ -31,7 +31,9 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +41,72 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 0 enableTightPacking: 0 + enableAlphaDilation: 0 + secondaryTextureSettings: {} variantMultiplier: 1 packables: - {fileID: 102900000, guid: 3b282ed300911054f9a15dfe288b180b, type: 3} - totalSpriteSurfaceArea: 3735552 bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - a5bd89109aa6b2040899eb517d4ff269: 21300000 + - 150834209dce0f04fbc80ba1c047862d: 21300000 + - d8066b3064c94ec418e624a9d42a7e9a: 21300000 + - 338b7ab050147cd4ba8dae8c5b192d06: 21300000 + - b7f0bbb0377ad59428edfb2ad7bb9c8b: 21300000 + - 6ca890c0d46aed24b9dc2b295bc00f66: 21300000 + - 4404ac2103491534c9e5846328919d85: 21300000 + - ffc84872fb897ac48ba785abe986ce5f: 21300000 + - 1df4990374184a74881ac6025bf44892: 21300000 + - f6f6b1436c8ac2f40b4772ae71e66616: 21300000 + - ec512da32fc72e341aaf998346dd918d: 21300000 + - c7b60a04d72144e4abc50f83229c24b8: 21300000 + - 89d60a14446e0e64d9fbc78d4f56f0e0: 21300000 + - 37b0ac0507a75e74b8463a66400768b6: 21300000 + - 4bfe2265e55eabc4e8661f4b53459a61: 21300000 + - 13da4665845ba7048a430c77c0c2e710: 21300000 + - 82e2dad5538a7b94fb7d4a2ec5892fc4: 21300000 + - 92afb8e693ef0bd479a9fbcca9cd4407: 21300000 + - 848f66f6aef71f5439b3f54a71fdfbb0: 21300000 + - 94506df6af9336d498bc4b125fec2bf5: 21300000 + - b21a4c07951e2a741ab6e18f67c5cd69: 21300000 + - 68451d277d2abba46a8ce6bf03ca7e0e: 21300000 + - ec2fd10884c649646bd87eeb6da8fbdc: 21300000 + - bf215208f75c7b942b1605483667f8e4: 21300000 + - 88e8dc18ca587db4dbf5748520fbc374: 21300000 + - 641c1968aa0040a43a5a56dcb15c37c1: 21300000 + - 8823d9880fbc90642a4778e42a762580: 21300000 + - d12400b8f60eb534489d29d74595c74c: 21300000 + - ac55bcb8f5e1e714e8dbc94eaa8b2476: 21300000 + - 4b8d7ee8c014eca44bac43ebc62ff54a: 21300000 + - a94191f83905200448f763e26e38b1f0: 21300000 + - 9055a2f863bb219428f97595a861d3ae: 21300000 + - fc020019f252cdb46a61d9796ded3e11: 21300000 + - e8917069f3e34da42b21d686fabc7edf: 21300000 + - 00e06269702d7004eb9a7c0e6bd22426: 21300000 + - 82a1256975469ad449c19d749f79d183: 21300000 + - 4db7de89bec7d9241b6f8f9a9149ea12: 21300000 + - 240b042a2678c13429cb0a31094f929d: 21300000 + - 411cf84ac65191c4bb59a562f6ff00d5: 21300000 + - 430a778a5e873dd47b839ef9c835fe65: 21300000 + - 970d88aa5a19ea34f966f654dba3c40a: 21300000 + - 667322eabce35e54782b9a44a073a105: 21300000 + - e025cbdb4e2ba0c4da395d1f388932dd: 21300000 + - c0c34b3ce5f3bad4a92ae2ace64ea54b: 21300000 + - f2f48b5c6d23a094ab94c8c2a222706d: 21300000 + - a2a0016c152367442b171d0cd3dee9f6: 21300000 + - 6a9d269c995597949912371419d0e37c: 21300000 + - 93e3d0ece463bdd4f8de3a5e13640f52: 21300000 + - 0eb4fabd70cb42c4e853c56d1227a3fd: 21300000 + - f4d973fde270bf646989674f9883ff37: 21300000 + - 951eaffdc3e0af047968b7ab9cd39b79: 21300000 + - ff6abd3e3a894514cb908c7048a19d4d: 21300000 + - 0aa4758e6a5fb5548b825f9b9f30d7c6: 21300000 + - c526eeae045772a4d864b60d1a1d5296: 21300000 + - febb0f6fef5a4a047a1acf99e84d9fb8: 21300000 + - 2ddda87f253edea40a6f886160952413: 21300000 + - e8dea0af68b70944d9a787becfc0689a: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: a5bd89109aa6b2040899eb517d4ff269, type: 3} @@ -161,5 +224,6 @@ SpriteAtlas: - Ellen_CutscenePortrait_006 - Ellen_CutscenePortrait_009 - Ellen_CutscenePortrait_034 + m_RenderDataMap: {} m_Tag: EllenCutsceneAtlas m_IsVariant: 0 diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas index 3cb271805c..e299423bbf 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas @@ -21,7 +21,7 @@ SpriteAtlas: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 m_BuildTarget: DefaultTexturePlatform m_MaxTextureSize: 8192 m_ResizeAlgorithm: 0 @@ -31,7 +31,9 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +41,78 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 1 enableTightPacking: 1 + enableAlphaDilation: 0 + secondaryTextureSettings: {} variantMultiplier: 1 packables: - {fileID: 102900000, guid: b70e068a42df2514cafb501eda8734e4, type: 3} - totalSpriteSurfaceArea: 10489500 bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - ab415a003dc7634428737e396fb6b118: 21300000 + - 5ff5b330714abac42a0db7b827b418a6: 21300000 + - ae7c3e30807a6b14ea27333b478b7159: 21300000 + - 22f7a3407a0448d438b85694136896c1: 21300000 + - 62e4d070156482a4995f75774447f83d: 21300000 + - c10ee680b45acec46af60e470d8c1930: 21300000 + - 2682d6b08082e2f49b748e74174a8e87: 21300000 + - 1d094e315b7be8444ab6502f9dcca260: 21300000 + - 8ae4d681ab837c64796c0b72ee2584a0: 21300000 + - 8b571ba119e277145b0b92cd8fd42067: 21300000 + - ef846db2d56c3124b8f82467a163ebdf: 21300000 + - 483490e295d65ea45b0ca6ec50a93382: 21300000 + - a003b41375f47594a9d754a4e55dc568: 21300000 + - d3ae7713c92135644b592b6979acbcfc: 21300000 + - e1faa5d36f8d3e843b5367af93176284: 21300000 + - ac9307145261eee499a455ddeb80db4b: 21300000 + - 9e540f44219d80243bec5e2191787a0c: 21300000 + - b801fd8404ee341479f2a795c6dd8ab5: 21300000 + - 41ee8205a421b1643824c4bd4c9b12b0: 21300000 + - aeb8b905156a5164ea3f260ddc951efd: 21300000 + - c00121950f177f84092fd15f53c6ac66: 21300000 + - 8b5d6d95c402e6e479a2528aceb461c1: 21300000 + - 882f64064bde2e64db7df2086bc259df: 21300000 + - a5cc0836f318e7d47928222a8a8c6bd5: 21300000 + - 980a4b66b0a2bba42a9a3b50f4da76d6: 21300000 + - 9405a54793ed1b74bb19ee929c860b0d: 21300000 + - 72182c4737bc6a242be25cda1beacbf4: 21300000 + - a3ee41879a5dc174f9767e2bfdcde909: 21300000 + - 0ce1ce8775d04c04091f4c852f4f4ec5: 21300000 + - b6e64dd7555a5fc44b98d71cb5c0d43c: 21300000 + - f0657c0811c44934ba275af9b1aa5c85: 21300000 + - 75a36c8886a27f54b833c41de3d11d24: 21300000 + - 38c40e88299ccf042b83f09b5c3fd89b: 21300000 + - 2db361d87da36334cb20db2ebf74e3c1: 21300000 + - 1e12a6098ecee9a47b8b65f259c08991: 21300000 + - dae848790acd29544a951ec295aecf71: 21300000 + - f7636f79f29fce1469dfb21774e2b9d7: 21300000 + - 02d12d99a7d9fc24fa0f9e2472426c7b: 21300000 + - 26aea5a92fc76f648bb6522f06a0af58: 21300000 + - d720e2d90151e91479a4d3d4287bb61b: 21300000 + - 924e830a0c9d55a4bbe5afdc9729d55f: 21300000 + - 4843081a76a173a468369f4fab334928: 21300000 + - c3bc842a37054c74bbc28d1f34c9847a: 21300000 + - a25859ca3789d8a469bdd28a7d38daf2: 21300000 + - 312a5bfa1cd438440b81906da98959f9: 21300000 + - b3da84ebb4d3f0748b47f5cf58ae9d40: 21300000 + - f14aa10c3b4eb5b47860e729e2144c28: 21300000 + - 8398530cb9366974ca3cb94c16af54f7: 21300000 + - 6e07004c8f0965d4ab66a275e02b77a0: 21300000 + - b6737a6c649b5664baa6b0e1f942a9e9: 21300000 + - a0740f7c6b0a21346b139ff42dc3cb17: 21300000 + - 54bda8bcfb03f4345aafea5fe8271478: 21300000 + - a64b8a0d006d7b744b431b7cd3e59096: 21300000 + - f49c41dd300e6f6439fb3dafb10f4e9d: 21300000 + - 6c05bc2e66e3ff342abf6c6128d48be8: 21300000 + - 3d64a15e480cc6847bc34f715f1999fa: 21300000 + - 3b35fd7e10ffa5a4886deb9a7fe973be: 21300000 + - 030bf29ece336fa4590a0d4039eb5a00: 21300000 + - b789f21f154a3744592f10328f51d9b9: 21300000 + - c476985fb9af3ff4aafceffed501e06a: 21300000 + - 6de87e9f00722e74d9fc96304b8f1a3d: 21300000 + - 1c64f7cfb7bf99d48abddaeb45da9704: 21300000 + - 94f6e6ef133c2fc4d978f8e13f22331e: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: ab415a003dc7634428737e396fb6b118, type: 3} @@ -173,5 +242,6 @@ SpriteAtlas: - ChomperIdle_00053 - ChomperDEATH_Paint_11 - ChomperDEATH_Paint_01 + m_RenderDataMap: {} m_Tag: ChomperAtlas m_IsVariant: 0 diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas index 9972e0a7c9..3993568672 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas @@ -21,7 +21,7 @@ SpriteAtlas: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 m_BuildTarget: DefaultTexturePlatform m_MaxTextureSize: 8192 m_ResizeAlgorithm: 0 @@ -31,7 +31,9 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +41,68 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 1 enableTightPacking: 1 + enableAlphaDilation: 0 + secondaryTextureSettings: {} variantMultiplier: 1 packables: - {fileID: 102900000, guid: cc699bfd783c8e34cbc62772daba3c30, type: 3} - totalSpriteSurfaceArea: 8824500 bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - 8adfa5608930ca2439e971779195e6d5: 21300000 + - 32dc08a018447f543976c94bf9491196: 21300000 + - a607bd01a7a4db74d8db6d947dcbc875: 21300000 + - b380a2116ae89cf468d48830ec7d79c2: 21300000 + - 7355c851fc65ff849b5df7c47140e9d8: 21300000 + - 63fc7cb115139c848995a4ae9ac9dacb: 21300000 + - 835211e15123ac143bd33f517fb7a006: 21300000 + - 52e91402b85ab7b4da1289c8f9a70393: 21300000 + - c8cbc822ff1ea224fa14efed547a1962: 21300000 + - 585a6432587c7c147b3d5e9df9f422c4: 21300000 + - 10136a82fe95130409081e398fe24178: 21300000 + - 08a08ba28e247a640b93b2069105d119: 21300000 + - dda1ecc29988c874bbc23937de1f6e5e: 21300000 + - bfc349e2425296543a5c8a12bdf4df11: 21300000 + - e91b4143d098bed4c9e823cdcbea18b2: 21300000 + - c413889380ba9bc48a815e80b274fffd: 21300000 + - 9f5b1b248f1d42b45b4907efad9af9ae: 21300000 + - a2bf0c84810352345928f875e9722574: 21300000 + - f09178b404a32834883bc08597522d22: 21300000 + - bdebbaf48377ad346a0dad337aceea94: 21300000 + - 914c7ff4b2e03254f8fca375221689a5: 21300000 + - 850fcf2571df67c4ea7f94f407d1a42c: 21300000 + - 10871335f574c994891877ebab0be6ac: 21300000 + - ddcad965dfaadd94393dcc3cec52b3ce: 21300000 + - 6016bca53a5cef1449c5464da0fd040c: 21300000 + - d090c51669b3435449d4a2d4819b4261: 21300000 + - 48948d469c03d1146ad3d7026a482156: 21300000 + - e33ab0866768e0149af41c52aaa4359c: 21300000 + - 9cc3fcf61bd66d34c996a561899716bb: 21300000 + - 1db1cf67e678da1489caff40f4149421: 21300000 + - dfc824d7751687d4ab5c25b40b7cfd9a: 21300000 + - 22953dd7b1cd95b4c9b5ddf9ac346037: 21300000 + - 04ba3238e0770214cb44ec04498eaf41: 21300000 + - eadcf2981659a764c86bafbe6ce6f044: 21300000 + - 702fbb19c7d7d684b8ce058404284c70: 21300000 + - c169f3a975c97764392837f81a84c249: 21300000 + - 70036f2bc0a3c1641bcfcdfe41364ebf: 21300000 + - dd0430cb00274c1489be6b617ee81916: 21300000 + - e59f64eb7bc6fec48a686c2831a477ac: 21300000 + - 09cbcc2cfc7f96f41904a753c589c3bb: 21300000 + - 8354564cdfb17ef47929b25a0c696be4: 21300000 + - 7c80543db09a5ec4cbf32e6ebd148879: 21300000 + - 18b6ab4d386ee2a4c8907ac47974884b: 21300000 + - ea75f18dd428482458ec6b1ea19ae71b: 21300000 + - c873423e7212f3b469150de37075a8db: 21300000 + - 7b195ceea64132d40bb2a215dd26b903: 21300000 + - 4397030f9e6fb174ea079b632727d6f8: 21300000 + - 93dbc21f8c967174d9724ded23bcaa46: 21300000 + - ba45ea1ff3eb95d4bb7ace3022705886: 21300000 + - e797a63f8ec23e84e94f4d6b25cf69a9: 21300000 + - ed03b24fc6d38dc4094f2bf8830f9df2: 21300000 + - 1360f45f3eea5294fad01a0d4dacd624: 21300000 + - 8d4804cf4e8b18246a0b9de4bb5f7887: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: 8adfa5608930ca2439e971779195e6d5, type: 3} @@ -153,5 +212,6 @@ SpriteAtlas: - SpitterAttack_16 - SpitterWalk_09 - SpitterAttack_18 + m_RenderDataMap: {} m_Tag: SpitterAtlas m_IsVariant: 0 diff --git a/Assets/Prefab.meta b/Assets/Prefab.meta new file mode 100644 index 0000000000..3004a8556a --- /dev/null +++ b/Assets/Prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4133df4140770eb428fbcef6aaead55a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Player.prefab b/Assets/Prefab/Player.prefab new file mode 100644 index 0000000000..68e574b941 --- /dev/null +++ b/Assets/Prefab/Player.prefab @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5158019043804637083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2914634761343525767} + - component: {fileID: 2279333339517451720} + - component: {fileID: 7403193974885477311} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2914634761343525767 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5158019043804637083} + 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: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2279333339517451720 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5158019043804637083} + 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_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: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, 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.7534883, y: 2.8325582} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7403193974885477311 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5158019043804637083} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 87df67ff1c3df244f8bd842fb1cc4f51, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Prefab/Player.prefab.meta b/Assets/Prefab/Player.prefab.meta new file mode 100644 index 0000000000..743e1221b7 --- /dev/null +++ b/Assets/Prefab/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 731a3c0e5bbd44d48b3e6521c9899f8f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index c6d072b59a..4107a26795 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,16 +2,17 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.ads": "4.4.1", - "com.unity.analytics": "3.6.12", - "com.unity.collab-proxy": "2.0.1", - "com.unity.ide.rider": "3.0.18", - "com.unity.ide.visualstudio": "2.0.17", + "com.unity.ads": "4.4.2", + "com.unity.ai.navigation": "1.1.5", + "com.unity.analytics": "3.8.1", + "com.unity.collab-proxy": "2.4.4", + "com.unity.ide.rider": "3.0.31", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.purchasing": "4.6.0", - "com.unity.test-framework": "1.1.31", + "com.unity.purchasing": "4.11.0", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.10", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 9e5e64eee3..08f7910fb8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -10,10 +10,13 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": {} + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } }, "com.unity.ads": { - "version": "4.4.1", + "version": "4.4.2", "depth": 0, "source": "registry", "dependencies": { @@ -21,17 +24,27 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ai.navigation": { + "version": "1.1.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.analytics": { - "version": "3.6.12", + "version": "3.8.1", "depth": 0, "source": "registry", "dependencies": { + "com.unity.services.analytics": "1.0.4", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.1", + "version": "2.4.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -45,7 +58,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.18", + "version": "3.0.31", "depth": 0, "source": "registry", "dependencies": { @@ -54,7 +67,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -70,51 +83,49 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", + "version": "3.2.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.purchasing": { - "version": "4.6.0", + "version": "4.11.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.androidjni": "1.0.0", - "com.unity.services.core": "1.5.2", - "com.unity.services.analytics": "4.2.0" + "com.unity.services.core": "1.8.2" }, "url": "https://packages.unity.com" }, "com.unity.services.analytics": { - "version": "4.3.0", + "version": "5.0.0", "depth": 1, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.services.core": "1.4.0", - "com.unity.nuget.newtonsoft-json": "3.0.2" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.services.core": "1.10.1" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.8.1", + "version": "1.12.5", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.modules.androidjni": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -134,13 +145,13 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -296,17 +307,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/boot.config b/ProjectSettings/Packages/com.unity.services.core/Settings.json similarity index 100% rename from ProjectSettings/boot.config rename to ProjectSettings/Packages/com.unity.services.core/Settings.json diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index bca3d022af..29c4eeec4c 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.21f1 -m_EditorVersionWithRevision: 2021.3.21f1 (1b156197d683) +m_EditorVersion: 2022.3.45f1 +m_EditorVersionWithRevision: 2022.3.45f1 (a13dfa44d684) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000000..5e97f8393e --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f145fa853e..acf2f14436 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -8,6 +8,9 @@ EditorUserSettings: RecentlyUsedSceneGuid-0: value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e flags: 0 + RecentlyUsedSceneGuid-1: + value: 005057005d0251095f0a592647205b44434e402e297f72612c2a4e60bbb8316d + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 @@ -25,4 +28,5 @@ EditorUserSettings: m_VCHierarchyOverlayIcons: 1 m_VCOtherOverlayIcons: 1 m_VCAllowAsyncUpdate: 1 + m_VCScanLocalPackagesOnConnect: 1 m_ArtifactGarbageCollection: 1 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt new file mode 100644 index 0000000000..e0453916db --- /dev/null +++ b/UserSettings/Layouts/default-2022.dwlt @@ -0,0 +1,1162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 7.2000003 + y: 50.4 + width: 1521.6 + height: 758.4 + m_ShowMode: 4 + m_Title: Hierarchy + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 0 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1521.6 + height: 708.4 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 111 + draggingID: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1161.6 + y: 0 + width: 360 + height: 708.4 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 237.6 + height: 419.2 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimationWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 419.2 + width: 1161.6 + height: 289.2 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 13} + - {fileID: 18} + - {fileID: 12} + m_Selected: 2 + m_LastSelected: 0 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1521.6 + height: 758.4 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1521.6 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 738.4 + width: 1521.6 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 5} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1161.6 + height: 708.4 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 37 + draggingID: 0 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1161.6 + height: 419.2 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 38 + draggingID: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 237.6 + y: 0 + width: 924 + height: 419.2 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 7.2000003 + y: 500 + width: 1160.6 + height: 268.2 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -1666 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 7.2000003 + y: 500 + width: 1160.6 + height: 268.2 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Run + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Run + m_LastFoldersGridSize: -1 + m_LastProjectPath: C:\Users\Parth Vaidya\OneDrive\Desktop\2D platformer\2D-Platformer-Game + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 300} + m_SelectedIDs: 0e5d0000 + m_LastClickedID: 23822 + m_ExpandedIDs: 00000000a8550000425c0000625c0000685c00006a5c00006c5c00008e5c0000905c0000945c0000be5c0000c25c0000c65c0000e85c0000f45c000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: Idle + m_OriginalName: Idle + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 23812 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 0 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 5} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000425c0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: 7ef9ffff + m_LastClickedInstanceID: -1666 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 5} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1168.8 + y: 80.8 + width: 359 + height: 687.4 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 7.2000003 + y: 80.8 + width: 236.6 + height: 398.2 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 7ef9ffff + m_LastClickedID: -1666 + m_ExpandedIDs: 28fbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 244.8 + y: 80.8 + width: 922 + height: 398.2 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -180, y: -26.399994} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: -224.6} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -217.59998, y: -301.6} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: AINavigationOverlay + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/TrailRenderer + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + m_OverlaysVisible: 1 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0.4887171, y: 0.5056458, z: 0.08004183} + speed: 2 + m_Value: {x: 0.4887171, y: 0.5056458, z: 0.08004183} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 1.9958047 + speed: 2 + m_Value: 1.9958047 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 295.2 + y: 80.8 + width: 871.6 + height: 398.2 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 871.6, y: 377.2} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -348.63998 + m_HBaseRangeMax: 348.63998 + m_VBaseRangeMin: -150.88 + m_VBaseRangeMax: 150.88 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 871.6 + height: 377.2 + m_Scale: {x: 1.25, y: 1.25} + m_Translation: {x: 435.8, y: 188.6} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -348.63998 + y: -150.88 + width: 697.27997 + height: 301.76 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1089.5, y: 497.75} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 7.2000003 + y: 500 + width: 1160.6 + height: 268.2 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/UserSettings/Search.settings @@ -0,0 +1 @@ +{} \ No newline at end of file From 376f209fcbf977577ccc30b4af40a8bf7b7131ce Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Wed, 9 Oct 2024 18:30:41 +0530 Subject: [PATCH 02/18] Added Crouch --- Assets/Animate/Player.controller | 29 +++++++ Assets/Animate/PlayerCrouch.anim | 84 +++++++++++++++++++++ Assets/Animate/PlayerCrouch.anim.meta | 8 ++ UserSettings/Layouts/default-2022.dwlt | 100 ++++++++++++------------- 4 files changed, 171 insertions(+), 50 deletions(-) create mode 100644 Assets/Animate/PlayerCrouch.anim create mode 100644 Assets/Animate/PlayerCrouch.anim.meta diff --git a/Assets/Animate/Player.controller b/Assets/Animate/Player.controller index 90bf77d160..5e8a081cab 100644 --- a/Assets/Animate/Player.controller +++ b/Assets/Animate/Player.controller @@ -15,6 +15,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 8949746722948261927} m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: -965254682144170917} + m_Position: {x: 270, y: 130, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -25,6 +28,32 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 6289191237812598881} +--- !u!1102 &-965254682144170917 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerCrouch + 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: 6d53e7a52c13fae4599cd771eb79a717, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 diff --git a/Assets/Animate/PlayerCrouch.anim b/Assets/Animate/PlayerCrouch.anim new file mode 100644 index 0000000000..dfb13d1731 --- /dev/null +++ b/Assets/Animate/PlayerCrouch.anim @@ -0,0 +1,84 @@ +%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: PlayerCrouch + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 5a1cef7e9c9ed034da742d0e08ea786a, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: a9c37448b62c0d149aced6ded9e44e4a, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: 7d37e1dfeba60ea4a8803c12675079b6, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: a9e9e74909b5a0947a093069d6a017cc, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: b5b9f448600b9aa4daa1d9fd5069a764, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 5a1cef7e9c9ed034da742d0e08ea786a, type: 3} + - {fileID: 21300000, guid: a9c37448b62c0d149aced6ded9e44e4a, type: 3} + - {fileID: 21300000, guid: 7d37e1dfeba60ea4a8803c12675079b6, type: 3} + - {fileID: 21300000, guid: a9e9e74909b5a0947a093069d6a017cc, type: 3} + - {fileID: 21300000, guid: b5b9f448600b9aa4daa1d9fd5069a764, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.38333336 + 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/Assets/Animate/PlayerCrouch.anim.meta b/Assets/Animate/PlayerCrouch.anim.meta new file mode 100644 index 0000000000..102565f429 --- /dev/null +++ b/Assets/Animate/PlayerCrouch.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d53e7a52c13fae4599cd771eb79a717 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index e0453916db..50f2c23c72 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1521.6 height: 758.4 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Animation m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 111 + controlID: 81 draggingID: 0 --- !u!114 &3 MonoBehaviour: @@ -93,8 +93,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 237.6 - height: 419.2 + width: 412.8 + height: 420 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} @@ -118,9 +118,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 419.2 + y: 420 width: 1161.6 - height: 289.2 + height: 288.40002 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} @@ -225,7 +225,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 37 + controlID: 38 draggingID: 0 --- !u!114 &10 MonoBehaviour: @@ -247,11 +247,11 @@ MonoBehaviour: x: 0 y: 0 width: 1161.6 - height: 419.2 + height: 420 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 38 + controlID: 39 draggingID: 0 --- !u!114 &11 MonoBehaviour: @@ -268,10 +268,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 237.6 + x: 412.8 y: 0 - width: 924 - height: 419.2 + width: 748.8 + height: 420 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} @@ -302,9 +302,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 7.2000003 - y: 500 + y: 500.80002 width: 1160.6 - height: 268.2 + height: 267.40002 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -317,7 +317,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -1666 + m_LastSelectedObjectID: 23756 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -339,10 +339,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.2000003 - y: 500 + x: 0 + y: 439 width: 1160.6 - height: 268.2 + height: 267.40002 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -364,7 +364,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Run + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -372,30 +372,30 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Run + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\Parth Vaidya\OneDrive\Desktop\2D platformer\2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 300} - m_SelectedIDs: 0e5d0000 - m_LastClickedID: 23822 - m_ExpandedIDs: 00000000a8550000425c0000625c0000685c00006a5c00006c5c00008e5c0000905c0000945c0000be5c0000c25c0000c65c0000e85c0000f45c000000ca9a3b + scrollPos: {x: 0, y: 240} + m_SelectedIDs: de5c0000 + m_LastClickedID: 23774 + m_ExpandedIDs: 00000000a8550000765c0000785c00007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Idle - m_OriginalName: Idle + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 23812 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -409,7 +409,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000425c0000 + m_ExpandedIDs: 00000000a8550000765c0000785c00007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -434,8 +434,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 7ef9ffff - m_LastClickedInstanceID: -1666 + m_SelectedInstanceIDs: 585d00005a5d00005c5d00005e5d0000605d0000 + m_LastClickedInstanceID: 23896 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -536,8 +536,8 @@ MonoBehaviour: serializedVersion: 2 x: 7.2000003 y: 80.8 - width: 236.6 - height: 398.2 + width: 411.8 + height: 399 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -551,9 +551,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7ef9ffff - m_LastClickedID: -1666 - m_ExpandedIDs: 28fbffff + m_SelectedIDs: 585d00005a5d00005c5d00005e5d0000605d0000 + m_LastClickedID: 0 + m_ExpandedIDs: c4f9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -598,10 +598,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 244.8 + x: 420 y: 80.8 - width: 922 - height: 398.2 + width: 746.8 + height: 399 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -656,7 +656,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -669,7 +669,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: unity-transform-toolbar index: 0 @@ -708,7 +708,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Light Settings index: 2 @@ -734,7 +734,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Cloth Constraints index: 3 @@ -747,7 +747,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Cloth Collisions index: 4 @@ -799,7 +799,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Occlusion Culling index: 5 @@ -812,7 +812,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Physics Debugger index: 6 @@ -825,7 +825,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Scene Visibility index: 7 @@ -838,7 +838,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Particles index: 8 @@ -915,7 +915,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -217.59998, y: -301.6} + snapOffset: {x: -217.60004, y: -301.6} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: AINavigationOverlay @@ -939,7 +939,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 + m_OverrideSceneCullingMask: 4611686018427387906 m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 1 From 3c146f581f7389337f327b63fc3a88fdc9013bbc Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Thu, 10 Oct 2024 10:51:24 +0530 Subject: [PATCH 03/18] Animator Added --- Assets/Animate/Player.controller | 108 +++++++++++-- UserSettings/Layouts/default-2022.dwlt | 216 +++++++++++++++++-------- 2 files changed, 244 insertions(+), 80 deletions(-) diff --git a/Assets/Animate/Player.controller b/Assets/Animate/Player.controller index 5e8a081cab..e6ca8136ac 100644 --- a/Assets/Animate/Player.controller +++ b/Assets/Animate/Player.controller @@ -11,23 +11,49 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 6289191237812598881} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 30, y: 220, z: 0} - serializedVersion: 1 m_State: {fileID: 8949746722948261927} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 290, y: 120, z: 0} - serializedVersion: 1 m_State: {fileID: -965254682144170917} - m_Position: {x: 270, y: 130, z: 0} + m_Position: {x: 310, y: 290, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: 6614470771313546883} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 80, y: 290, 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: 6289191237812598881} +--- !u!1101 &-5228068634080624363 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Speed + m_EventTreshold: 0.25 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8949746722948261927} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.64285713 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-965254682144170917 AnimatorState: serializedVersion: 6 @@ -38,7 +64,8 @@ AnimatorState: m_Name: PlayerCrouch m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 278716395150183716} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -62,7 +89,19 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Player serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Speed + m_Type: 1 + m_DefaultFloat: 0.25 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Crouch + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 1 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -76,6 +115,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &278716395150183716 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Crouch + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6289191237812598881} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.34782612 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &6289191237812598881 AnimatorState: serializedVersion: 6 @@ -83,10 +147,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New Animation + m_Name: PlayerIdle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -5228068634080624363} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -102,6 +167,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &6614470771313546883 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Crouch + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -965254682144170917} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &8949746722948261927 AnimatorState: serializedVersion: 6 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 50f2c23c72..4fb11fa980 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1521.6 height: 758.4 m_ShowMode: 4 - m_Title: Animation + m_Title: Inspector m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -69,11 +69,11 @@ MonoBehaviour: y: 0 width: 360 height: 708.4 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 --- !u!114 &4 @@ -95,11 +95,11 @@ MonoBehaviour: y: 0 width: 412.8 height: 420 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 --- !u!114 &5 @@ -121,15 +121,15 @@ MonoBehaviour: y: 420 width: 1161.6 height: 288.40002 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 12} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} m_Panes: + - {fileID: 14} + - {fileID: 19} - {fileID: 13} - - {fileID: 18} - - {fileID: 12} m_Selected: 2 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -225,7 +225,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 38 + controlID: 247 draggingID: 0 --- !u!114 &10 MonoBehaviour: @@ -251,7 +251,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 39 + controlID: 248 draggingID: 0 --- !u!114 &11 MonoBehaviour: @@ -263,7 +263,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: AnimatorControllerTool m_EditorClassIdentifier: m_Children: [] m_Position: @@ -272,15 +272,89 @@ MonoBehaviour: y: 0 width: 748.8 height: 420 - m_MinSize: {x: 202, y: 221} + m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 16} - {fileID: 17} - m_Selected: 0 + - {fileID: 18} + - {fileID: 12} + m_Selected: 2 m_LastSelected: 1 --- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 420 + y: 80.8 + width: 746.8 + height: 399 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, type: 2} + m_ValueSerializationHelper: + - e00: 0.85 + e01: 0 + e02: 0 + e03: 30.240005 + e10: 0 + e11: 0.85 + e12: 0 + e13: 26.87999 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 87df67ff1c3df244f8bd842fb1cc4f51, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -317,8 +391,8 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 23756 ---- !u!114 &13 + m_LastSelectedObjectID: -1242 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -381,7 +455,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 240} m_SelectedIDs: de5c0000 m_LastClickedID: 23774 - m_ExpandedIDs: 00000000a8550000765c0000785c00007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c000000ca9a3b + m_ExpandedIDs: 00000000a85500007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -409,7 +483,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000a8550000765c0000785c00007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000 + m_ExpandedIDs: 00000000a85500007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -465,7 +539,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -513,7 +587,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -551,25 +625,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 585d00005a5d00005c5d00005e5d0000605d0000 + m_SelectedIDs: 9ce2ffff m_LastClickedID: 0 - m_ExpandedIDs: c4f9ffff + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Player + m_OriginalName: Player m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -1242 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 4} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -577,7 +651,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -656,7 +730,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -668,8 +742,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar index: 0 @@ -708,7 +782,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings index: 2 @@ -734,7 +808,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Constraints index: 3 @@ -747,7 +821,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Collisions index: 4 @@ -799,7 +873,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Occlusion Culling index: 5 @@ -812,7 +886,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger index: 6 @@ -825,7 +899,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility index: 7 @@ -838,7 +912,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles index: 8 @@ -939,7 +1013,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 - m_OverrideSceneCullingMask: 4611686018427387906 + m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 1 @@ -947,9 +1021,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.4887171, y: 0.5056458, z: 0.08004183} + m_Target: {x: 0.15027899, y: 0.91302323, z: 0} speed: 2 - m_Value: {x: 0.4887171, y: 0.5056458, z: 0.08004183} + m_Value: {x: 0.15027899, y: 0.91302323, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -999,9 +1073,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1.9958047 + m_Target: 2.3532987 speed: 2 - m_Value: 1.9958047 + m_Value: 2.3532987 m_Ortho: m_Target: 1 speed: 2 @@ -1026,7 +1100,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1047,10 +1121,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 295.2 + x: 420 y: 80.8 - width: 871.6 - height: 398.2 + width: 746.8 + height: 399 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1067,7 +1141,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 871.6, y: 377.2} + m_TargetSize: {x: 746.8, y: 378} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -1082,10 +1156,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -348.63998 - m_HBaseRangeMax: 348.63998 - m_VBaseRangeMin: -150.88 - m_VBaseRangeMax: 150.88 + m_HBaseRangeMin: -298.72 + m_HBaseRangeMax: 298.72 + m_VBaseRangeMin: -151.2 + m_VBaseRangeMax: 151.2 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1103,29 +1177,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 871.6 - height: 377.2 + width: 746.8 + height: 378 m_Scale: {x: 1.25, y: 1.25} - m_Translation: {x: 435.8, y: 188.6} + m_Translation: {x: 373.4, y: 189} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -348.63998 - y: -150.88 - width: 697.27997 - height: 301.76 + x: -298.72 + y: -151.2 + width: 597.44 + height: 302.4 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1089.5, y: 497.75} + m_LastWindowPixelSize: {x: 933.5, y: 498.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &18 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1147,9 +1221,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 7.2000003 - y: 500 + y: 500.80002 width: 1160.6 - height: 268.2 + height: 267.40002 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 From 0765af51be8b83885f4c1a473a1be53291aecf8b Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Fri, 11 Oct 2024 18:27:58 +0530 Subject: [PATCH 04/18] Added rigid body component to the player --- Assets/Animate/Scene.unity | 219 +++- .../Layouts/CurrentMaximizeLayout.dwlt | 1141 +++++++++++++++++ UserSettings/Layouts/default-2022.dwlt | 1040 +++++++-------- 3 files changed, 1879 insertions(+), 521 deletions(-) create mode 100644 UserSettings/Layouts/CurrentMaximizeLayout.dwlt diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index eecf14c7d3..6a9182f77e 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -122,6 +122,136 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &558003131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 558003134} + - component: {fileID: 558003133} + - component: {fileID: 558003132} + m_Layer: 0 + m_Name: Platform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &558003132 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558003131} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.07955372} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 2, y: 2} + newSize: {x: 2, y: 2} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2, y: 1.8408926} + m_EdgeRadius: 0 +--- !u!212 &558003133 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558003131} + 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_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: 21300000, guid: aac9a30c9c349534990e2d84f22e7b28, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &558003134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558003131} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.03, y: -2.11, z: 0} + 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!1 &1260965266 GameObject: m_ObjectHideFlags: 0 @@ -214,6 +344,84 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1751292479 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + m_PrefabInstance: {fileID: 3967004074362709419} + m_PrefabAsset: {fileID: 0} +--- !u!50 &1751292483 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751292479} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &1751292484 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751292479} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0.10452217, y: 1.1572213} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.42, y: 0.1} + oldSize: {x: 3.7534883, y: 2.8325582} + newSize: {x: 3.7534883, y: 2.8325582} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.9264215, y: 2.6536584} + m_EdgeRadius: 0 --- !u!1001 &3967004074362709419 PrefabInstance: m_ObjectHideFlags: 0 @@ -280,7 +488,15 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1751292483} + - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1751292484} m_SourcePrefab: {fileID: 100100000, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: @@ -288,3 +504,4 @@ SceneRoots: m_Roots: - {fileID: 1260965269} - {fileID: 3967004074362709419} + - {fileID: 558003134} diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt new file mode 100644 index 0000000000..e028e33cba --- /dev/null +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -0,0 +1,1141 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + - {fileID: 14} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1536 + height: 722.8 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 40 + draggingID: 0 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 416.80002 + y: 73.6 + width: 754.00006 + height: 407.8 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -180, y: -26.399994} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: -224.6} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -217.60004, y: -301.6} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: AINavigationOverlay + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/TrailRenderer + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + m_OverlaysVisible: 1 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0.15027899, y: 0.91302323, z: 0} + speed: 2 + m_Value: {x: 0.15027899, y: 0.91302323, z: 0} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 2.3532987 + speed: 2 + m_Value: 2.3532987 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1172.8 + height: 722.8 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 41 + draggingID: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 5} + - {fileID: 7} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1172.8 + height: 428.8 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 42 + draggingID: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 416.8 + height: 428.8 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 6} + m_Panes: + - {fileID: 6} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73.6 + width: 415.8 + height: 407.8 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 28fbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 5} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 416.8 + y: 0 + width: 756.00006 + height: 428.8 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + - {fileID: 8} + - {fileID: 9} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 416.80002 + y: 73.6 + width: 754.00006 + height: 407.8 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 754.00006, y: 386.8} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -301.60004 + m_HBaseRangeMax: 301.60004 + m_VBaseRangeMin: -154.72 + m_VBaseRangeMax: 154.72 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 754.00006 + height: 386.8 + m_Scale: {x: 1.25, y: 1.25} + m_Translation: {x: 377.00006, y: 193.4} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -301.60004 + y: -154.72 + width: 603.2001 + height: 309.44 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 942.50006, y: 509.75} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 416.80002 + y: 73.6 + width: 754.00006 + height: 407.8 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, type: 2} + m_ValueSerializationHelper: + - e00: 0.85 + e01: 0 + e02: 0 + e03: 30.240082 + e10: 0 + e11: 0.85 + e12: 0 + e13: 26.880005 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 87df67ff1c3df244f8bd842fb1cc4f51, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimationWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 428.8 + width: 1172.8 + height: 294 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 11} + - {fileID: 12} + - {fileID: 13} + m_Selected: 2 + m_LastSelected: 1 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 439 + width: 1160.6 + height: 267.40002 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + m_LastFoldersGridSize: -1 + m_LastProjectPath: C:\Users\Parth Vaidya\OneDrive\Desktop\2D platformer\2D-Platformer-Game + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 240} + m_SelectedIDs: de5c0000 + m_LastClickedID: 23774 + m_ExpandedIDs: 00000000a85500007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000a85500007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: 585d00005a5d00005c5d00005e5d0000605d0000 + m_LastClickedInstanceID: 23896 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 7.2000003 + y: 500.80002 + width: 1160.6 + height: 267.40002 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 502.4 + width: 1171.8 + height: 273 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -1242 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1172.8 + y: 0 + width: 363.19995 + height: 722.8 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1172.8 + y: 73.6 + width: 362.19995 + height: 701.8 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 385.60004 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 4fb11fa980..5aa1dc9022 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 7.2000003 - y: 50.4 - width: 1521.6 - height: 758.4 + x: 0 + y: 43.2 + width: 1536 + height: 772.8 m_ShowMode: 4 - m_Title: Inspector - m_RootView: {fileID: 6} + m_Title: Game + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -33,23 +33,25 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 - y: 30 - width: 1521.6 - height: 708.4 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 81 - draggingID: 0 + y: 0 + width: 1536 + height: 772.8 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -59,23 +61,19 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1161.6 + x: 0 y: 0 - width: 360 - height: 708.4 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 + width: 1536 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -85,23 +83,18 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 412.8 - height: 420 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 + y: 752.8 + width: 1536 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -111,25 +104,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 6} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 - y: 420 - width: 1161.6 - height: 288.40002 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 14} - - {fileID: 19} - - {fileID: 13} - m_Selected: 2 - m_LastSelected: 1 + y: 30 + width: 1536 + height: 722.8 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 1165 + draggingID: 0 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,25 +130,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - {fileID: 7} - - {fileID: 2} - - {fileID: 8} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1521.6 - height: 758.4 - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_UseTopView: 1 - m_TopViewHeight: 30 - m_UseBottomView: 1 - m_BottomViewHeight: 20 + width: 1172.8 + height: 722.8 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 1166 + draggingID: 0 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -167,19 +156,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 8} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1521.6 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: + width: 1172.8 + height: 428.8 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 1160 + draggingID: 0 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,18 +182,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 738.4 - width: 1521.6 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} + y: 0 + width: 416.8 + height: 428.8 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -210,23 +208,25 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 5} + m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 416.8 y: 0 - width: 1161.6 - height: 708.4 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 247 - draggingID: 0 + width: 756.00006 + height: 428.8 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + - {fileID: 14} + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -236,23 +236,25 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimationWindow m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 11} + m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 1161.6 - height: 420 - m_MinSize: {x: 200, y: 50} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 248 - draggingID: 0 + y: 428.8 + width: 1172.8 + height: 294 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 16} + - {fileID: 17} + - {fileID: 18} + m_Selected: 2 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -263,24 +265,22 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 412.8 + x: 1172.8 y: 0 - width: 748.8 - height: 420 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + width: 363.19995 + height: 722.8 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 17} - - {fileID: 18} - - {fileID: 12} - m_Selected: 2 - m_LastSelected: 1 + - {fileID: 19} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -289,393 +289,23 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 420 - y: 80.8 - width: 746.8 - height: 399 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, type: 2} - m_ValueSerializationHelper: - - e00: 0.85 - e01: 0 - e02: 0 - e03: 30.240005 - e10: 0 - e11: 0.85 - e12: 0 - e13: 26.87999 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 87df67ff1c3df244f8bd842fb1cc4f51, - type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, - type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 1 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + m_Text: Scene + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.2000003 - y: 500.80002 - width: 1160.6 - height: 267.40002 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: -1242 ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 439 - width: 1160.6 - height: 267.40002 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch - m_Globs: [] - m_OriginalText: - m_ImportLogFlags: 0 - m_FilterByTypeIntersection: 0 - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch - m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\Parth Vaidya\OneDrive\Desktop\2D platformer\2D-Platformer-Game - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 240} - m_SelectedIDs: de5c0000 - m_LastClickedID: 23774 - m_ExpandedIDs: 00000000a85500007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000a85500007a5c00007c5c00007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: 585d00005a5d00005c5d00005e5d0000605d0000 - m_LastClickedInstanceID: 23896 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1168.8 - y: 80.8 - width: 359 - height: 687.4 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 7.2000003 - y: 80.8 - width: 411.8 - height: 399 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9ce2ffff - m_LastClickedID: 0 - m_ExpandedIDs: 28fbffff - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: Player - m_OriginalName: Player - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: -1242 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 0 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 4} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 420 - y: 80.8 - width: 746.8 - height: 399 + x: 416.80002 + y: 73.6 + width: 754.00006 + height: 407.8 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -989,7 +619,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -217.60004, y: -301.6} + snapOffset: {x: -217.6001, y: -301.6} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: AINavigationOverlay @@ -1021,9 +651,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.15027899, y: 0.91302323, z: 0} + m_Target: {x: -0.72144413, y: 1.5119354, z: -0.03067712} speed: 2 - m_Value: {x: 0.15027899, y: 0.91302323, z: 0} + m_Value: {x: -0.72144413, y: 1.5119354, z: -0.03067712} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1073,9 +703,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.3532987 + m_Target: 5.4210124 speed: 2 - m_Value: 2.3532987 + m_Value: 5.4210124 m_Ortho: m_Target: 1 speed: 2 @@ -1100,7 +730,71 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &18 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73.6 + width: 415.8 + height: 407.8 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 7ef2ffff + m_LastClickedID: -3458 + m_ExpandedIDs: 28fbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 8} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1121,10 +815,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 420 - y: 80.8 - width: 746.8 - height: 399 + x: 416.80002 + y: 73.6 + width: 754.00006 + height: 407.8 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1141,7 +835,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 746.8, y: 378} + m_TargetSize: {x: 754.00006, y: 386.8} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -1156,10 +850,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -298.72 - m_HBaseRangeMax: 298.72 - m_VBaseRangeMin: -151.2 - m_VBaseRangeMax: 151.2 + m_HBaseRangeMin: -301.60004 + m_HBaseRangeMax: 301.60004 + m_VBaseRangeMin: -154.72 + m_VBaseRangeMax: 154.72 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1168,7 +862,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1177,29 +871,249 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 746.8 - height: 378 + width: 754.00006 + height: 386.8 m_Scale: {x: 1.25, y: 1.25} - m_Translation: {x: 373.4, y: 189} + m_Translation: {x: 377.00006, y: 193.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -298.72 - y: -151.2 - width: 597.44 - height: 302.4 + x: -301.60004 + y: -154.72 + width: 603.2001 + height: 309.44 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 933.5, y: 498.75} + m_LastWindowPixelSize: {x: 942.50006, y: 509.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &19 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 416.80002 + y: 73.6 + width: 754.00006 + height: 407.8 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, type: 2} + m_ValueSerializationHelper: + - e00: 0.85 + e01: 0 + e02: 0 + e03: 30.240082 + e10: 0 + e11: 0.85 + e12: 0 + e13: 26.880005 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 87df67ff1c3df244f8bd842fb1cc4f51, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 439 + width: 1160.6 + height: 267.40002 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + m_LastFoldersGridSize: -1 + m_LastProjectPath: C:\Users\Parth Vaidya\OneDrive\Desktop\2D platformer\2D-Platformer-Game + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 240} + m_SelectedIDs: de5c0000 + m_LastClickedID: 23774 + m_ExpandedIDs: 00000000a85500007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000a85500007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: 585d00005a5d00005c5d00005e5d0000605d0000 + m_LastClickedInstanceID: 23896 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1234,3 +1148,89 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 502.4 + width: 1171.8 + height: 273 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -3458 +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1172.8 + y: 73.6 + width: 362.19995 + height: 701.8 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} From 88323d94f3396ff0226143d30d919634bddaf123 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Fri, 11 Oct 2024 19:07:54 +0530 Subject: [PATCH 05/18] Added horizontal input and flip --- Assets/Animate/Player.controller | 6 +- Assets/Animate/PlayerController.cs | 31 +++++++ Assets/Animate/PlayerController.cs.meta | 11 +++ Assets/Animate/PlayerIdle.anim | 14 +-- Assets/Animate/Scene.unity | 23 +++++ UserSettings/Layouts/default-2022.dwlt | 110 ++++++++++++------------ UserSettings/Search.index | 13 +++ UserSettings/Search.settings | 77 ++++++++++++++++- 8 files changed, 219 insertions(+), 66 deletions(-) create mode 100644 Assets/Animate/PlayerController.cs create mode 100644 Assets/Animate/PlayerController.cs.meta create mode 100644 UserSettings/Search.index diff --git a/Assets/Animate/Player.controller b/Assets/Animate/Player.controller index e6ca8136ac..9b6958f424 100644 --- a/Assets/Animate/Player.controller +++ b/Assets/Animate/Player.controller @@ -46,9 +46,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.10836394 m_TransitionOffset: 0 - m_ExitTime: 0.64285713 + m_ExitTime: 0.29961374 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -92,7 +92,7 @@ AnimatorController: m_AnimatorParameters: - m_Name: Speed m_Type: 1 - m_DefaultFloat: 0.25 + m_DefaultFloat: 0.3 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} diff --git a/Assets/Animate/PlayerController.cs b/Assets/Animate/PlayerController.cs new file mode 100644 index 0000000000..94ec7eb62c --- /dev/null +++ b/Assets/Animate/PlayerController.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UIElements; + +public class PlayerController : MonoBehaviour +{ + public Animator animator; + + private void Awake() + { + Debug.Log("Player is awake"); + } + private void Update() + { + float speed = Input.GetAxisRaw("Horizontal"); + animator.SetFloat("Speed" , Mathf.Abs(speed)); + Vector3 scale = transform.localScale; + if (speed <0 ) + { + + scale.x = -1f * Mathf.Abs(scale.x); + } + else if (speed > 0) + { + scale.x = Mathf.Abs(scale.x); + } + + transform.localScale = scale; + } +} diff --git a/Assets/Animate/PlayerController.cs.meta b/Assets/Animate/PlayerController.cs.meta new file mode 100644 index 0000000000..c14ce6b461 --- /dev/null +++ b/Assets/Animate/PlayerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8af87564c3d1e00409cd1549b4ab55d2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/PlayerIdle.anim b/Assets/Animate/PlayerIdle.anim index cf337a02f5..178d72fba3 100644 --- a/Assets/Animate/PlayerIdle.anim +++ b/Assets/Animate/PlayerIdle.anim @@ -28,10 +28,14 @@ AnimationClip: value: {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} - time: 0.15 value: {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} - time: 0.2 value: {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} - time: 0.25 value: {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} - time: 0.3 value: {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} - time: 0.33333334 @@ -46,10 +50,6 @@ AnimationClip: value: {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} - time: 0.5833333 value: {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} - - time: 0.6333333 - value: {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} - - time: 0.68333334 - value: {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} attribute: m_Sprite path: classID: 212 @@ -76,8 +76,10 @@ AnimationClip: - {fileID: 21300000, guid: 1fa29ad54380226498c2250e612fec93, type: 3} - {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} - {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} + - {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} - {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} - {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} + - {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} - {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} - {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} - {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} @@ -85,14 +87,12 @@ AnimationClip: - {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} - {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} - {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} - - {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} - - {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.7 + m_StopTime: 0.59999996 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index 6a9182f77e..38c0157bbb 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -422,6 +422,25 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.9264215, y: 2.6536584} m_EdgeRadius: 0 +--- !u!114 &1751292485 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751292479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8af87564c3d1e00409cd1549b4ab55d2, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 1751292486} +--- !u!95 &1751292486 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 7403193974885477311, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + m_PrefabInstance: {fileID: 3967004074362709419} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3967004074362709419 PrefabInstance: m_ObjectHideFlags: 0 @@ -497,6 +516,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1751292484} + - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1751292485} m_SourcePrefab: {fileID: 100100000, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 5aa1dc9022..e367cd9ad7 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 1165 + controlID: 39 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 1166 + controlID: 40 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 1160 + controlID: 41 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -209,7 +209,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -218,15 +218,15 @@ MonoBehaviour: y: 0 width: 756.00006 height: 428.8 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 12} - {fileID: 14} - {fileID: 15} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 2 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -237,7 +237,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -246,14 +246,14 @@ MonoBehaviour: y: 428.8 width: 1172.8 height: 294 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} - {fileID: 17} - {fileID: 18} - m_Selected: 2 + m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: @@ -360,7 +360,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -412,7 +412,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Light Settings index: 2 @@ -438,7 +438,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Cloth Constraints index: 3 @@ -451,7 +451,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Cloth Collisions index: 4 @@ -503,7 +503,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Occlusion Culling index: 5 @@ -516,7 +516,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Physics Debugger index: 6 @@ -529,7 +529,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Scene Visibility index: 7 @@ -542,7 +542,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 24.8} snapCorner: 0 id: Scene View/Particles index: 8 @@ -651,9 +651,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.72144413, y: 1.5119354, z: -0.03067712} + m_Target: {x: 0.15027899, y: 0.91302323, z: 0} speed: 2 - m_Value: {x: -0.72144413, y: 1.5119354, z: -0.03067712} + m_Value: {x: 0.15027899, y: 0.91302323, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -678,7 +678,7 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} + m_Size: {x: 1, y: 1} yGrid: m_Fade: m_Target: 0 @@ -703,9 +703,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 5.4210124 + m_Target: 2.3532987 speed: 2 - m_Value: 5.4210124 + m_Value: 2.3532987 m_Ortho: m_Target: 1 speed: 2 @@ -723,8 +723,8 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - m_LastSceneViewOrtho: 0 + m_LastSceneViewRotation: {x: 0, y: -0.7071068, z: -0, w: 0.7071068} + m_LastSceneViewOrtho: 1 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 @@ -768,23 +768,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7ef2ffff - m_LastClickedID: -3458 - m_ExpandedIDs: 28fbffff + m_SelectedIDs: 725d0000 + m_LastClickedID: 0 + m_ExpandedIDs: 92f8ffff28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Player + m_OriginalName: Player m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 23614 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -862,7 +862,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -988,9 +988,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 439 - width: 1160.6 - height: 267.40002 + y: 502.4 + width: 1171.8 + height: 273 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1012,7 +1012,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + - Assets/Animate m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1020,16 +1020,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + - Assets/Animate m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\Parth Vaidya\OneDrive\Desktop\2D platformer\2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 240} - m_SelectedIDs: de5c0000 - m_LastClickedID: 23774 - m_ExpandedIDs: 00000000a85500007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: e85c0000 + m_LastClickedID: 23784 + m_ExpandedIDs: 00000000a8550000945c0000965c0000985c00009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1057,7 +1057,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000a85500007e5c0000805c0000825c0000845c0000865c0000885c00008a5c00008c5c00008e5c0000905c0000925c0000945c0000965c0000 + m_ExpandedIDs: 00000000a8550000945c0000965c0000985c00009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1082,8 +1082,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 585d00005a5d00005c5d00005e5d0000605d0000 - m_LastClickedInstanceID: 23896 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -1101,7 +1101,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 3} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1134,10 +1134,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 7.2000003 - y: 500.80002 - width: 1160.6 - height: 267.40002 + x: 0 + y: 502.4 + width: 1171.8 + height: 273 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1185,7 +1185,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -3458 + m_LastSelectedObjectID: 26012 --- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 diff --git a/UserSettings/Search.index b/UserSettings/Search.index new file mode 100644 index 0000000000..4b70da616f --- /dev/null +++ b/UserSettings/Search.index @@ -0,0 +1,13 @@ +{ + "name": "Assets", + "roots": ["Assets"], + "includes": [], + "excludes": ["Assets/Temp/", "Assets/External/"], + "options": { + "types": true, + "properties": true, + "extended": false, + "dependencies": false + }, + "baseScore": 999 +} \ No newline at end of file diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 9e26dfeeb6..6c7ff482ee 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -1 +1,76 @@ -{} \ No newline at end of file +trackSelection = true +refreshSearchWindowsInPlayMode = false +pickerAdvancedUI = false +fetchPreview = true +defaultFlags = 0 +keepOpen = false +queryFolder = "Assets" +onBoardingDoNotAskAgain = true +showPackageIndexes = false +showStatusBar = false +scopes = { +} +providers = { + asset = { + active = true + priority = 25 + defaultAction = null + } + scene = { + active = true + priority = 50 + defaultAction = null + } + adb = { + active = false + priority = 2500 + defaultAction = null + } + find = { + active = true + priority = 25 + defaultAction = null + } + packages = { + active = false + priority = 90 + defaultAction = null + } + profilermarkers = { + active = false + priority = 100 + defaultAction = null + } + store = { + active = false + priority = 100 + defaultAction = null + } + performance = { + active = false + priority = 100 + defaultAction = null + } + log = { + active = false + priority = 210 + defaultAction = null + } +} +objectSelectors = { +} +recentSearches = [ +] +searchItemFavorites = [ +] +savedSearchesSortOrder = 0 +showSavedSearchPanel = false +hideTabs = false +expandedQueries = [ +] +queryBuilder = true +ignoredProperties = "id;name;classname;imagecontentshash" +helperWidgetCurrentArea = "all" +disabledIndexers = "" +minIndexVariations = 2 +findProviderIndexHelper = true \ No newline at end of file From 72059093a62ffe5544ef0904100064d9efe49986 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Fri, 11 Oct 2024 19:27:44 +0530 Subject: [PATCH 06/18] Crouch --- Assets/Animate/PlayerController.cs | 41 ++++++++++++++++++-------- Assets/Animate/Scene.unity | 3 +- UserSettings/Layouts/default-2022.dwlt | 38 ++++++++++++------------ 3 files changed, 49 insertions(+), 33 deletions(-) diff --git a/Assets/Animate/PlayerController.cs b/Assets/Animate/PlayerController.cs index 94ec7eb62c..a1e3cebb4a 100644 --- a/Assets/Animate/PlayerController.cs +++ b/Assets/Animate/PlayerController.cs @@ -5,27 +5,42 @@ public class PlayerController : MonoBehaviour { - public Animator animator; + [SerializeField] private Animator playerAnimator; + [SerializeField] private BoxCollider2D boxCol; - private void Awake() + //Collider Variables + private Vector2 boxColInitSize; + private Vector2 boxColInitOffset; + + private void Start() { - Debug.Log("Player is awake"); + //Fetching initial collider properties + boxColInitSize = boxCol.size; + boxColInitOffset = boxCol.offset; } - private void Update() + + public void Crouch(bool crouch) { - float speed = Input.GetAxisRaw("Horizontal"); - animator.SetFloat("Speed" , Mathf.Abs(speed)); - Vector3 scale = transform.localScale; - if (speed <0 ) + if (crouch == true) { - - scale.x = -1f * Mathf.Abs(scale.x); + float offX = -0.0978f; //Offset X + float offY = 0.5947f; //Offset Y + + float sizeX = 0.6988f; //Size X + float sizeY = 1.3398f; //Size Y + + boxCol.size = new Vector2(sizeX, sizeY); //Setting the size of collider + boxCol.offset = new Vector2(offX, offY); //Setting the offset of collider } - else if (speed > 0) + + else { - scale.x = Mathf.Abs(scale.x); + //Reset collider to initial values + boxCol.size = boxColInitSize; + boxCol.offset = boxColInitOffset; } - transform.localScale = scale; + //Play Crouch animation + playerAnimator.SetBool("Crouch", crouch); } } diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index 38c0157bbb..87908be2db 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -434,7 +434,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8af87564c3d1e00409cd1549b4ab55d2, type: 3} m_Name: m_EditorClassIdentifier: - animator: {fileID: 1751292486} + playerAnimator: {fileID: 1751292486} + boxCol: {fileID: 1751292484} --- !u!95 &1751292486 stripped Animator: m_CorrespondingSourceObject: {fileID: 7403193974885477311, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index e367cd9ad7..4cf165f640 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 39 + controlID: 114 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -192,8 +192,8 @@ MonoBehaviour: y: 0 width: 416.8 height: 428.8 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -218,8 +218,8 @@ MonoBehaviour: y: 0 width: 756.00006 height: 428.8 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 12} @@ -723,8 +723,8 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: -0.7071068, z: -0, w: 0.7071068} - m_LastSceneViewOrtho: 1 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 @@ -768,23 +768,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 725d0000 - m_LastClickedID: 0 - m_ExpandedIDs: 92f8ffff28fbffff + m_SelectedIDs: 405c0000 + m_LastClickedID: 23616 + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Player - m_OriginalName: Player + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 23614 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -1027,9 +1027,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e85c0000 - m_LastClickedID: 23784 - m_ExpandedIDs: 00000000a8550000945c0000965c0000985c00009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c000000ca9a3b + m_SelectedIDs: d05c0000 + m_LastClickedID: 23760 + m_ExpandedIDs: 00000000aa5500009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000b05c0000b25c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1057,7 +1057,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000a8550000945c0000965c0000985c00009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000 + m_ExpandedIDs: 00000000aa5500009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000b05c0000b25c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1228,7 +1228,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 943.9 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: From 85f69147d33b93c662fd039ff698661b1b9e49b4 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Mon, 14 Oct 2024 18:45:50 +0530 Subject: [PATCH 07/18] Movement added --- Assets/Animate/Player.controller | 172 ++++++++++++------ Assets/Animate/PlayerController.cs | 81 ++++++--- Assets/Animate/PlayerController.cs.meta | 2 +- Assets/Animate/PlayerCrouch.anim | 84 --------- Assets/Animate/PlayerIdle.anim | 41 +++-- Assets/Animate/PlayerJump.anim | 126 +++++++++++++ ...rCrouch.anim.meta => PlayerJump.anim.meta} | 2 +- Assets/Animate/PlayerRun.anim | 44 ++--- Assets/Animate/Scene.unity | 38 ++-- ProjectSettings/InputManager.asset | 3 +- UserSettings/Layouts/default-2022.dwlt | 170 ++++++++--------- 11 files changed, 454 insertions(+), 309 deletions(-) delete mode 100644 Assets/Animate/PlayerCrouch.anim create mode 100644 Assets/Animate/PlayerJump.anim rename Assets/Animate/{PlayerCrouch.anim.meta => PlayerJump.anim.meta} (79%) diff --git a/Assets/Animate/Player.controller b/Assets/Animate/Player.controller index 9b6958f424..81c2567868 100644 --- a/Assets/Animate/Player.controller +++ b/Assets/Animate/Player.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8065963014930261805 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.25 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3742509327132596459} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7058823 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-5536339182766939842 AnimatorStateMachine: serializedVersion: 6 @@ -10,26 +35,26 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 6289191237812598881} + m_State: {fileID: 3742509327132596459} m_Position: {x: 30, y: 220, z: 0} - serializedVersion: 1 - m_State: {fileID: 8949746722948261927} - m_Position: {x: 290, y: 120, z: 0} + m_State: {fileID: -2332736677311201838} + m_Position: {x: 280, y: 320, z: 0} - serializedVersion: 1 - m_State: {fileID: -965254682144170917} - m_Position: {x: 310, y: 290, z: 0} + m_State: {fileID: 3624739282406069288} + m_Position: {x: -120, y: 370, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - - {fileID: 6614470771313546883} + - {fileID: -4341901985093911839} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 80, y: 290, z: 0} + m_AnyStatePosition: {x: 140, y: 450, 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: 6289191237812598881} ---- !u!1101 &-5228068634080624363 + m_DefaultState: {fileID: 3742509327132596459} +--- !u!1101 &-4341901985093911839 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -37,35 +62,36 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 3 - m_ConditionEvent: Speed - m_EventTreshold: 0.25 + - m_ConditionMode: 1 + m_ConditionEvent: Jump + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 8949746722948261927} + m_DstState: {fileID: 3624739282406069288} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.10836394 + m_TransitionDuration: 0.2 m_TransitionOffset: 0 - m_ExitTime: 0.29961374 + m_ExitTime: 0.75 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &-965254682144170917 +--- !u!1102 &-2332736677311201838 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: PlayerCrouch + m_Name: PlayerRun m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 278716395150183716} + - {fileID: -8065963014930261805} + - {fileID: 8192008378979893916} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -75,7 +101,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 6d53e7a52c13fae4599cd771eb79a717, type: 2} + m_Motion: {fileID: 7400000, guid: d90a5de4d9b75ef4eb984355bc4f696f, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -92,15 +118,15 @@ AnimatorController: m_AnimatorParameters: - m_Name: Speed m_Type: 1 - m_DefaultFloat: 0.3 + m_DefaultFloat: 0.24 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: Crouch + - m_Name: Jump m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 - m_DefaultBool: 1 + m_DefaultBool: 0 m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 @@ -115,7 +141,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &278716395150183716 +--- !u!1101 &681579900434439973 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -124,23 +150,75 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: Crouch + m_ConditionEvent: Jump m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 6289191237812598881} + m_DstState: {fileID: 3742509327132596459} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.1 m_TransitionOffset: 0 - m_ExitTime: 0.34782612 - m_HasExitTime: 1 + m_ExitTime: 0.63414633 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &6289191237812598881 +--- !u!1101 &2877308113327430837 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Speed + m_EventTreshold: 0.25 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2332736677311201838} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.673913 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &3624739282406069288 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerJump + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 681579900434439973} + 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: d306f1eb21e211a4bbba8fa6cde2cf0a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &3742509327132596459 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -151,7 +229,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -5228068634080624363} + - {fileID: 2877308113327430837} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -167,7 +245,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &6614470771313546883 +--- !u!1101 &8192008378979893916 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -176,45 +254,19 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Crouch + m_ConditionEvent: Jump m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -965254682144170917} + m_DstState: {fileID: 3624739282406069288} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0.7058823 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &8949746722948261927 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PlayerRun - 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: d90a5de4d9b75ef4eb984355bc4f696f, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Animate/PlayerController.cs b/Assets/Animate/PlayerController.cs index a1e3cebb4a..e88a1fae44 100644 --- a/Assets/Animate/PlayerController.cs +++ b/Assets/Animate/PlayerController.cs @@ -1,46 +1,77 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using UnityEngine.UIElements; public class PlayerController : MonoBehaviour { [SerializeField] private Animator playerAnimator; - [SerializeField] private BoxCollider2D boxCol; + public float speed; + public float jumpForce = 7f; // Adjust jump force as needed + public bool isGrounded; + //Take a reference from inspector. + - //Collider Variables - private Vector2 boxColInitSize; - private Vector2 boxColInitOffset; + - private void Start() + public void Update() { - //Fetching initial collider properties - boxColInitSize = boxCol.size; - boxColInitOffset = boxCol.offset; + float horizontal = Input.GetAxisRaw("Horizontal"); + MoveCharacter(horizontal); + PlayMovementAnimation(horizontal); + + // Jump logic + if (Input.GetKeyDown(KeyCode.Space) ) + { + Jump(); + } + + } - public void Crouch(bool crouch) + private void MoveCharacter(float horizontal) { - if (crouch == true) - { - float offX = -0.0978f; //Offset X - float offY = 0.5947f; //Offset Y + Vector3 position = transform.position; + position.x = position.x + horizontal * speed * Time.deltaTime; + transform.position = position; - float sizeX = 0.6988f; //Size X - float sizeY = 1.3398f; //Size Y + } - boxCol.size = new Vector2(sizeX, sizeY); //Setting the size of collider - boxCol.offset = new Vector2(offX, offY); //Setting the offset of collider - } + private void PlayMovementAnimation(float horizontal) + { + playerAnimator.SetFloat("Speed", Mathf.Abs(horizontal)); + + + //Flipping the player - else + Vector3 scale = transform.localScale; + if (horizontal < 0) { - //Reset collider to initial values - boxCol.size = boxColInitSize; - boxCol.offset = boxColInitOffset; + scale.x = -1f * Mathf.Abs(scale.x); } + else if (horizontal > 0) + { + scale.x = Mathf.Abs(scale.x); + } + transform.localScale = scale; - //Play Crouch animation - playerAnimator.SetBool("Crouch", crouch); + Input.GetAxisRaw("Vertical"); + Input.GetKeyDown(KeyCode.Space); } + + private void Jump() + { + // Trigger the jump animation + playerAnimator.SetBool("Jump", true); + + + + + isGrounded = false; + + + } + + + + } diff --git a/Assets/Animate/PlayerController.cs.meta b/Assets/Animate/PlayerController.cs.meta index c14ce6b461..221e391b6f 100644 --- a/Assets/Animate/PlayerController.cs.meta +++ b/Assets/Animate/PlayerController.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8af87564c3d1e00409cd1549b4ab55d2 +guid: 45f348235c5c0fa44b9fa36af9e72fd2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Animate/PlayerCrouch.anim b/Assets/Animate/PlayerCrouch.anim deleted file mode 100644 index dfb13d1731..0000000000 --- a/Assets/Animate/PlayerCrouch.anim +++ /dev/null @@ -1,84 +0,0 @@ -%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: PlayerCrouch - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - serializedVersion: 2 - curve: - - time: 0 - value: {fileID: 21300000, guid: 5a1cef7e9c9ed034da742d0e08ea786a, type: 3} - - time: 0.05 - value: {fileID: 21300000, guid: a9c37448b62c0d149aced6ded9e44e4a, type: 3} - - time: 0.11666667 - value: {fileID: 21300000, guid: 7d37e1dfeba60ea4a8803c12675079b6, type: 3} - - time: 0.31666666 - value: {fileID: 21300000, guid: a9e9e74909b5a0947a093069d6a017cc, type: 3} - - time: 0.36666667 - value: {fileID: 21300000, guid: b5b9f448600b9aa4daa1d9fd5069a764, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - flags: 2 - m_SampleRate: 60 - 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: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: - - {fileID: 21300000, guid: 5a1cef7e9c9ed034da742d0e08ea786a, type: 3} - - {fileID: 21300000, guid: a9c37448b62c0d149aced6ded9e44e4a, type: 3} - - {fileID: 21300000, guid: 7d37e1dfeba60ea4a8803c12675079b6, type: 3} - - {fileID: 21300000, guid: a9e9e74909b5a0947a093069d6a017cc, type: 3} - - {fileID: 21300000, guid: b5b9f448600b9aa4daa1d9fd5069a764, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.38333336 - 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/Assets/Animate/PlayerIdle.anim b/Assets/Animate/PlayerIdle.anim index 178d72fba3..9acdbc71a9 100644 --- a/Assets/Animate/PlayerIdle.anim +++ b/Assets/Animate/PlayerIdle.anim @@ -20,36 +20,38 @@ AnimationClip: m_PPtrCurves: - serializedVersion: 2 curve: - - time: 0 + - time: 0.016666668 value: {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} - - time: 0.05 + - time: 0.033333335 + value: {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} + - time: 0.06666667 value: {fileID: 21300000, guid: 1fa29ad54380226498c2250e612fec93, type: 3} - - time: 0.1 + - time: 0.11666667 value: {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} - - time: 0.15 + - time: 0.28333333 value: {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} - - time: 0.18333334 - value: {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} - - time: 0.2 + - time: 0.31666666 value: {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} - - time: 0.25 + - time: 0.33333334 value: {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} - - time: 0.26666668 - value: {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} - - time: 0.3 + - time: 0.36666667 value: {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} - - time: 0.33333334 + - time: 0.4 value: {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} - - time: 0.38333333 - value: {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} - time: 0.43333334 + value: {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} + - time: 0.45 value: {fileID: 21300000, guid: 76089009971280441963c2a3a55b5071, type: 3} - time: 0.48333332 value: {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} - - time: 0.53333336 + - time: 0.65 value: {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} - - time: 0.5833333 + - time: 0.7 value: {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} + - time: 0.73333335 + value: {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} attribute: m_Sprite path: classID: 212 @@ -73,13 +75,12 @@ AnimationClip: isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} + - {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} - {fileID: 21300000, guid: 1fa29ad54380226498c2250e612fec93, type: 3} - {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} - {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} - - {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} - {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} - {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} - - {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} - {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} - {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} - {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} @@ -87,12 +88,14 @@ AnimationClip: - {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} - {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} - {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} + - {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} + - {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.59999996 + m_StopTime: 0.76666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animate/PlayerJump.anim b/Assets/Animate/PlayerJump.anim new file mode 100644 index 0000000000..e982b0051c --- /dev/null +++ b/Assets/Animate/PlayerJump.anim @@ -0,0 +1,126 @@ +%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: PlayerJump + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 5767e2180fcbb7a4d9980e9a37e3d588, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 6f8b0a53ff8c9e94f9d4af829e2ad6f3, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: affa4f4470b317440b7cb5187df710ef, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 4214a14962bcf4943baf9e184b9b928e, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: bb6a891737c56e6438e808fb4e716321, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: af68c0be2e67f3846bcdf33841f8312b, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: ae6184443cb4d0f439bab73e9e76df4a, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} + - time: 0.51666665 + value: {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} + - time: 0.55 + value: {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} + - time: 0.6333333 + value: {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 5767e2180fcbb7a4d9980e9a37e3d588, type: 3} + - {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} + - {fileID: 21300000, guid: 6f8b0a53ff8c9e94f9d4af829e2ad6f3, type: 3} + - {fileID: 21300000, guid: affa4f4470b317440b7cb5187df710ef, type: 3} + - {fileID: 21300000, guid: 4214a14962bcf4943baf9e184b9b928e, type: 3} + - {fileID: 21300000, guid: bb6a891737c56e6438e808fb4e716321, type: 3} + - {fileID: 21300000, guid: af68c0be2e67f3846bcdf33841f8312b, type: 3} + - {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} + - {fileID: 21300000, guid: ae6184443cb4d0f439bab73e9e76df4a, type: 3} + - {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} + - {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} + - {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} + - {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} + - {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} + - {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} + - {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} + - {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} + - {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} + - {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + 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/Assets/Animate/PlayerCrouch.anim.meta b/Assets/Animate/PlayerJump.anim.meta similarity index 79% rename from Assets/Animate/PlayerCrouch.anim.meta rename to Assets/Animate/PlayerJump.anim.meta index 102565f429..b02dfcae2b 100644 --- a/Assets/Animate/PlayerCrouch.anim.meta +++ b/Assets/Animate/PlayerJump.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6d53e7a52c13fae4599cd771eb79a717 +guid: d306f1eb21e211a4bbba8fa6cde2cf0a NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Animate/PlayerRun.anim b/Assets/Animate/PlayerRun.anim index 291f6a5ac6..2268acd946 100644 --- a/Assets/Animate/PlayerRun.anim +++ b/Assets/Animate/PlayerRun.anim @@ -22,47 +22,47 @@ AnimationClip: curve: - time: 0 value: {fileID: 21300000, guid: ff33d6adfeac52e419af23fad2d0abfd, type: 3} - - time: 0.016666668 - value: {fileID: 21300000, guid: 12ea17332fa174442af48960686e1769, type: 3} - time: 0.033333335 + value: {fileID: 21300000, guid: 12ea17332fa174442af48960686e1769, type: 3} + - time: 0.083333336 value: {fileID: 21300000, guid: 45ed26a75477df843a013176e95192a9, type: 3} - - time: 0.05 + - time: 0.11666667 value: {fileID: 21300000, guid: 3a5b7c781691c8642af63e9c1e6c14de, type: 3} - - time: 0.06666667 + - time: 0.16666667 value: {fileID: 21300000, guid: 87e29b609bb169245a2df3d89266630c, type: 3} - - time: 0.083333336 + - time: 0.2 value: {fileID: 21300000, guid: a4cfd522aaaa4ac45980e1828c8dea2c, type: 3} - - time: 0.1 + - time: 0.23333333 value: {fileID: 21300000, guid: 2eaa4938329e1204ca267982a8cdb3fa, type: 3} - - time: 0.11666667 + - time: 0.28333333 value: {fileID: 21300000, guid: dfd2eca0b8de7a443a0b28c6466f55ba, type: 3} - - time: 0.13333334 + - time: 0.31666666 value: {fileID: 21300000, guid: 301fc9f2a0405ee45ad84f7b550051d5, type: 3} - - time: 0.15 + - time: 0.35 value: {fileID: 21300000, guid: 05df8025a12814d46b434681a6989133, type: 3} - - time: 0.16666667 + - time: 0.4 value: {fileID: 21300000, guid: 5d25d9e1de070994db63a462e89932d7, type: 3} - - time: 0.21666667 + - time: 0.43333334 value: {fileID: 21300000, guid: 9989c37dedfecfa4591fd9f1821713cb, type: 3} - - time: 0.23333333 + - time: 0.48333332 value: {fileID: 21300000, guid: 89339a864e8d9994ea7c9531ae92e67e, type: 3} - - time: 0.25 + - time: 0.51666665 value: {fileID: 21300000, guid: 453c8803862e72b43ad3652b8fe03437, type: 3} - - time: 0.26666668 + - time: 0.55 value: {fileID: 21300000, guid: eb350ede4895d6d418689eb126b772cb, type: 3} - - time: 0.28333333 + - time: 0.6 value: {fileID: 21300000, guid: 79d7163dfd26ad748bf88cdc6b98d2f5, type: 3} - - time: 0.3 + - time: 0.6333333 value: {fileID: 21300000, guid: 690102d87edd7d047824362d73a02788, type: 3} - - time: 0.31666666 + - time: 0.6666667 value: {fileID: 21300000, guid: 5cdf5107efb2e8c4d980153f752a57c1, type: 3} - - time: 0.33333334 + - time: 0.71666664 value: {fileID: 21300000, guid: 3b3834ff0aab3d849bca2adc0c0d5f84, type: 3} - - time: 0.35 + - time: 0.75 value: {fileID: 21300000, guid: d3c1e30225625c14e9bf351c35be2fd9, type: 3} - - time: 0.36666667 + - time: 0.8 value: {fileID: 21300000, guid: 88f2ac18ae0c71845bc1d47bd924f8a8, type: 3} - - time: 0.38333333 + - time: 0.8333333 value: {fileID: 21300000, guid: 37547022c0607c544915b3089832635d, type: 3} attribute: m_Sprite path: @@ -113,7 +113,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.4 + m_StopTime: 0.84999996 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index 87908be2db..8d8e8374e3 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -246,8 +246,8 @@ Transform: m_GameObject: {fileID: 558003131} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.03, y: -2.11, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0.1663, y: -2.11, z: 0} + m_LocalScale: {x: 6.489827, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -422,7 +422,13 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.9264215, y: 2.6536584} m_EdgeRadius: 0 ---- !u!114 &1751292485 +--- !u!95 &1751292486 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 7403193974885477311, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + m_PrefabInstance: {fileID: 3967004074362709419} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1751292489 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -434,14 +440,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8af87564c3d1e00409cd1549b4ab55d2, type: 3} m_Name: m_EditorClassIdentifier: - playerAnimator: {fileID: 1751292486} - boxCol: {fileID: 1751292484} ---- !u!95 &1751292486 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 7403193974885477311, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, - type: 3} - m_PrefabInstance: {fileID: 3967004074362709419} +--- !u!114 &1751292490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751292479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45f348235c5c0fa44b9fa36af9e72fd2, type: 3} + m_Name: + m_EditorClassIdentifier: + playerAnimator: {fileID: 1751292486} + speed: 4 --- !u!1001 &3967004074362709419 PrefabInstance: m_ObjectHideFlags: 0 @@ -520,7 +532,11 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} insertIndex: -1 - addedObject: {fileID: 1751292485} + addedObject: {fileID: 1751292489} + - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1751292490} m_SourcePrefab: {fileID: 100100000, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 17c8f538e2..8978beeff6 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -15,7 +15,7 @@ InputManager: altPositiveButton: d gravity: 3 dead: 0.001 - sensitivity: 3 + sensitivity: 4 snap: 1 invert: 0 type: 0 @@ -293,3 +293,4 @@ InputManager: type: 0 axis: 0 joyNum: 0 + m_UsePhysicalKeys: 1 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 4cf165f640..3f30ac3cb1 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Game + m_Title: Animator m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 114 + controlID: 40 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 40 + controlID: 41 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 41 + controlID: 42 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,11 +192,11 @@ MonoBehaviour: y: 0 width: 416.8 height: 428.8 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -209,7 +209,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: AnimatorControllerTool m_EditorClassIdentifier: m_Children: [] m_Position: @@ -218,15 +218,15 @@ MonoBehaviour: y: 0 width: 756.00006 height: 428.8 - m_MinSize: {x: 202, y: 221} + m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 12} - - {fileID: 14} + - {fileID: 13} - {fileID: 15} - m_Selected: 1 - m_LastSelected: 2 + - {fileID: 16} + m_Selected: 2 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -248,11 +248,11 @@ MonoBehaviour: height: 294 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 16} - {fileID: 17} - {fileID: 18} + - {fileID: 12} m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 @@ -282,6 +282,44 @@ MonoBehaviour: m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 502.4 + width: 1171.8 + height: 273 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 23614 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -360,7 +398,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -412,7 +450,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings index: 2 @@ -438,7 +476,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Constraints index: 3 @@ -451,7 +489,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Collisions index: 4 @@ -503,7 +541,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Occlusion Culling index: 5 @@ -516,7 +554,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger index: 6 @@ -529,7 +567,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility index: 7 @@ -542,7 +580,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles index: 8 @@ -651,9 +689,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.15027899, y: 0.91302323, z: 0} + m_Target: {x: 1.124938, y: -0.1097521, z: -0.033221763} speed: 2 - m_Value: {x: 0.15027899, y: 0.91302323, z: 0} + m_Value: {x: 1.124938, y: -0.1097521, z: -0.033221763} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -703,9 +741,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.3532987 + m_Target: 5.675482 speed: 2 - m_Value: 2.3532987 + m_Value: 5.675482 m_Ortho: m_Target: 1 speed: 2 @@ -730,7 +768,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -768,8 +806,8 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 405c0000 - m_LastClickedID: 23616 + m_SelectedIDs: 6a5c0000 + m_LastClickedID: 0 m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -794,7 +832,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -893,7 +931,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -932,14 +970,14 @@ MonoBehaviour: m_KeySerializationHelper: - {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, type: 2} m_ValueSerializationHelper: - - e00: 0.85 + - e00: 0.6131749 e01: 0 e02: 0 - e03: 30.240082 + e03: 54.070587 e10: 0 - e11: 0.85 + e11: 0.6131749 e12: 0 - e13: 26.880005 + e13: -24.10521 e20: 0 e21: 0 e22: 1 @@ -966,7 +1004,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1027,9 +1065,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: d05c0000 - m_LastClickedID: 23760 - m_ExpandedIDs: 00000000aa5500009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000b05c0000b25c000000ca9a3b + m_SelectedIDs: d85c0000 + m_LastClickedID: 23768 + m_ExpandedIDs: 00000000aa550000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000b05c0000b25c0000b45c0000b65c0000b85c0000ba5c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1057,7 +1095,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000aa5500009a5c00009c5c00009e5c0000a05c0000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000b05c0000b25c0000 + m_ExpandedIDs: 00000000aa550000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000b05c0000b25c0000b45c0000b65c0000b85c0000ba5c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1085,7 +1123,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000 + m_ExpandedInstanceIDs: c62300005c5c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1101,7 +1139,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 3} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1113,7 +1151,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &17 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1148,44 +1186,6 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 502.4 - width: 1171.8 - height: 273 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: 26012 --- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1228,7 +1228,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 943.9 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: From 81109089dc65e5579ed4fc7f6b4f835e261bcc5a Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Tue, 15 Oct 2024 14:01:05 +0530 Subject: [PATCH 08/18] Vertical input & Jump added --- Assets/Animate/Player.controller | 54 ++++++++++++------------- Assets/Animate/PlayerController.cs | 56 ++++++++++++++------------ Assets/Animate/Scene.unity | 7 ++-- UserSettings/Layouts/default-2022.dwlt | 26 ++++++------ 4 files changed, 74 insertions(+), 69 deletions(-) diff --git a/Assets/Animate/Player.controller b/Assets/Animate/Player.controller index 81c2567868..8f7dd1ccbe 100644 --- a/Assets/Animate/Player.controller +++ b/Assets/Animate/Player.controller @@ -91,7 +91,6 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -8065963014930261805} - - {fileID: 8192008378979893916} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -107,6 +106,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-501504970514115944 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Jump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2332736677311201838} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.63414633 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -149,7 +173,7 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 2 + - m_ConditionMode: 1 m_ConditionEvent: Jump m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} @@ -203,6 +227,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 681579900434439973} + - {fileID: -501504970514115944} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -245,28 +270,3 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &8192008378979893916 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Jump - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3624739282406069288} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.7058823 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 diff --git a/Assets/Animate/PlayerController.cs b/Assets/Animate/PlayerController.cs index e88a1fae44..c77adb0d82 100644 --- a/Assets/Animate/PlayerController.cs +++ b/Assets/Animate/PlayerController.cs @@ -5,38 +5,46 @@ public class PlayerController : MonoBehaviour { [SerializeField] private Animator playerAnimator; + public float speed; - public float jumpForce = 7f; // Adjust jump force as needed - public bool isGrounded; + public float jump; + + private Rigidbody2D rb2d; + //Take a reference from inspector. - - + private void Awake() + { + rb2d = gameObject.GetComponent(); + } + public void Update() { float horizontal = Input.GetAxisRaw("Horizontal"); - MoveCharacter(horizontal); - PlayMovementAnimation(horizontal); + float vertical = Input.GetAxisRaw("Jump"); + MoveCharacter(horizontal , vertical); + PlayMovementAnimation(horizontal , vertical); - // Jump logic - if (Input.GetKeyDown(KeyCode.Space) ) - { - Jump(); - } + } - private void MoveCharacter(float horizontal) + private void MoveCharacter(float horizontal , float vertical) { Vector3 position = transform.position; position.x = position.x + horizontal * speed * Time.deltaTime; transform.position = position; + if (vertical > 0) + { + rb2d.AddForce(new Vector2(0f, jump), ForceMode2D.Impulse); + } + } - private void PlayMovementAnimation(float horizontal) + private void PlayMovementAnimation(float horizontal , float vertical) { playerAnimator.SetFloat("Speed", Mathf.Abs(horizontal)); @@ -54,23 +62,19 @@ private void PlayMovementAnimation(float horizontal) } transform.localScale = scale; - Input.GetAxisRaw("Vertical"); - Input.GetKeyDown(KeyCode.Space); - } - - private void Jump() - { - // Trigger the jump animation - playerAnimator.SetBool("Jump", true); - - - - isGrounded = false; - + if (vertical >0 ) + { + playerAnimator.SetBool("Jump", true); + } + else + { + playerAnimator.SetBool("Jump", false); + } } + diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index 8d8e8374e3..9a06899870 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -362,7 +362,7 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 + m_Mass: 20 m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 1 @@ -376,7 +376,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!61 &1751292484 BoxCollider2D: m_ObjectHideFlags: 0 @@ -453,7 +453,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerAnimator: {fileID: 1751292486} - speed: 4 + speed: 5 + jump: 2 --- !u!1001 &3967004074362709419 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 3f30ac3cb1..2464c9d236 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Animator + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 40 + controlID: 129 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 41 + controlID: 80 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -209,7 +209,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -218,15 +218,15 @@ MonoBehaviour: y: 0 width: 756.00006 height: 428.8 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 13} - {fileID: 15} - {fileID: 16} - m_Selected: 2 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 2 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -318,7 +318,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 23614 + m_LastSelectedObjectID: 23616 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -806,8 +806,8 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 6a5c0000 - m_LastClickedID: 0 + m_SelectedIDs: 405c0000 + m_LastClickedID: 23616 m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1228,7 +1228,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 1055.2001 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: From fd1769a06d62fbde9e3db56ff2e5bc89619d3683 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Tue, 15 Oct 2024 18:58:36 +0530 Subject: [PATCH 09/18] Added Next level --- Assets/Animate/Level.meta | 8 + Assets/Animate/Level/FloatingPlallet.prefab | 244 +++ .../Animate/Level/FloatingPlallet.prefab.meta | 7 + Assets/Animate/Level/GroundPallet.prefab | 300 ++++ Assets/Animate/Level/GroundPallet.prefab.meta | 7 + Assets/Animate/Level/PlantMidSized_0.asset | 36 + .../Animate/Level/PlantMidSized_0.asset.meta | 8 + Assets/Animate/Level/PlantMidSized_1.asset | 36 + .../Animate/Level/PlantMidSized_1.asset.meta | 8 + Assets/Animate/Level/PlantMidSized_2.asset | 36 + .../Animate/Level/PlantMidSized_2.asset.meta | 8 + Assets/Animate/Level/WallTile.asset | 36 + Assets/Animate/Level/WallTile.asset.meta | 8 + Assets/Animate/Level/WallTile02.asset | 36 + Assets/Animate/Level/WallTile02.asset.meta | 8 + Assets/Animate/Level/WallTileEnd.asset | 36 + Assets/Animate/Level/WallTileEnd.asset.meta | 8 + Assets/Animate/LevelController.cs | 14 + Assets/Animate/LevelController.cs.meta | 11 + Assets/Animate/Scene.unity | 1388 ++++++++++++++++- Assets/Animate/SceneController.cs | 35 + Assets/Animate/SceneController.cs.meta | 11 + ProjectSettings/EditorBuildSettings.asset | 8 +- UserSettings/Layouts/default-2022.dwlt | 281 ++-- 24 files changed, 2443 insertions(+), 135 deletions(-) create mode 100644 Assets/Animate/Level.meta create mode 100644 Assets/Animate/Level/FloatingPlallet.prefab create mode 100644 Assets/Animate/Level/FloatingPlallet.prefab.meta create mode 100644 Assets/Animate/Level/GroundPallet.prefab create mode 100644 Assets/Animate/Level/GroundPallet.prefab.meta create mode 100644 Assets/Animate/Level/PlantMidSized_0.asset create mode 100644 Assets/Animate/Level/PlantMidSized_0.asset.meta create mode 100644 Assets/Animate/Level/PlantMidSized_1.asset create mode 100644 Assets/Animate/Level/PlantMidSized_1.asset.meta create mode 100644 Assets/Animate/Level/PlantMidSized_2.asset create mode 100644 Assets/Animate/Level/PlantMidSized_2.asset.meta create mode 100644 Assets/Animate/Level/WallTile.asset create mode 100644 Assets/Animate/Level/WallTile.asset.meta create mode 100644 Assets/Animate/Level/WallTile02.asset create mode 100644 Assets/Animate/Level/WallTile02.asset.meta create mode 100644 Assets/Animate/Level/WallTileEnd.asset create mode 100644 Assets/Animate/Level/WallTileEnd.asset.meta create mode 100644 Assets/Animate/LevelController.cs create mode 100644 Assets/Animate/LevelController.cs.meta create mode 100644 Assets/Animate/SceneController.cs create mode 100644 Assets/Animate/SceneController.cs.meta diff --git a/Assets/Animate/Level.meta b/Assets/Animate/Level.meta new file mode 100644 index 0000000000..ec8f3e826c --- /dev/null +++ b/Assets/Animate/Level.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e03304795a3648a4b8454dd8cce1e2db +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level/FloatingPlallet.prefab b/Assets/Animate/Level/FloatingPlallet.prefab new file mode 100644 index 0000000000..ed313013a0 --- /dev/null +++ b/Assets/Animate/Level/FloatingPlallet.prefab @@ -0,0 +1,244 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2355354074768821049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 292721976114510743} + - component: {fileID: 4864285195226670678} + - component: {fileID: 1184896885571966250} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &292721976114510743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2355354074768821049} + 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: [] + m_Father: {fileID: 2923402052348180888} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &4864285195226670678 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2355354074768821049} + m_Enabled: 1 + m_Tiles: + - first: {x: -1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 75fcebf21484c8340a3ffac20e2c2edf, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: caf2c1ff95e2b9841896050569b9c69f, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 1350e70668a734346bbc88d381756717, type: 2} + m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300002, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300004, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + m_TileMatrixArray: + - m_RefCount: 3 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 3 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: -1, y: -2, z: 0} + m_Size: {x: 2, y: 2, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!483693784 &1184896885571966250 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2355354074768821049} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1 &3781029340406171702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2923402052348180888} + - component: {fileID: 8216415470808471768} + m_Layer: 0 + m_Name: FloatingPlallet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2923402052348180888 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3781029340406171702} + 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: 292721976114510743} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &8216415470808471768 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3781029340406171702} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!114 &3356095551960245627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12395, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Palette Settings + m_EditorClassIdentifier: + cellSizing: 0 + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} diff --git a/Assets/Animate/Level/FloatingPlallet.prefab.meta b/Assets/Animate/Level/FloatingPlallet.prefab.meta new file mode 100644 index 0000000000..4c4d2caaaa --- /dev/null +++ b/Assets/Animate/Level/FloatingPlallet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5844d1fa1f769b64ea2963700e9f3487 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level/GroundPallet.prefab b/Assets/Animate/Level/GroundPallet.prefab new file mode 100644 index 0000000000..a594f21080 --- /dev/null +++ b/Assets/Animate/Level/GroundPallet.prefab @@ -0,0 +1,300 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3143478418354261665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6757513937534922419} + - component: {fileID: 5136914392200465378} + - component: {fileID: 3822963517993493940} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6757513937534922419 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3143478418354261665} + 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: [] + m_Father: {fileID: 3293503198776491587} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &5136914392200465378 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3143478418354261665} + m_Enabled: 1 + m_Tiles: + - first: {x: -1, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 157bdf764da51a94892dfc1201d04da0, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 69361ffd63f17044f88038ae4abc1936, type: 2} + - m_RefCount: 3 + m_Data: {fileID: 11400000, guid: 4dd8162b80d03fe4c96efbdec81132e2, type: 2} + m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + - m_RefCount: 3 + m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + m_TileMatrixArray: + - m_RefCount: 3 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - m_RefCount: 2 + m_Data: + e00: -1 + e01: 0 + e02: -0.00000008742278 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0.00000008742278 + e21: 0 + e22: -1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - m_RefCount: 0 + m_Data: + e00: 2.6693249e+14 + e01: 1e-45 + e02: -1.3052822e+19 + e03: 0 + e10: 2.44e-43 + e11: 0 + e12: 4.5904e-41 + e13: 0 + e20: NaN + e21: 0 + e22: 2.6693222e+14 + e23: 0 + e30: 0 + e31: 7.34684e-40 + e32: 2.44e-43 + e33: 1 + m_TileColorArray: + - m_RefCount: 5 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: -2, y: -1, z: 0} + m_Size: {x: 4, y: 2, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!483693784 &3822963517993493940 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3143478418354261665} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1 &4170412742788861073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3293503198776491587} + - component: {fileID: 2177165707964176958} + m_Layer: 0 + m_Name: GroundPallet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3293503198776491587 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4170412742788861073} + 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: 6757513937534922419} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &2177165707964176958 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4170412742788861073} + m_Enabled: 1 + m_CellSize: {x: 2, y: 2, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!114 &1976602988812598864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12395, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Palette Settings + m_EditorClassIdentifier: + cellSizing: 0 + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} diff --git a/Assets/Animate/Level/GroundPallet.prefab.meta b/Assets/Animate/Level/GroundPallet.prefab.meta new file mode 100644 index 0000000000..e6dd0b16a2 --- /dev/null +++ b/Assets/Animate/Level/GroundPallet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 96ed8346ded98d446bd6be48dce9dce4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level/PlantMidSized_0.asset b/Assets/Animate/Level/PlantMidSized_0.asset new file mode 100644 index 0000000000..65e3a2c48a --- /dev/null +++ b/Assets/Animate/Level/PlantMidSized_0.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: PlantMidSized_0 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Animate/Level/PlantMidSized_0.asset.meta b/Assets/Animate/Level/PlantMidSized_0.asset.meta new file mode 100644 index 0000000000..c0ccadc779 --- /dev/null +++ b/Assets/Animate/Level/PlantMidSized_0.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75fcebf21484c8340a3ffac20e2c2edf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level/PlantMidSized_1.asset b/Assets/Animate/Level/PlantMidSized_1.asset new file mode 100644 index 0000000000..dc97e7b527 --- /dev/null +++ b/Assets/Animate/Level/PlantMidSized_1.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: PlantMidSized_1 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300002, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Animate/Level/PlantMidSized_1.asset.meta b/Assets/Animate/Level/PlantMidSized_1.asset.meta new file mode 100644 index 0000000000..c7f17b2ed1 --- /dev/null +++ b/Assets/Animate/Level/PlantMidSized_1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: caf2c1ff95e2b9841896050569b9c69f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level/PlantMidSized_2.asset b/Assets/Animate/Level/PlantMidSized_2.asset new file mode 100644 index 0000000000..743536a0c8 --- /dev/null +++ b/Assets/Animate/Level/PlantMidSized_2.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: PlantMidSized_2 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300004, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Animate/Level/PlantMidSized_2.asset.meta b/Assets/Animate/Level/PlantMidSized_2.asset.meta new file mode 100644 index 0000000000..a16c911f23 --- /dev/null +++ b/Assets/Animate/Level/PlantMidSized_2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1350e70668a734346bbc88d381756717 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level/WallTile.asset b/Assets/Animate/Level/WallTile.asset new file mode 100644 index 0000000000..4da3cf5105 --- /dev/null +++ b/Assets/Animate/Level/WallTile.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: WallTile + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Animate/Level/WallTile.asset.meta b/Assets/Animate/Level/WallTile.asset.meta new file mode 100644 index 0000000000..c933d06b23 --- /dev/null +++ b/Assets/Animate/Level/WallTile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 157bdf764da51a94892dfc1201d04da0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level/WallTile02.asset b/Assets/Animate/Level/WallTile02.asset new file mode 100644 index 0000000000..298e7bcd9e --- /dev/null +++ b/Assets/Animate/Level/WallTile02.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: WallTile02 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Animate/Level/WallTile02.asset.meta b/Assets/Animate/Level/WallTile02.asset.meta new file mode 100644 index 0000000000..726564ecee --- /dev/null +++ b/Assets/Animate/Level/WallTile02.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69361ffd63f17044f88038ae4abc1936 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level/WallTileEnd.asset b/Assets/Animate/Level/WallTileEnd.asset new file mode 100644 index 0000000000..b89c0f1ff5 --- /dev/null +++ b/Assets/Animate/Level/WallTileEnd.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: WallTileEnd + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Animate/Level/WallTileEnd.asset.meta b/Assets/Animate/Level/WallTileEnd.asset.meta new file mode 100644 index 0000000000..2c1176273c --- /dev/null +++ b/Assets/Animate/Level/WallTileEnd.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4dd8162b80d03fe4c96efbdec81132e2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/LevelController.cs b/Assets/Animate/LevelController.cs new file mode 100644 index 0000000000..1e95b2b47a --- /dev/null +++ b/Assets/Animate/LevelController.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LevelController : MonoBehaviour +{ + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.gameObject.GetComponent() != null) { + Debug.Log("Level finished"); + SceneController.instance.nextLevel(); + } + } +} diff --git a/Assets/Animate/LevelController.cs.meta b/Assets/Animate/LevelController.cs.meta new file mode 100644 index 0000000000..9ca1be47ff --- /dev/null +++ b/Assets/Animate/LevelController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8a4d87f7f531eee49828b60c76b785bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index 9a06899870..96948b161d 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -122,6 +122,96 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &475681475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 475681478} + - component: {fileID: 475681477} + - component: {fileID: 475681476} + m_Layer: 0 + m_Name: LevelComplete + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &475681476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475681475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a4d87f7f531eee49828b60c76b785bb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &475681477 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475681475} + m_Enabled: 1 + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + 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 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!4 &475681478 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475681475} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20.59, y: 7.31, z: -9.987183} + 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!1 &558003131 GameObject: m_ObjectHideFlags: 0 @@ -139,7 +229,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!61 &558003132 BoxCollider2D: m_ObjectHideFlags: 0 @@ -252,6 +342,957 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1101254690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1101254692} + - component: {fileID: 1101254691} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1101254691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101254690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d22f7cd5a7e61f4993e40420e145043, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1101254692 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101254690} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 16.434763, y: 7.0660567, z: -9.987183} + 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!1 &1245773821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1245773822} + - component: {fileID: 1245773824} + - component: {fileID: 1245773823} + - component: {fileID: 1245773825} + m_Layer: 0 + m_Name: GroundTileMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1245773822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245773821} + 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: [] + m_Father: {fileID: 1862444160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1245773823 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245773821} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1245773824 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245773821} + m_Enabled: 1 + m_Tiles: + - first: {x: -5, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -4, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -14, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -13, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -12, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -11, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -10, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -9, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -9, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 10, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 11, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 12, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -5, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 13, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 15, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 17, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 18, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 19, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 20, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 21, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 22, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 23, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 24, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 13, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 13, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 14, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 14, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 15, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 15, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 20 + m_Data: {fileID: 11400000, guid: 69361ffd63f17044f88038ae4abc1936, type: 2} + - m_RefCount: 44 + m_Data: {fileID: 11400000, guid: 157bdf764da51a94892dfc1201d04da0, type: 2} + - m_RefCount: 6 + m_Data: {fileID: 11400000, guid: 4dd8162b80d03fe4c96efbdec81132e2, type: 2} + m_TileSpriteArray: + - m_RefCount: 20 + m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + - m_RefCount: 44 + m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} + - m_RefCount: 6 + m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + m_TileMatrixArray: + - m_RefCount: 1 + m_Data: + e00: -1 + e01: 0 + e02: -0.00000008742278 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0.00000008742278 + e21: 0 + e22: -1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - m_RefCount: 69 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 70 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: -14, y: -3, z: 0} + m_Size: {x: 41, y: 19, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!19719996 &1245773825 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245773821} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0 + m_UseDelaunayMesh: 0 --- !u!1 &1260965266 GameObject: m_ObjectHideFlags: 0 @@ -337,12 +1378,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1260965266} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.03, y: 1.26, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1751292492} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1751292479 stripped GameObject: @@ -428,18 +1469,6 @@ Animator: type: 3} m_PrefabInstance: {fileID: 3967004074362709419} m_PrefabAsset: {fileID: 0} ---- !u!114 &1751292489 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1751292479} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8af87564c3d1e00409cd1549b4ab55d2, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1751292490 MonoBehaviour: m_ObjectHideFlags: 0 @@ -455,6 +1484,310 @@ MonoBehaviour: playerAnimator: {fileID: 1751292486} speed: 5 jump: 2 +--- !u!4 &1751292492 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + m_PrefabInstance: {fileID: 3967004074362709419} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1765070226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1765070227} + - component: {fileID: 1765070229} + - component: {fileID: 1765070228} + m_Layer: 0 + m_Name: FLoatingPlants + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1765070227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765070226} + 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: [] + m_Father: {fileID: 1862444160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1765070228 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765070226} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: -1 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0.79296875, y: 0.3935547, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1765070229 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765070226} + m_Enabled: 1 + m_Tiles: + - first: {x: -2, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 22, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -12, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 15, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: 15, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 19, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: caf2c1ff95e2b9841896050569b9c69f, type: 2} + - m_RefCount: 5 + m_Data: {fileID: 11400000, guid: 75fcebf21484c8340a3ffac20e2c2edf, type: 2} + - m_RefCount: 3 + m_Data: {fileID: 11400000, guid: 1350e70668a734346bbc88d381756717, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: 21300002, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + - m_RefCount: 5 + m_Data: {fileID: 21300000, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + - m_RefCount: 3 + m_Data: {fileID: 21300004, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + m_TileMatrixArray: + - m_RefCount: 10 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 10 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 0.73333335} + m_Origin: {x: -12, y: 0, z: 0} + m_Size: {x: 35, y: 20, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!1 &1862444158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1862444160} + - component: {fileID: 1862444159} + m_Layer: 0 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!156049354 &1862444159 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1862444158} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!4 &1862444160 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1862444158} + 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: 1245773822} + - {fileID: 1765070227} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3967004074362709419 PrefabInstance: m_ObjectHideFlags: 0 @@ -463,15 +1796,20 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2279333339517451720, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} propertyPath: m_LocalPosition.x - value: -0.15 + value: -0.72 objectReference: {fileID: 0} - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} propertyPath: m_LocalPosition.y - value: -0.22 + value: -0.27 objectReference: {fileID: 0} - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} @@ -520,7 +1858,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1260965269} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} @@ -530,10 +1872,6 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1751292484} - - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1751292489} - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} insertIndex: -1 @@ -543,6 +1881,8 @@ PrefabInstance: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1260965269} - {fileID: 3967004074362709419} - {fileID: 558003134} + - {fileID: 1862444160} + - {fileID: 475681478} + - {fileID: 1101254692} diff --git a/Assets/Animate/SceneController.cs b/Assets/Animate/SceneController.cs new file mode 100644 index 0000000000..2c09021cb4 --- /dev/null +++ b/Assets/Animate/SceneController.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class SceneController : MonoBehaviour +{ + + public static SceneController instance; + + private void Awake() + { + + if (instance == null) + { + instance = this; + DontDestroyOnLoad(gameObject); + } + + else + { + Destroy(gameObject); + } + + } + public void nextLevel() + { + SceneManager.LoadSceneAsync(SceneManager.GetActiveScene().buildIndex + 1); + } + + public void loadScene(string sceneName) + { + SceneManager.LoadSceneAsync(sceneName); + } +} diff --git a/Assets/Animate/SceneController.cs.meta b/Assets/Animate/SceneController.cs.meta new file mode 100644 index 0000000000..8a86d13278 --- /dev/null +++ b/Assets/Animate/SceneController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3d22f7cd5a7e61f4993e40420e145043 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887ef4..d7c2d7a0e8 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,11 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Animate/Scene.unity + guid: cacf87822d5d7cd4598de741ac3398e5 + - enabled: 1 + path: Assets/Scenes/SampleScene.unity + guid: 3a46aa8073dff7744a2d6a6be0f747bf m_configObjects: {} diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 2464c9d236..0f04b44372 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,12 +19,38 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Game - m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 300} + m_Title: Project + m_RootView: {fileID: 3} + m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GridPaintPaletteWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1052 + y: 0 + width: 120.80005 + height: 409.6 + m_MinSize: {x: 242, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,9 +63,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - {fileID: 4} + - {fileID: 6} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 @@ -52,7 +78,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -74,7 +100,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -95,7 +121,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -108,20 +134,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 11} + - {fileID: 7} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1536 height: 722.8 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 16192} + m_MinSize: {x: 400, y: 100} + m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 129 + controlID: 123 draggingID: 0 ---- !u!114 &6 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -134,20 +160,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 10} + - {fileID: 8} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1172.8 height: 722.8 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 16192} + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 80 + controlID: 69 draggingID: 0 ---- !u!114 &7 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -160,20 +186,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - {fileID: 9} + - {fileID: 10} + - {fileID: 2} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1172.8 - height: 428.8 - m_MinSize: {x: 200, y: 50} - m_MaxSize: {x: 16192, y: 8096} + height: 409.6 + m_MinSize: {x: 300, y: 50} + m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 42 + controlID: 70 draggingID: 0 ---- !u!114 &8 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -190,16 +217,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 416.8 - height: 428.8 + width: 260 + height: 409.6 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 14} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -209,25 +236,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 416.8 + x: 260 y: 0 - width: 756.00006 - height: 428.8 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 792 + height: 409.6 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 15} m_Panes: - - {fileID: 13} - {fileID: 15} - - {fileID: 16} - m_Selected: 1 - m_LastSelected: 2 ---- !u!114 &10 + - {fileID: 17} + - {fileID: 18} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -243,19 +270,19 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 428.8 + y: 409.6 width: 1172.8 - height: 294 + height: 313.19998 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 17} - - {fileID: 18} - - {fileID: 12} + - {fileID: 19} + - {fileID: 20} + - {fileID: 14} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -274,14 +301,48 @@ MonoBehaviour: y: 0 width: 363.19995 height: 722.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 19} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 240, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Tile Palette + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1052 + y: 73.6 + width: 118.80005 + height: 388.6 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -318,8 +379,8 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 23616 ---- !u!114 &13 + m_LastSelectedObjectID: -7712 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -340,10 +401,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 416.80002 + x: 260 y: 73.6 - width: 754.00006 - height: 407.8 + width: 790 + height: 388.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -358,7 +419,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -180, y: -26.399994} + snapOffset: {x: -180, y: -26.400024} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings @@ -618,7 +679,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 48, y: 48} + snapOffset: {x: 48, y: 10.399963} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay @@ -643,7 +704,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -657,7 +718,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -217.6001, y: -301.6} + snapOffset: {x: -209.60004, y: -286.4} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: AINavigationOverlay @@ -689,9 +750,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.124938, y: -0.1097521, z: -0.033221763} + m_Target: {x: 17.232176, y: 7.6168118, z: -10.002488} speed: 2 - m_Value: {x: 1.124938, y: -0.1097521, z: -0.033221763} + m_Value: {x: 16.95459, y: 7.4250894, z: -9.99716} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -741,9 +802,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 5.675482 + m_Target: 12.373346 speed: 2 - m_Value: 5.675482 + m_Value: 11.840523 m_Ortho: m_Target: 1 speed: 2 @@ -768,7 +829,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -791,8 +852,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 415.8 - height: 407.8 + width: 259 + height: 388.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -806,9 +867,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 405c0000 - m_LastClickedID: 23616 - m_ExpandedIDs: 28fbffff + m_SelectedIDs: 94660000 + m_LastClickedID: 0 + m_ExpandedIDs: 36cbffff9ccbffff28fbfffff4ffffff565c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -824,7 +885,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -832,7 +893,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -853,10 +914,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 416.80002 + x: 260 y: 73.6 - width: 754.00006 - height: 407.8 + width: 790 + height: 388.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -873,7 +934,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 754.00006, y: 386.8} + m_TargetSize: {x: 790, y: 367.6} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -888,10 +949,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -301.60004 - m_HBaseRangeMax: 301.60004 - m_VBaseRangeMin: -154.72 - m_VBaseRangeMax: 154.72 + m_HBaseRangeMin: -316 + m_HBaseRangeMax: 316 + m_VBaseRangeMin: -147.04001 + m_VBaseRangeMax: 147.04001 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -900,7 +961,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -909,29 +970,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 754.00006 - height: 386.8 + width: 790 + height: 367.6 m_Scale: {x: 1.25, y: 1.25} - m_Translation: {x: 377.00006, y: 193.4} + m_Translation: {x: 395, y: 183.80002} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -301.60004 - y: -154.72 - width: 603.2001 - height: 309.44 + x: -316 + y: -147.04001 + width: 632 + height: 294.08002 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 942.50006, y: 509.75} + m_LastWindowPixelSize: {x: 987.5, y: 485.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -952,10 +1013,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 416.80002 + x: 260 y: 73.6 - width: 754.00006 - height: 407.8 + width: 790 + height: 566.2 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1004,7 +1065,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1026,9 +1087,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 502.4 + y: 483.2 width: 1171.8 - height: 273 + height: 292.19998 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1065,9 +1126,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: d85c0000 - m_LastClickedID: 23768 - m_ExpandedIDs: 00000000aa550000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000b05c0000b25c0000b45c0000b65c0000b85c0000ba5c000000ca9a3b + m_SelectedIDs: 585d0000 + m_LastClickedID: 23896 + m_ExpandedIDs: 00000000aa550000425d0000445d0000465d0000485d00004a5d00004c5d00004e5d0000505d0000525d0000545d0000565d0000585d00005a5d00005c5d00005e5d0000605d0000625d0000645d0000665d0000685d0000865d000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1083,7 +1144,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1095,7 +1156,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000aa550000a25c0000a45c0000a65c0000a85c0000aa5c0000ac5c0000ae5c0000b05c0000b25c0000b45c0000b65c0000b85c0000ba5c0000 + m_ExpandedIDs: 00000000aa550000425d0000445d0000465d0000485d00004a5d00004c5d00004e5d0000505d0000525d0000545d0000565d0000585d00005a5d00005c5d00005e5d0000605d0000625d0000645d0000665d0000685d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1123,7 +1184,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c62300005c5c0000 + m_ExpandedInstanceIDs: c62300005c5c0000605c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1151,7 +1212,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &18 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1173,9 +1234,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 502.4 + y: 483.2 width: 1171.8 - height: 273 + height: 292.19998 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1186,7 +1247,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &19 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1228,7 +1289,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 1055.2001 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: From d5cb7a889f0c98e0053a7d89e64a7e16339bbf46 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Tue, 15 Oct 2024 19:13:35 +0530 Subject: [PATCH 10/18] Added Death after falling and next scene transition --- Assets/Animate/DeathScript.cs | 18 ++ Assets/Animate/DeathScript.cs.meta | 11 ++ Assets/Animate/Scene.unity | 227 +++++++++++-------------- UserSettings/Layouts/default-2022.dwlt | 76 ++++----- 4 files changed, 166 insertions(+), 166 deletions(-) create mode 100644 Assets/Animate/DeathScript.cs create mode 100644 Assets/Animate/DeathScript.cs.meta diff --git a/Assets/Animate/DeathScript.cs b/Assets/Animate/DeathScript.cs new file mode 100644 index 0000000000..26c961fab3 --- /dev/null +++ b/Assets/Animate/DeathScript.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class DeathScript : MonoBehaviour +{ + private void OnTriggerEnter2D(Collider2D collision) + { + // Check if the object entering the trigger is the player + if (collision.gameObject.GetComponent() != null) + { + // Reload the current scene when the player falls into the death zone + SceneManager.LoadScene(SceneManager.GetActiveScene().name); + Debug.Log("Respawned player"); + } + } +} diff --git a/Assets/Animate/DeathScript.cs.meta b/Assets/Animate/DeathScript.cs.meta new file mode 100644 index 0000000000..dd62c74e17 --- /dev/null +++ b/Assets/Animate/DeathScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ce33d66041d8894cb5071c618ac76c0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index 96948b161d..f2e1dc26be 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -122,6 +122,96 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &410899623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 410899626} + - component: {fileID: 410899625} + - component: {fileID: 410899624} + m_Layer: 0 + m_Name: DeathScene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &410899624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410899623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ce33d66041d8894cb5071c618ac76c0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &410899625 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410899623} + m_Enabled: 1 + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + 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 + serializedVersion: 2 + m_Size: {x: 8, y: 3} + m_EdgeRadius: 0 +--- !u!4 &410899626 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410899623} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.34, y: -6.04, z: -10.002488} + m_LocalScale: {x: 4.79, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &475681475 GameObject: m_ObjectHideFlags: 0 @@ -478,36 +568,6 @@ Tilemap: m_GameObject: {fileID: 1245773821} m_Enabled: 1 m_Tiles: - - first: {x: -5, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -4, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -3, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -2, y: -2, z: 0} second: serializedVersion: 2 @@ -638,16 +698,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -8, y: 0, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -9, y: 1, z: 0} second: serializedVersion: 2 @@ -658,46 +708,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -8, y: 1, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -7, y: 1, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 6, y: 1, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 7, y: 1, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 8, y: 1, z: 0} second: serializedVersion: 2 @@ -748,26 +758,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -8, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -7, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -8, y: 3, z: 0} second: serializedVersion: 2 @@ -778,16 +768,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -7, y: 3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -8, y: 4, z: 0} second: serializedVersion: 2 @@ -808,16 +788,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -6, y: 4, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -7, y: 5, z: 0} second: serializedVersion: 2 @@ -1180,18 +1150,18 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 20 + - m_RefCount: 14 m_Data: {fileID: 11400000, guid: 69361ffd63f17044f88038ae4abc1936, type: 2} - - m_RefCount: 44 + - m_RefCount: 39 m_Data: {fileID: 11400000, guid: 157bdf764da51a94892dfc1201d04da0, type: 2} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 4dd8162b80d03fe4c96efbdec81132e2, type: 2} m_TileSpriteArray: - - m_RefCount: 20 + - m_RefCount: 14 m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} - - m_RefCount: 44 + - m_RefCount: 39 m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} m_TileMatrixArray: - m_RefCount: 1 @@ -1212,7 +1182,7 @@ Tilemap: e31: 0 e32: 0 e33: 1 - - m_RefCount: 69 + - m_RefCount: 57 m_Data: e00: 1 e01: 0 @@ -1231,7 +1201,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 70 + - m_RefCount: 58 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -1886,3 +1856,4 @@ SceneRoots: - {fileID: 1862444160} - {fileID: 475681478} - {fileID: 1101254692} + - {fileID: 410899626} diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 0f04b44372..3eaacb5f9f 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -39,9 +39,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1052 + x: 1026.4 y: 0 - width: 120.80005 + width: 146.40002 height: 409.6 m_MinSize: {x: 242, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 123 + controlID: 60 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 69 + controlID: 61 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -198,7 +198,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 70 + controlID: 46 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -219,8 +219,8 @@ MonoBehaviour: y: 0 width: 260 height: 409.6 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -236,24 +236,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 260 y: 0 - width: 792 + width: 766.4 height: 409.6 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 15} - {fileID: 17} - {fileID: 18} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -301,8 +301,8 @@ MonoBehaviour: y: 0 width: 363.19995 height: 722.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} @@ -328,9 +328,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1052 + x: 1026.4 y: 73.6 - width: 118.80005 + width: 144.40002 height: 388.6 m_SerializedDataModeController: m_DataMode: 0 @@ -403,7 +403,7 @@ MonoBehaviour: serializedVersion: 2 x: 260 y: 73.6 - width: 790 + width: 641.2 height: 388.6 m_SerializedDataModeController: m_DataMode: 0 @@ -750,9 +750,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 17.232176, y: 7.6168118, z: -10.002488} + m_Target: {x: 11.168458, y: 0.6243665, z: -10.002488} speed: 2 - m_Value: {x: 16.95459, y: 7.4250894, z: -9.99716} + m_Value: {x: 11.168458, y: 0.6243665, z: -10.002488} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -788,9 +788,9 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -804,7 +804,7 @@ MonoBehaviour: m_Size: m_Target: 12.373346 speed: 2 - m_Value: 11.840523 + m_Value: 12.373346 m_Ortho: m_Target: 1 speed: 2 @@ -867,9 +867,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 94660000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 36cbffff9ccbffff28fbfffff4ffffff565c0000 + m_ExpandedIDs: 28fbffff7c5c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -916,7 +916,7 @@ MonoBehaviour: serializedVersion: 2 x: 260 y: 73.6 - width: 790 + width: 764.4 height: 388.6 m_SerializedDataModeController: m_DataMode: 0 @@ -934,7 +934,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 790, y: 367.6} + m_TargetSize: {x: 764.4, y: 367.6} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -949,8 +949,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -316 - m_HBaseRangeMax: 316 + m_HBaseRangeMin: -305.76 + m_HBaseRangeMax: 305.76 m_VBaseRangeMin: -147.04001 m_VBaseRangeMax: 147.04001 m_HAllowExceedBaseRangeMin: 1 @@ -961,7 +961,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -970,23 +970,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 790 + width: 764.4 height: 367.6 m_Scale: {x: 1.25, y: 1.25} - m_Translation: {x: 395, y: 183.80002} + m_Translation: {x: 382.2, y: 183.80002} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -316 + x: -305.76 y: -147.04001 - width: 632 + width: 611.52 height: 294.08002 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 987.5, y: 485.75} + m_LastWindowPixelSize: {x: 955.5, y: 485.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1126,9 +1126,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 585d0000 - m_LastClickedID: 23896 - m_ExpandedIDs: 00000000aa550000425d0000445d0000465d0000485d00004a5d00004c5d00004e5d0000505d0000525d0000545d0000565d0000585d00005a5d00005c5d00005e5d0000605d0000625d0000645d0000665d0000685d0000865d000000ca9a3b + m_SelectedIDs: 665d0000 + m_LastClickedID: 23910 + m_ExpandedIDs: 00000000ae550000505d0000525d0000545d0000565d0000585d00005a5d00005c5d00005e5d0000605d0000625d0000645d0000665d0000685d00006a5d00006c5d00006e5d0000705d0000725d0000745d0000765d0000945d000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1156,7 +1156,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000aa550000425d0000445d0000465d0000485d00004a5d00004c5d00004e5d0000505d0000525d0000545d0000565d0000585d00005a5d00005c5d00005e5d0000605d0000625d0000645d0000665d0000685d0000 + m_ExpandedIDs: 00000000ae550000505d0000525d0000545d0000565d0000585d00005a5d00005c5d00005e5d0000605d0000625d0000645d0000665d0000685d00006a5d00006c5d00006e5d0000705d0000725d0000745d0000765d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: From f0f8f45f7c6eab15421804de128752cc6cdce0b9 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Wed, 16 Oct 2024 15:30:06 +0530 Subject: [PATCH 11/18] Collectables and score logic added --- Assets/Animate/Anime.anim | 159 ++++ Assets/Animate/Anime.anim.meta | 8 + Assets/Animate/Key 1.controller | 43 ++ Assets/Animate/Key 1.controller.meta | 8 + Assets/Animate/Key 2.controller | 72 ++ Assets/Animate/Key 2.controller.meta | 8 + Assets/Animate/Key.controller | 72 ++ Assets/Animate/Key.controller.meta | 8 + Assets/Animate/Key.prefab | 154 ++++ Assets/Animate/Key.prefab.meta | 7 + Assets/Animate/KeyAnim.anim | 53 ++ Assets/Animate/KeyAnim.anim.meta | 8 + Assets/Animate/KeyAnimate.anim | 159 ++++ Assets/Animate/KeyAnimate.anim.meta | 8 + Assets/Animate/KeyController.cs | 16 + Assets/Animate/KeyController.cs.meta | 11 + Assets/Animate/Level/Key.prefab | 216 ++++++ Assets/Animate/Level/Key.prefab.meta | 7 + Assets/Animate/PlayerController.cs | 12 +- Assets/Animate/Scene.unity | 678 +++++++++++++++++- Assets/Animate/ScoreController.cs | 32 + Assets/Animate/ScoreController.cs.meta | 11 + Assets/Animate/key.anim | 53 ++ Assets/Animate/key.anim.meta | 8 + .../AnimatedSprites/Key/KeySpin0000.asset | 36 + .../Key/KeySpin0000.asset.meta | 8 + UserSettings/Layouts/default-2022.dwlt | 208 +++--- 27 files changed, 1961 insertions(+), 102 deletions(-) create mode 100644 Assets/Animate/Anime.anim create mode 100644 Assets/Animate/Anime.anim.meta create mode 100644 Assets/Animate/Key 1.controller create mode 100644 Assets/Animate/Key 1.controller.meta create mode 100644 Assets/Animate/Key 2.controller create mode 100644 Assets/Animate/Key 2.controller.meta create mode 100644 Assets/Animate/Key.controller create mode 100644 Assets/Animate/Key.controller.meta create mode 100644 Assets/Animate/Key.prefab create mode 100644 Assets/Animate/Key.prefab.meta create mode 100644 Assets/Animate/KeyAnim.anim create mode 100644 Assets/Animate/KeyAnim.anim.meta create mode 100644 Assets/Animate/KeyAnimate.anim create mode 100644 Assets/Animate/KeyAnimate.anim.meta create mode 100644 Assets/Animate/KeyController.cs create mode 100644 Assets/Animate/KeyController.cs.meta create mode 100644 Assets/Animate/Level/Key.prefab create mode 100644 Assets/Animate/Level/Key.prefab.meta create mode 100644 Assets/Animate/ScoreController.cs create mode 100644 Assets/Animate/ScoreController.cs.meta create mode 100644 Assets/Animate/key.anim create mode 100644 Assets/Animate/key.anim.meta create mode 100644 Assets/Game Assets/Art/Sprites/AnimatedSprites/Key/KeySpin0000.asset create mode 100644 Assets/Game Assets/Art/Sprites/AnimatedSprites/Key/KeySpin0000.asset.meta diff --git a/Assets/Animate/Anime.anim b/Assets/Animate/Anime.anim new file mode 100644 index 0000000000..35079a5e3f --- /dev/null +++ b/Assets/Animate/Anime.anim @@ -0,0 +1,159 @@ +%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: Anime + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: f16737ca9f1dc29448765a816d0a1b49, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 7a0de91dea9f59140bb693004bf0b0ad, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 7c8bdf6129a84e141a690926a43cb384, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 2a8146b76a8332e46b9c00f3cb2960e8, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 2c9d2d33aa1cb054cb019c852a64b6d4, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 6b805b3d02c25084780e70f6b6e7ab38, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: b53184e6a2932ee409a26e6838f16aae, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: 44fbfa5afc056fe459c80663e42e9ae4, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 862eb60c627dd534cb832145605ac12d, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: 7a85663a637e4004e92472acad01c2b8, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: e800ef09025e509499b2916a88d7da82, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 3dbc35981e1cf7b4e8e17794cc775b4d, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: 0a3bfa4764855014695c9c734bd910a5, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: 2c458ee8cd0fbbf4fa714059d5f3136d, type: 3} + - time: 0.51666665 + value: {fileID: 21300000, guid: b940cb8a87dbc2b4c9924fa949455cab, type: 3} + - time: 0.55 + value: {fileID: 21300000, guid: 36d7a8d875f6bec499f358447156b5fc, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 5bc4e6fd2df715c46b166367924563d2, type: 3} + - time: 0.6166667 + value: {fileID: 21300000, guid: c7e105af68f080d408ff8dcfc71d976f, type: 3} + - time: 0.65 + value: {fileID: 21300000, guid: 55b7d14da52e94f40a7977ab1fd4678e, type: 3} + - time: 0.68333334 + value: {fileID: 21300000, guid: 75c23d1c7c70bb847b9946964aaf0825, type: 3} + - time: 0.71666664 + value: {fileID: 21300000, guid: cd5d447894330194aa31e955895c2404, type: 3} + - time: 0.76666665 + value: {fileID: 21300000, guid: 854bacb421a0cf0409b811ca82dc0b72, type: 3} + - time: 0.8 + value: {fileID: 21300000, guid: 36cb6f5bee0e9c64b8fd1b8d8fa3a779, type: 3} + - time: 0.8333333 + value: {fileID: 21300000, guid: e2eadf32de58de044a6101c5d48fb7d5, type: 3} + - time: 0.8666667 + value: {fileID: 21300000, guid: 2e67ec8e00de06747930191c34bec57b, type: 3} + - time: 0.9 + value: {fileID: 21300000, guid: d48d2bef2814aec4db2752ccf322c364, type: 3} + - time: 0.93333334 + value: {fileID: 21300000, guid: ee67da4db316077448ea9b6e1f5429b4, type: 3} + - time: 0.96666664 + value: {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - time: 1 + value: {fileID: 21300000, guid: a74e1b80bec2c7a41b68c0a4e6a2085a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + - {fileID: 21300000, guid: f16737ca9f1dc29448765a816d0a1b49, type: 3} + - {fileID: 21300000, guid: 7a0de91dea9f59140bb693004bf0b0ad, type: 3} + - {fileID: 21300000, guid: 7c8bdf6129a84e141a690926a43cb384, type: 3} + - {fileID: 21300000, guid: 2a8146b76a8332e46b9c00f3cb2960e8, type: 3} + - {fileID: 21300000, guid: 2c9d2d33aa1cb054cb019c852a64b6d4, type: 3} + - {fileID: 21300000, guid: 6b805b3d02c25084780e70f6b6e7ab38, type: 3} + - {fileID: 21300000, guid: b53184e6a2932ee409a26e6838f16aae, type: 3} + - {fileID: 21300000, guid: 44fbfa5afc056fe459c80663e42e9ae4, type: 3} + - {fileID: 21300000, guid: 862eb60c627dd534cb832145605ac12d, type: 3} + - {fileID: 21300000, guid: 7a85663a637e4004e92472acad01c2b8, type: 3} + - {fileID: 21300000, guid: e800ef09025e509499b2916a88d7da82, type: 3} + - {fileID: 21300000, guid: 3dbc35981e1cf7b4e8e17794cc775b4d, type: 3} + - {fileID: 21300000, guid: 0a3bfa4764855014695c9c734bd910a5, type: 3} + - {fileID: 21300000, guid: 2c458ee8cd0fbbf4fa714059d5f3136d, type: 3} + - {fileID: 21300000, guid: b940cb8a87dbc2b4c9924fa949455cab, type: 3} + - {fileID: 21300000, guid: 36d7a8d875f6bec499f358447156b5fc, type: 3} + - {fileID: 21300000, guid: 5bc4e6fd2df715c46b166367924563d2, type: 3} + - {fileID: 21300000, guid: c7e105af68f080d408ff8dcfc71d976f, type: 3} + - {fileID: 21300000, guid: 55b7d14da52e94f40a7977ab1fd4678e, type: 3} + - {fileID: 21300000, guid: 75c23d1c7c70bb847b9946964aaf0825, type: 3} + - {fileID: 21300000, guid: cd5d447894330194aa31e955895c2404, type: 3} + - {fileID: 21300000, guid: 854bacb421a0cf0409b811ca82dc0b72, type: 3} + - {fileID: 21300000, guid: 36cb6f5bee0e9c64b8fd1b8d8fa3a779, type: 3} + - {fileID: 21300000, guid: e2eadf32de58de044a6101c5d48fb7d5, type: 3} + - {fileID: 21300000, guid: 2e67ec8e00de06747930191c34bec57b, type: 3} + - {fileID: 21300000, guid: d48d2bef2814aec4db2752ccf322c364, type: 3} + - {fileID: 21300000, guid: ee67da4db316077448ea9b6e1f5429b4, type: 3} + - {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - {fileID: 21300000, guid: a74e1b80bec2c7a41b68c0a4e6a2085a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + 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/Assets/Animate/Anime.anim.meta b/Assets/Animate/Anime.anim.meta new file mode 100644 index 0000000000..02906ae0a8 --- /dev/null +++ b/Assets/Animate/Anime.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5912bc07aaa5e064a9e72c58115641e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Key 1.controller b/Assets/Animate/Key 1.controller new file mode 100644 index 0000000000..fbaff14482 --- /dev/null +++ b/Assets/Animate/Key 1.controller @@ -0,0 +1,43 @@ +%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: Key 1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 9096787303426884428} + 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!1107 &9096787303426884428 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + 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: 0} diff --git a/Assets/Animate/Key 1.controller.meta b/Assets/Animate/Key 1.controller.meta new file mode 100644 index 0000000000..771237d6dd --- /dev/null +++ b/Assets/Animate/Key 1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b650dba742a3854f9fc1bca1f61d3c5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Key 2.controller b/Assets/Animate/Key 2.controller new file mode 100644 index 0000000000..7265b1d09d --- /dev/null +++ b/Assets/Animate/Key 2.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-6772216209402527789 +AnimatorStateMachine: + serializedVersion: 6 + 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: 8424208059681761147} + 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: 8424208059681761147} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Key 2 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6772216209402527789} + 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 &8424208059681761147 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Anime + 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: 5912bc07aaa5e064a9e72c58115641e5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animate/Key 2.controller.meta b/Assets/Animate/Key 2.controller.meta new file mode 100644 index 0000000000..e870b11205 --- /dev/null +++ b/Assets/Animate/Key 2.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 43efbd2a03fa58c49ae5a0e309d9fbab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Key.controller b/Assets/Animate/Key.controller new file mode 100644 index 0000000000..ac16fec9f7 --- /dev/null +++ b/Assets/Animate/Key.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5820282222920449914 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KeyAnimate + 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: 11fabce3b11bb4b49b8b8a1af47f5c04, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-1094585460469791628 +AnimatorStateMachine: + serializedVersion: 6 + 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: -5820282222920449914} + m_Position: {x: 100, y: 210, 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: -5820282222920449914} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Key + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -1094585460469791628} + 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} diff --git a/Assets/Animate/Key.controller.meta b/Assets/Animate/Key.controller.meta new file mode 100644 index 0000000000..a9e026c4a9 --- /dev/null +++ b/Assets/Animate/Key.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6be07bb0012ff446ababe82cb21d8df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Key.prefab b/Assets/Animate/Key.prefab new file mode 100644 index 0000000000..4203a8b66a --- /dev/null +++ b/Assets/Animate/Key.prefab @@ -0,0 +1,154 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7764031903348430351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5983613665179582198} + - component: {fileID: 1914986659107461387} + - component: {fileID: 7942275140223198743} + - component: {fileID: 4993074717256987956} + m_Layer: 0 + m_Name: Key + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5983613665179582198 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7764031903348430351} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.98, y: 0.39, z: -9.15} + 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!61 &1914986659107461387 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7764031903348430351} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &7942275140223198743 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7764031903348430351} + 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_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: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + m_Color: {r: 1, g: 1, b: 1, 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_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &4993074717256987956 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7764031903348430351} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 43efbd2a03fa58c49ae5a0e309d9fbab, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Animate/Key.prefab.meta b/Assets/Animate/Key.prefab.meta new file mode 100644 index 0000000000..d2ab317400 --- /dev/null +++ b/Assets/Animate/Key.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4a4259d3cfd853f408f44e3440e48dca +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/KeyAnim.anim b/Assets/Animate/KeyAnim.anim new file mode 100644 index 0000000000..f2c2b53999 --- /dev/null +++ b/Assets/Animate/KeyAnim.anim @@ -0,0 +1,53 @@ +%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: KeyAnim + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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/Assets/Animate/KeyAnim.anim.meta b/Assets/Animate/KeyAnim.anim.meta new file mode 100644 index 0000000000..c25e9897ab --- /dev/null +++ b/Assets/Animate/KeyAnim.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f074940d4b70e294fb294815c2642bea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/KeyAnimate.anim b/Assets/Animate/KeyAnimate.anim new file mode 100644 index 0000000000..938b40353e --- /dev/null +++ b/Assets/Animate/KeyAnimate.anim @@ -0,0 +1,159 @@ +%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: KeyAnimate + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + - time: 0.016666668 + value: {fileID: 21300000, guid: f16737ca9f1dc29448765a816d0a1b49, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 7a0de91dea9f59140bb693004bf0b0ad, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 7c8bdf6129a84e141a690926a43cb384, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 2a8146b76a8332e46b9c00f3cb2960e8, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 2c9d2d33aa1cb054cb019c852a64b6d4, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 6b805b3d02c25084780e70f6b6e7ab38, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: b53184e6a2932ee409a26e6838f16aae, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 44fbfa5afc056fe459c80663e42e9ae4, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 862eb60c627dd534cb832145605ac12d, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 7a85663a637e4004e92472acad01c2b8, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: e800ef09025e509499b2916a88d7da82, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 3dbc35981e1cf7b4e8e17794cc775b4d, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 0a3bfa4764855014695c9c734bd910a5, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: 2c458ee8cd0fbbf4fa714059d5f3136d, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: b940cb8a87dbc2b4c9924fa949455cab, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 36d7a8d875f6bec499f358447156b5fc, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: 5bc4e6fd2df715c46b166367924563d2, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: c7e105af68f080d408ff8dcfc71d976f, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 55b7d14da52e94f40a7977ab1fd4678e, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 75c23d1c7c70bb847b9946964aaf0825, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: cd5d447894330194aa31e955895c2404, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: 854bacb421a0cf0409b811ca82dc0b72, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 36cb6f5bee0e9c64b8fd1b8d8fa3a779, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: e2eadf32de58de044a6101c5d48fb7d5, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 2e67ec8e00de06747930191c34bec57b, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: d48d2bef2814aec4db2752ccf322c364, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: ee67da4db316077448ea9b6e1f5429b4, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: a74e1b80bec2c7a41b68c0a4e6a2085a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + - {fileID: 21300000, guid: f16737ca9f1dc29448765a816d0a1b49, type: 3} + - {fileID: 21300000, guid: 7a0de91dea9f59140bb693004bf0b0ad, type: 3} + - {fileID: 21300000, guid: 7c8bdf6129a84e141a690926a43cb384, type: 3} + - {fileID: 21300000, guid: 2a8146b76a8332e46b9c00f3cb2960e8, type: 3} + - {fileID: 21300000, guid: 2c9d2d33aa1cb054cb019c852a64b6d4, type: 3} + - {fileID: 21300000, guid: 6b805b3d02c25084780e70f6b6e7ab38, type: 3} + - {fileID: 21300000, guid: b53184e6a2932ee409a26e6838f16aae, type: 3} + - {fileID: 21300000, guid: 44fbfa5afc056fe459c80663e42e9ae4, type: 3} + - {fileID: 21300000, guid: 862eb60c627dd534cb832145605ac12d, type: 3} + - {fileID: 21300000, guid: 7a85663a637e4004e92472acad01c2b8, type: 3} + - {fileID: 21300000, guid: e800ef09025e509499b2916a88d7da82, type: 3} + - {fileID: 21300000, guid: 3dbc35981e1cf7b4e8e17794cc775b4d, type: 3} + - {fileID: 21300000, guid: 0a3bfa4764855014695c9c734bd910a5, type: 3} + - {fileID: 21300000, guid: 2c458ee8cd0fbbf4fa714059d5f3136d, type: 3} + - {fileID: 21300000, guid: b940cb8a87dbc2b4c9924fa949455cab, type: 3} + - {fileID: 21300000, guid: 36d7a8d875f6bec499f358447156b5fc, type: 3} + - {fileID: 21300000, guid: 5bc4e6fd2df715c46b166367924563d2, type: 3} + - {fileID: 21300000, guid: c7e105af68f080d408ff8dcfc71d976f, type: 3} + - {fileID: 21300000, guid: 55b7d14da52e94f40a7977ab1fd4678e, type: 3} + - {fileID: 21300000, guid: 75c23d1c7c70bb847b9946964aaf0825, type: 3} + - {fileID: 21300000, guid: cd5d447894330194aa31e955895c2404, type: 3} + - {fileID: 21300000, guid: 854bacb421a0cf0409b811ca82dc0b72, type: 3} + - {fileID: 21300000, guid: 36cb6f5bee0e9c64b8fd1b8d8fa3a779, type: 3} + - {fileID: 21300000, guid: e2eadf32de58de044a6101c5d48fb7d5, type: 3} + - {fileID: 21300000, guid: 2e67ec8e00de06747930191c34bec57b, type: 3} + - {fileID: 21300000, guid: d48d2bef2814aec4db2752ccf322c364, type: 3} + - {fileID: 21300000, guid: ee67da4db316077448ea9b6e1f5429b4, type: 3} + - {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - {fileID: 21300000, guid: a74e1b80bec2c7a41b68c0a4e6a2085a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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/Assets/Animate/KeyAnimate.anim.meta b/Assets/Animate/KeyAnimate.anim.meta new file mode 100644 index 0000000000..4a880d122c --- /dev/null +++ b/Assets/Animate/KeyAnimate.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11fabce3b11bb4b49b8b8a1af47f5c04 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/KeyController.cs b/Assets/Animate/KeyController.cs new file mode 100644 index 0000000000..f46a887c62 --- /dev/null +++ b/Assets/Animate/KeyController.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class KeyController : MonoBehaviour +{ + private void OnCollisionEnter2D(Collision2D collision) + { + if (collision.gameObject.GetComponent() != null) + { + PlayerController playerController = collision.gameObject.GetComponent(); + playerController.pickUpKey(); + Destroy(gameObject); + } + } +} diff --git a/Assets/Animate/KeyController.cs.meta b/Assets/Animate/KeyController.cs.meta new file mode 100644 index 0000000000..827e1a2ee8 --- /dev/null +++ b/Assets/Animate/KeyController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d7c3ab241ab687a46a05a0ed533682fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level/Key.prefab b/Assets/Animate/Level/Key.prefab new file mode 100644 index 0000000000..6dfd46906a --- /dev/null +++ b/Assets/Animate/Level/Key.prefab @@ -0,0 +1,216 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4158103789926644168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7920711303666236948} + - component: {fileID: 1887507156140157301} + - component: {fileID: 2160492146328458076} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7920711303666236948 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4158103789926644168} + 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: [] + m_Father: {fileID: 3225016564008001500} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &1887507156140157301 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4158103789926644168} + m_Enabled: 1 + m_Tiles: + - first: {x: -1, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 331ef44f37064c749abae3d67e58e05c, type: 2} + m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + m_TileMatrixArray: + - m_RefCount: 1 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 1 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: -1, y: 0, z: 0} + m_Size: {x: 1, y: 1, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!483693784 &2160492146328458076 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4158103789926644168} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1 &6890654064987628408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3225016564008001500} + - component: {fileID: 4585636812427262797} + m_Layer: 0 + m_Name: Key + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3225016564008001500 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6890654064987628408} + 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: 7920711303666236948} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &4585636812427262797 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6890654064987628408} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!114 &7967237637628417161 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12395, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Palette Settings + m_EditorClassIdentifier: + cellSizing: 0 + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} diff --git a/Assets/Animate/Level/Key.prefab.meta b/Assets/Animate/Level/Key.prefab.meta new file mode 100644 index 0000000000..f7238cce2a --- /dev/null +++ b/Assets/Animate/Level/Key.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b38b5384a7ec8054da8462a08a2eb4cf +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/PlayerController.cs b/Assets/Animate/PlayerController.cs index c77adb0d82..52ba5e9c22 100644 --- a/Assets/Animate/PlayerController.cs +++ b/Assets/Animate/PlayerController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -11,6 +12,8 @@ public class PlayerController : MonoBehaviour private Rigidbody2D rb2d; + public ScoreController scoreController; + //Take a reference from inspector. private void Awake() @@ -74,8 +77,9 @@ private void PlayMovementAnimation(float horizontal , float vertical) } } - - - - + public void pickUpKey() + { + Debug.Log("Key is pickedup"); + scoreController.IncreaseScore(10); + } } diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index f2e1dc26be..ef37ca7a62 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -122,6 +122,132 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &250651287 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 6947531162802009278} + m_PrefabAsset: {fileID: 0} +--- !u!4 &250651291 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 6947531162802009278} + m_PrefabAsset: {fileID: 0} +--- !u!114 &250651292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 250651287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &365590507 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 365590511} + - component: {fileID: 365590510} + - component: {fileID: 365590509} + - component: {fileID: 365590508} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &365590508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365590507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &365590509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365590507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &365590510 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365590507} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &365590511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365590507} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 625562595} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &410899623 GameObject: m_ObjectHideFlags: 0 @@ -205,12 +331,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410899623} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 4.34, y: -6.04, z: -10.002488} m_LocalScale: {x: 4.79, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1862444160} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &475681475 GameObject: @@ -295,12 +421,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 475681475} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 20.59, y: 7.31, z: -9.987183} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1862444160} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &558003131 GameObject: @@ -432,6 +558,264 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &625562594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 625562595} + - component: {fileID: 625562597} + - component: {fileID: 625562596} + - component: {fileID: 625562598} + m_Layer: 5 + m_Name: Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &625562595 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625562594} + 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: [] + m_Father: {fileID: 365590511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -198.2, y: -29} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &625562596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625562594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Score:0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &625562597 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625562594} + m_CullTransparentMesh: 1 +--- !u!114 &625562598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625562594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d69a2b42aff05241acd5e92c806d787, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &636899476 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Size.x + value: 0.6511822 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Offset.x + value: -0.027538061 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.x + value: 9.83 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.2 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.z + value: -9.15 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Name + value: Key (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + insertIndex: -1 + addedObject: {fileID: 636899479} + m_SourcePrefab: {fileID: 100100000, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} +--- !u!4 &636899477 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 636899476} + m_PrefabAsset: {fileID: 0} +--- !u!1 &636899478 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 636899476} + m_PrefabAsset: {fileID: 0} +--- !u!114 &636899479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636899478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1101254690 GameObject: m_ObjectHideFlags: 0 @@ -469,12 +853,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101254690} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 16.434763, y: 7.0660567, z: -9.987183} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1862444160} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1245773821 GameObject: @@ -1349,12 +1733,191 @@ Transform: m_GameObject: {fileID: 1260965266} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.03, y: 1.26, z: -10} + m_LocalPosition: {x: -0.06, y: 1.19, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1751292492} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1329991807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1329991810} + - component: {fileID: 1329991809} + - component: {fileID: 1329991808} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1329991808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329991807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1329991809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329991807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1329991810 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329991807} + 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: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1395568090 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Size.x + value: 0.6511822 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Offset.x + value: -0.027538061 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.x + value: 13.35 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.y + value: 7.06 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.z + value: -9.15 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Name + value: Key (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1395568093} + m_SourcePrefab: {fileID: 100100000, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} +--- !u!4 &1395568091 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 1395568090} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1395568092 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 1395568090} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1395568093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1395568092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1751292479 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, @@ -1454,6 +2017,7 @@ MonoBehaviour: playerAnimator: {fileID: 1751292486} speed: 5 jump: 2 + scoreController: {fileID: 625562598} --- !u!4 &1751292492 stripped Transform: m_CorrespondingSourceObject: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, @@ -1723,7 +2287,7 @@ GameObject: - component: {fileID: 1862444160} - component: {fileID: 1862444159} m_Layer: 0 - m_Name: Grid + m_Name: Levels m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1756,6 +2320,12 @@ Transform: m_Children: - {fileID: 1245773822} - {fileID: 1765070227} + - {fileID: 475681478} + - {fileID: 1101254692} + - {fileID: 410899626} + - {fileID: 250651291} + - {fileID: 636899477} + - {fileID: 1395568091} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3967004074362709419 @@ -1847,6 +2417,93 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1751292490} m_SourcePrefab: {fileID: 100100000, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} +--- !u!1001 &6947531162802009278 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Size.x + value: 0.6511822 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Offset.x + value: -0.027538061 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.98 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.39 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.z + value: -9.15 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Name + value: Key + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + insertIndex: -1 + addedObject: {fileID: 250651292} + m_SourcePrefab: {fileID: 100100000, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1854,6 +2511,5 @@ SceneRoots: - {fileID: 3967004074362709419} - {fileID: 558003134} - {fileID: 1862444160} - - {fileID: 475681478} - - {fileID: 1101254692} - - {fileID: 410899626} + - {fileID: 365590511} + - {fileID: 1329991810} diff --git a/Assets/Animate/ScoreController.cs b/Assets/Animate/ScoreController.cs new file mode 100644 index 0000000000..d465ab6977 --- /dev/null +++ b/Assets/Animate/ScoreController.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +public class ScoreController : MonoBehaviour +{ + private TextMeshProUGUI scoreText; + private int score = 0; + + private void Awake() + { + scoreText = GetComponent(); + } + + public void Start() + { + RefreshUI(); + } + public void IncreaseScore(int increment) + { + score += increment; + RefreshUI(); + } + + private void RefreshUI() + { + scoreText.text = "Score:" + score; + + } +} diff --git a/Assets/Animate/ScoreController.cs.meta b/Assets/Animate/ScoreController.cs.meta new file mode 100644 index 0000000000..406e596f88 --- /dev/null +++ b/Assets/Animate/ScoreController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6d69a2b42aff05241acd5e92c806d787 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/key.anim b/Assets/Animate/key.anim new file mode 100644 index 0000000000..d063d59446 --- /dev/null +++ b/Assets/Animate/key.anim @@ -0,0 +1,53 @@ +%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: key + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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/Assets/Animate/key.anim.meta b/Assets/Animate/key.anim.meta new file mode 100644 index 0000000000..ec4ec871af --- /dev/null +++ b/Assets/Animate/key.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c7999c4b00ac594b93be908f4170f07 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Key/KeySpin0000.asset b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Key/KeySpin0000.asset new file mode 100644 index 0000000000..ef82694b18 --- /dev/null +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Key/KeySpin0000.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: KeySpin0000 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Key/KeySpin0000.asset.meta b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Key/KeySpin0000.asset.meta new file mode 100644 index 0000000000..a17e50d889 --- /dev/null +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Key/KeySpin0000.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 331ef44f37064c749abae3d67e58e05c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 3eaacb5f9f..c3a0d67892 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Project + m_Title: Game m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 321} m_MaxSize: {x: 10000, y: 10000} @@ -39,15 +39,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1026.4 + x: 992 y: 0 - width: 146.40002 - height: 409.6 + width: 180.80005 + height: 449.6 m_MinSize: {x: 242, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 --- !u!114 &3 @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 60 + controlID: 109 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 61 + controlID: 45 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -194,7 +194,7 @@ MonoBehaviour: x: 0 y: 0 width: 1172.8 - height: 409.6 + height: 449.6 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 @@ -217,8 +217,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 260 - height: 409.6 + width: 388 + height: 449.6 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} @@ -241,10 +241,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 260 + x: 388 y: 0 - width: 766.4 - height: 409.6 + width: 604 + height: 449.6 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} @@ -270,16 +270,16 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 409.6 + y: 449.6 width: 1172.8 - height: 313.19998 + height: 273.19998 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} - {fileID: 20} - - {fileID: 14} + - {fileID: 13} m_Selected: 0 m_LastSelected: 1 --- !u!114 &12 @@ -317,21 +317,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 240, y: 200} + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Tile Palette - m_Image: {fileID: 0} + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1026.4 - y: 73.6 - width: 144.40002 - height: 388.6 + x: 0 + y: 523.2 + width: 1171.8 + height: 252.19998 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -342,6 +343,9 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -15826 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -351,22 +355,21 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 240, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, - type: 0} + m_Text: Tile Palette + m_Image: {fileID: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 502.4 - width: 1171.8 - height: 273 + x: 992 + y: 73.6 + width: 178.80005 + height: 428.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -377,9 +380,6 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: -7712 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -401,10 +401,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 260 + x: 388 y: 73.6 - width: 641.2 - height: 388.6 + width: 602 + height: 428.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -718,7 +718,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -209.60004, y: -286.4} + snapOffset: {x: -217.59998, y: -301.6} snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: AINavigationOverlay @@ -750,9 +750,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 11.168458, y: 0.6243665, z: -10.002488} + m_Target: {x: 11.488715, y: 3.8280876, z: -10.030642} speed: 2 - m_Value: {x: 11.168458, y: 0.6243665, z: -10.002488} + m_Value: {x: 11.488715, y: 3.8280876, z: -10.030642} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -802,9 +802,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.373346 + m_Target: 5.117203 speed: 2 - m_Value: 12.373346 + m_Value: 5.117203 m_Ortho: m_Target: 1 speed: 2 @@ -852,8 +852,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 259 - height: 388.6 + width: 387 + height: 428.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 28fbffff7c5c0000 + m_ExpandedIDs: 1cc2ffff28fbffff765c00008a5c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -914,10 +914,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 260 + x: 388 y: 73.6 - width: 764.4 - height: 388.6 + width: 602 + height: 428.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -934,7 +934,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 764.4, y: 367.6} + m_TargetSize: {x: 602, y: 407.6} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -949,10 +949,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -305.76 - m_HBaseRangeMax: 305.76 - m_VBaseRangeMin: -147.04001 - m_VBaseRangeMax: 147.04001 + m_HBaseRangeMin: -240.8 + m_HBaseRangeMax: 240.8 + m_VBaseRangeMin: -163.04001 + m_VBaseRangeMax: 163.04001 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -970,23 +970,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 764.4 - height: 367.6 + width: 602 + height: 407.6 m_Scale: {x: 1.25, y: 1.25} - m_Translation: {x: 382.2, y: 183.80002} + m_Translation: {x: 301, y: 203.80002} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -305.76 - y: -147.04001 - width: 611.52 - height: 294.08002 + x: -240.8 + y: -163.04001 + width: 481.6 + height: 326.08002 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 955.5, y: 485.75} + m_LastWindowPixelSize: {x: 752.5, y: 535.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1013,10 +1013,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 260 + x: 388 y: 73.6 - width: 790 - height: 566.2 + width: 602 + height: 428.6 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1030,15 +1030,49 @@ MonoBehaviour: m_ViewTransforms: m_KeySerializationHelper: - {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, type: 2} + - {fileID: -1094585460469791628, guid: e6be07bb0012ff446ababe82cb21d8df, type: 2} + - {fileID: 9096787303426884428, guid: 4b650dba742a3854f9fc1bca1f61d3c5, type: 2} m_ValueSerializationHelper: - - e00: 0.6131749 + - e00: 0.37678573 + e01: 0 + e02: 0 + e03: 60.21428 + e10: 0 + e11: 0.37678573 + e12: 0 + e13: 77.99643 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5220063 e01: 0 e02: 0 - e03: 54.070587 + e03: 132.69107 e10: 0 - e11: 0.6131749 + e11: 0.5220063 e12: 0 - e13: -24.10521 + e13: 101.334656 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.44421053 + e01: 0 + e02: 0 + e03: -7.2105255 + e10: 0 + e11: 0.44421053 + e12: 0 + e13: 157.04211 e20: 0 e21: 0 e22: 1 @@ -1048,10 +1082,10 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 87df67ff1c3df244f8bd842fb1cc4f51, + m_AnimatorController: {fileID: 9100000, guid: 4b650dba742a3854f9fc1bca1f61d3c5, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, + - m_Target: {fileID: 9096787303426884428, guid: 4b650dba742a3854f9fc1bca1f61d3c5, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} @@ -1087,9 +1121,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 483.2 + y: 523.2 width: 1171.8 - height: 292.19998 + height: 252.19998 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1117,18 +1151,18 @@ MonoBehaviour: m_ImportLogFlags: 0 m_FilterByTypeIntersection: 0 m_ViewMode: 1 - m_StartGridSize: 64 + m_StartGridSize: 57 m_LastFolders: - Assets/Animate - m_LastFoldersGridSize: -1 + m_LastFoldersGridSize: 57 m_LastProjectPath: C:\Users\Parth Vaidya\OneDrive\Desktop\2D platformer\2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 665d0000 - m_LastClickedID: 23910 - m_ExpandedIDs: 00000000ae550000505d0000525d0000545d0000565d0000585d00005a5d00005c5d00005e5d0000605d0000625d0000645d0000665d0000685d00006a5d00006c5d00006e5d0000705d0000725d0000745d0000765d0000945d000000ca9a3b + scrollPos: {x: 0, y: 59.99823} + m_SelectedIDs: b45d0000 + m_LastClickedID: 23988 + m_ExpandedIDs: 00000000b05500009e5d0000a05d0000a25d0000a45d0000a65d0000a85d0000aa5d0000ac5d0000ae5d0000b05d0000b25d0000b45d0000b65d0000b85d0000ba5d0000bc5d0000be5d0000c05d0000c25d0000c45d0000e25d000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1156,7 +1190,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ae550000505d0000525d0000545d0000565d0000585d00005a5d00005c5d00005e5d0000605d0000625d0000645d0000665d0000685d00006a5d00006c5d00006e5d0000705d0000725d0000745d0000765d0000 + m_ExpandedIDs: 00000000b05500009e5d0000a05d0000a25d0000a45d0000a65d0000a85d0000aa5d0000ac5d0000ae5d0000b05d0000b25d0000b45d0000b65d0000b85d0000ba5d0000bc5d0000be5d0000c05d0000c25d0000c45d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1184,7 +1218,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c62300005c5c0000605c0000 + m_ExpandedInstanceIDs: c62300005c5c0000605c0000a65e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1200,7 +1234,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1209,7 +1243,7 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 + m_GridSize: 57 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 --- !u!114 &20 @@ -1234,9 +1268,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 483.2 + y: 523.2 width: 1171.8 - height: 292.19998 + height: 252.19998 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 From efdc3a496d0b97dbd2bcb2345f8fb92f4815e7ab Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Wed, 16 Oct 2024 19:16:29 +0530 Subject: [PATCH 12/18] Created Enemies and reload screen --- Assets/Animate/Enemy.controller | 72 ++++++++ Assets/Animate/Enemy.controller.meta | 8 + Assets/Animate/Enemy.prefab | 154 ++++++++++++++++ Assets/Animate/Enemy.prefab.meta | 7 + Assets/Animate/EnemyController.cs | 16 ++ Assets/Animate/EnemyController.cs.meta | 11 ++ Assets/Animate/PlayerController.cs | 10 ++ Assets/Animate/Scene.unity | 224 ++++++++++++++++++++++++ Assets/Animate/villiananimate.anim | 99 +++++++++++ Assets/Animate/villiananimate.anim.meta | 8 + UserSettings/Layouts/default-2022.dwlt | 127 ++++++++------ 11 files changed, 681 insertions(+), 55 deletions(-) create mode 100644 Assets/Animate/Enemy.controller create mode 100644 Assets/Animate/Enemy.controller.meta create mode 100644 Assets/Animate/Enemy.prefab create mode 100644 Assets/Animate/Enemy.prefab.meta create mode 100644 Assets/Animate/EnemyController.cs create mode 100644 Assets/Animate/EnemyController.cs.meta create mode 100644 Assets/Animate/villiananimate.anim create mode 100644 Assets/Animate/villiananimate.anim.meta diff --git a/Assets/Animate/Enemy.controller b/Assets/Animate/Enemy.controller new file mode 100644 index 0000000000..3a237b8f17 --- /dev/null +++ b/Assets/Animate/Enemy.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-2612833720363050039 +AnimatorStateMachine: + serializedVersion: 6 + 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: 8687918851694283521} + 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: 8687918851694283521} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Enemy + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2612833720363050039} + 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 &8687918851694283521 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: villiananimate + 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: 7bd011923ab5be645be5c7d527f5be7c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animate/Enemy.controller.meta b/Assets/Animate/Enemy.controller.meta new file mode 100644 index 0000000000..43911bfa49 --- /dev/null +++ b/Assets/Animate/Enemy.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 116799d8204c3e64089c897435eeef25 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Enemy.prefab b/Assets/Animate/Enemy.prefab new file mode 100644 index 0000000000..9a145c42db --- /dev/null +++ b/Assets/Animate/Enemy.prefab @@ -0,0 +1,154 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6407788976565314730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1461414725886577495} + - component: {fileID: 8463332446840587701} + - component: {fileID: 2770629241357128503} + - component: {fileID: 8979674332804596017} + m_Layer: 0 + m_Name: Enemy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1461414725886577495 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6407788976565314730} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 15.23, y: 6.68, z: -6.09} + 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!212 &8463332446840587701 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6407788976565314730} + 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_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: 21300000, guid: ac9307145261eee499a455ddeb80db4b, 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.3333333, y: 2.22} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &2770629241357128503 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6407788976565314730} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0.010173798, y: 0.6058667} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.25} + oldSize: {x: 3.3333333, y: 2.22} + newSize: {x: 3.3333333, y: 2.22} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2.1735687, y: 1.589251} + m_EdgeRadius: 0 +--- !u!95 &8979674332804596017 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6407788976565314730} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 116799d8204c3e64089c897435eeef25, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Animate/Enemy.prefab.meta b/Assets/Animate/Enemy.prefab.meta new file mode 100644 index 0000000000..a0b479a32d --- /dev/null +++ b/Assets/Animate/Enemy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 65fc1650608efec44b1e592b339f3fbd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/EnemyController.cs b/Assets/Animate/EnemyController.cs new file mode 100644 index 0000000000..20f41c3d9b --- /dev/null +++ b/Assets/Animate/EnemyController.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyController : MonoBehaviour +{ + private void OnCollisionEnter2D(Collision2D collision) + { + if (collision.gameObject.GetComponent() != null) + { + PlayerController playerController = collision.gameObject.GetComponent(); + playerController.KillPlayer(); + + } + } +} diff --git a/Assets/Animate/EnemyController.cs.meta b/Assets/Animate/EnemyController.cs.meta new file mode 100644 index 0000000000..212d4db747 --- /dev/null +++ b/Assets/Animate/EnemyController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 39adebf01b966e048b9a111f5b090ef6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/PlayerController.cs b/Assets/Animate/PlayerController.cs index 52ba5e9c22..8aacf4c165 100644 --- a/Assets/Animate/PlayerController.cs +++ b/Assets/Animate/PlayerController.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public class PlayerController : MonoBehaviour { @@ -82,4 +83,13 @@ public void pickUpKey() Debug.Log("Key is pickedup"); scoreController.IncreaseScore(10); } + + public void KillPlayer() + { + Debug.Log("Player died!!"); + // Reload the current scene when the player falls into the death zone + SceneManager.LoadScene(SceneManager.GetActiveScene().name); + + + } } diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index ef37ca7a62..c5a37bb817 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -816,6 +816,141 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &736344553 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalScale.x + value: 1.0061 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.x + value: 12.72 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.59 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.z + value: -5.39 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770629241357128503, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_Name + value: Enemy (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + insertIndex: -1 + addedObject: {fileID: 738745607} + m_SourcePrefab: {fileID: 100100000, guid: 65fc1650608efec44b1e592b339f3fbd, type: 3} +--- !u!1 &738745605 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + m_PrefabInstance: {fileID: 736344553} + m_PrefabAsset: {fileID: 0} +--- !u!4 &738745606 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + m_PrefabInstance: {fileID: 736344553} + m_PrefabAsset: {fileID: 0} +--- !u!114 &738745607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 738745605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39adebf01b966e048b9a111f5b090ef6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1092777149 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + m_PrefabInstance: {fileID: 8292547381967525297} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1092777151 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + m_PrefabInstance: {fileID: 8292547381967525297} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1092777154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092777149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39adebf01b966e048b9a111f5b090ef6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1101254690 GameObject: m_ObjectHideFlags: 0 @@ -2326,6 +2461,8 @@ Transform: - {fileID: 250651291} - {fileID: 636899477} - {fileID: 1395568091} + - {fileID: 1092777151} + - {fileID: 738745606} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3967004074362709419 @@ -2504,6 +2641,93 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 250651292} m_SourcePrefab: {fileID: 100100000, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} +--- !u!1001 &8292547381967525297 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalScale.x + value: 1.0061 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.x + value: 15.2198 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.y + value: 6.68 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.z + value: -6.09 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770629241357128503, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_Name + value: Enemy + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1092777154} + m_SourcePrefab: {fileID: 100100000, guid: 65fc1650608efec44b1e592b339f3fbd, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Animate/villiananimate.anim b/Assets/Animate/villiananimate.anim new file mode 100644 index 0000000000..12933d26dd --- /dev/null +++ b/Assets/Animate/villiananimate.anim @@ -0,0 +1,99 @@ +%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: villiananimate + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: ac9307145261eee499a455ddeb80db4b, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: ef846db2d56c3124b8f82467a163ebdf, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: b3da84ebb4d3f0748b47f5cf58ae9d40, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: 2682d6b08082e2f49b748e74174a8e87, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: f0657c0811c44934ba275af9b1aa5c85, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: ab415a003dc7634428737e396fb6b118, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 980a4b66b0a2bba42a9a3b50f4da76d6, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: b801fd8404ee341479f2a795c6dd8ab5, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 3d64a15e480cc6847bc34f715f1999fa, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: f49c41dd300e6f6439fb3dafb10f4e9d, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: ac9307145261eee499a455ddeb80db4b, type: 3} + - {fileID: 21300000, guid: ef846db2d56c3124b8f82467a163ebdf, type: 3} + - {fileID: 21300000, guid: b3da84ebb4d3f0748b47f5cf58ae9d40, type: 3} + - {fileID: 21300000, guid: 2682d6b08082e2f49b748e74174a8e87, type: 3} + - {fileID: 21300000, guid: f0657c0811c44934ba275af9b1aa5c85, type: 3} + - {fileID: 21300000, guid: ab415a003dc7634428737e396fb6b118, type: 3} + - {fileID: 21300000, guid: 980a4b66b0a2bba42a9a3b50f4da76d6, type: 3} + - {fileID: 21300000, guid: b801fd8404ee341479f2a795c6dd8ab5, type: 3} + - {fileID: 21300000, guid: 3d64a15e480cc6847bc34f715f1999fa, type: 3} + - {fileID: 21300000, guid: f49c41dd300e6f6439fb3dafb10f4e9d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.38333336 + 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/Assets/Animate/villiananimate.anim.meta b/Assets/Animate/villiananimate.anim.meta new file mode 100644 index 0000000000..4ffb6e2a5b --- /dev/null +++ b/Assets/Animate/villiananimate.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7bd011923ab5be645be5c7d527f5be7c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index c3a0d67892..59573aec43 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: Game m_RootView: {fileID: 3} - m_MinSize: {x: 875, y: 321} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -42,9 +42,9 @@ MonoBehaviour: x: 992 y: 0 width: 180.80005 - height: 449.6 - m_MinSize: {x: 242, y: 221} - m_MaxSize: {x: 4002, y: 4021} + height: 450.4 + m_MinSize: {x: 240, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 109 + controlID: 76 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 45 + controlID: 77 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -194,11 +194,11 @@ MonoBehaviour: x: 0 y: 0 width: 1172.8 - height: 449.6 + height: 450.4 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 46 + controlID: 47 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -217,10 +217,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 388 - height: 449.6 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 304.8 + height: 450.4 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -241,12 +241,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 388 + x: 304.8 y: 0 - width: 604 - height: 449.6 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 687.2 + height: 450.4 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 15} @@ -270,9 +270,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 449.6 + y: 450.4 width: 1172.8 - height: 273.19998 + height: 272.4 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 19} @@ -345,7 +345,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -15826 + m_LastSelectedObjectID: 23654 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -369,7 +369,7 @@ MonoBehaviour: x: 992 y: 73.6 width: 178.80005 - height: 428.6 + height: 429.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -401,10 +401,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 388 + x: 304.80002 y: 73.6 - width: 602 - height: 428.6 + width: 685.2 + height: 429.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -800,7 +800,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: -0, y: 0, z: -0, w: -1} m_Size: m_Target: 5.117203 speed: 2 @@ -852,8 +852,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 387 - height: 428.6 + width: 303.8 + height: 429.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 1cc2ffff28fbffff765c00008a5c0000 + m_ExpandedIDs: 28fbffffcc5c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -914,10 +914,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 388 + x: 304.80002 y: 73.6 - width: 602 - height: 428.6 + width: 685.2 + height: 429.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -934,7 +934,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 602, y: 407.6} + m_TargetSize: {x: 685.2, y: 408.4} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -949,10 +949,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -240.8 - m_HBaseRangeMax: 240.8 - m_VBaseRangeMin: -163.04001 - m_VBaseRangeMax: 163.04001 + m_HBaseRangeMin: -274.08002 + m_HBaseRangeMax: 274.08002 + m_VBaseRangeMin: -163.36 + m_VBaseRangeMax: 163.36 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -970,23 +970,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 602 - height: 407.6 + width: 685.2 + height: 408.4 m_Scale: {x: 1.25, y: 1.25} - m_Translation: {x: 301, y: 203.80002} + m_Translation: {x: 342.60004, y: 204.2} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -240.8 - y: -163.04001 - width: 481.6 - height: 326.08002 + x: -274.08002 + y: -163.36 + width: 548.16003 + height: 326.72 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 752.5, y: 535.75} + m_LastWindowPixelSize: {x: 856.5, y: 536.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1032,6 +1032,7 @@ MonoBehaviour: - {fileID: -5536339182766939842, guid: 87df67ff1c3df244f8bd842fb1cc4f51, type: 2} - {fileID: -1094585460469791628, guid: e6be07bb0012ff446ababe82cb21d8df, type: 2} - {fileID: 9096787303426884428, guid: 4b650dba742a3854f9fc1bca1f61d3c5, type: 2} + - {fileID: -2612833720363050039, guid: 116799d8204c3e64089c897435eeef25, type: 2} m_ValueSerializationHelper: - e00: 0.37678573 e01: 0 @@ -1081,11 +1082,27 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 4b650dba742a3854f9fc1bca1f61d3c5, + m_AnimatorController: {fileID: 9100000, guid: 116799d8204c3e64089c897435eeef25, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 9096787303426884428, guid: 4b650dba742a3854f9fc1bca1f61d3c5, + - m_Target: {fileID: -2612833720363050039, guid: 116799d8204c3e64089c897435eeef25, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} @@ -1121,9 +1138,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 523.2 + y: 524 width: 1171.8 - height: 252.19998 + height: 251.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1159,10 +1176,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 59.99823} - m_SelectedIDs: b45d0000 - m_LastClickedID: 23988 - m_ExpandedIDs: 00000000b05500009e5d0000a05d0000a25d0000a45d0000a65d0000a85d0000aa5d0000ac5d0000ae5d0000b05d0000b25d0000b45d0000b65d0000b85d0000ba5d0000bc5d0000be5d0000c05d0000c25d0000c45d0000e25d000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 3c5e0000 + m_LastClickedID: 24124 + m_ExpandedIDs: 00000000b45500005c570000265e0000285e00002a5e00002c5e00002e5e0000305e0000325e0000345e0000365e0000385e00003a5e00003c5e00003e5e0000405e0000425e0000445e0000465e0000485e00004a5e00004c5e0000545e00007e5e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1190,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000b05500009e5d0000a05d0000a25d0000a45d0000a65d0000a85d0000aa5d0000ac5d0000ae5d0000b05d0000b25d0000b45d0000b65d0000b85d0000ba5d0000bc5d0000be5d0000c05d0000c25d0000c45d0000 + m_ExpandedIDs: 00000000b4550000265e0000285e00002a5e00002c5e00002e5e0000305e0000325e0000345e0000365e0000385e00003a5e00003c5e00003e5e0000405e0000425e0000445e0000465e0000485e00004a5e00004c5e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1268,9 +1285,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 523.2 + y: 524 width: 1171.8 - height: 252.19998 + height: 251.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 From 495c35f9c69536cf16bc7e9447696c7e43edd764 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Thu, 17 Oct 2024 10:52:12 +0530 Subject: [PATCH 13/18] Added health and collisions --- Assets/Animate/EnemyController.cs | 48 ++++ Assets/Animate/HealthController.cs | 49 ++++ Assets/Animate/HealthController.cs.meta | 11 + Assets/Animate/PlayerController.cs | 15 +- Assets/Animate/Scene.unity | 319 +++++++++++++++++++++++- UserSettings/Layouts/default-2022.dwlt | 76 +++--- 6 files changed, 472 insertions(+), 46 deletions(-) create mode 100644 Assets/Animate/HealthController.cs create mode 100644 Assets/Animate/HealthController.cs.meta diff --git a/Assets/Animate/EnemyController.cs b/Assets/Animate/EnemyController.cs index 20f41c3d9b..1d345dc752 100644 --- a/Assets/Animate/EnemyController.cs +++ b/Assets/Animate/EnemyController.cs @@ -4,6 +4,43 @@ public class EnemyController : MonoBehaviour { + public float speed = 2f; // Speed of the enemy + public float leftBoundary = -5f; // Left boundary + public float rightBoundary = 5f; // Right boundary + + private bool movingRight = true; // Direction flag + + private void Update() + { + MoveEnemy(); + } + + private void MoveEnemy() + { + // Move the enemy + if (movingRight) + { + transform.Translate(Vector2.right * speed * Time.deltaTime); + + // Check if the enemy has reached the right boundary + if (transform.position.x >= rightBoundary) + { + movingRight = false; // Change direction to left + } + } + else + { + transform.Translate(Vector2.left * speed * Time.deltaTime); + + // Check if the enemy has reached the left boundary + if (transform.position.x <= leftBoundary) + { + movingRight = true; // Change direction to right + } + } + } + + private void OnCollisionEnter2D(Collision2D collision) { if (collision.gameObject.GetComponent() != null) @@ -13,4 +50,15 @@ private void OnCollisionEnter2D(Collision2D collision) } } + + + private void OnTriggerEnter2D(Collider2D other) + { + // Check if the enemy hit the boundary + if (other.CompareTag("Boundary")) + { + // Reverse direction if hitting a boundary + movingRight = !movingRight; + } + } } diff --git a/Assets/Animate/HealthController.cs b/Assets/Animate/HealthController.cs new file mode 100644 index 0000000000..d1e7db6387 --- /dev/null +++ b/Assets/Animate/HealthController.cs @@ -0,0 +1,49 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class HealthController : MonoBehaviour +{ + private TextMeshProUGUI healthText; + private int maxHealth = 3; + private int currentHealth; + + private void Awake() + { + healthText = GetComponent(); // Get the TextMeshProUGUI component + } + + private void Start() + { + currentHealth = maxHealth; // Initialize the player's health to maxHealth + RefreshUI(); + } + + // Call this method to reduce the player's health + public void TakeDamage(int damage) + { + currentHealth -= damage; // Decrease health by damage amount + + if (currentHealth <= 0) + { + PlayerDies(); + } + else + { + RefreshUI(); // Update the health display if the player is still alive + } + } + + private void PlayerDies() + { + Debug.Log("Player died! Reloading scene..."); + SceneManager.LoadScene(SceneManager.GetActiveScene().name); // Reload the current scene when the player dies + } + + private void RefreshUI() + { + healthText.text = "Health: " + currentHealth; // Update the health text + } +} diff --git a/Assets/Animate/HealthController.cs.meta b/Assets/Animate/HealthController.cs.meta new file mode 100644 index 0000000000..daac4e6626 --- /dev/null +++ b/Assets/Animate/HealthController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e005ec1c123e9ee49abe5ef27650fd37 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/PlayerController.cs b/Assets/Animate/PlayerController.cs index 8aacf4c165..e786feb648 100644 --- a/Assets/Animate/PlayerController.cs +++ b/Assets/Animate/PlayerController.cs @@ -14,6 +14,7 @@ public class PlayerController : MonoBehaviour private Rigidbody2D rb2d; public ScoreController scoreController; + public HealthController healthController; //Take a reference from inspector. @@ -86,10 +87,16 @@ public void pickUpKey() public void KillPlayer() { - Debug.Log("Player died!!"); - // Reload the current scene when the player falls into the death zone - SceneManager.LoadScene(SceneManager.GetActiveScene().name); - + Debug.Log("Player hit by enemy! Reducing health."); + + if (healthController != null) + { + healthController.TakeDamage(1); // Reduce health by 1 + } + else + { + Debug.LogError("HealthController reference is missing in PlayerController."); + } } } diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index c5a37bb817..446be0a009 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -241,6 +241,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 625562595} + - {fileID: 1584568254} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -679,7 +680,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: 50.914642, w: 5.8187866} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -816,6 +817,83 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &700601723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 700601725} + - component: {fileID: 700601724} + m_Layer: 0 + m_Name: LeftCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &700601724 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 700601723} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + 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 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!4 &700601725 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 700601723} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 14.91, y: 7.13, z: -10.077069} + 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!1001 &736344553 PrefabInstance: m_ObjectHideFlags: 0 @@ -927,6 +1005,86 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 39adebf01b966e048b9a111f5b090ef6, type: 3} m_Name: m_EditorClassIdentifier: + speed: 2 + leftBoundary: -5 + rightBoundary: 5 +--- !u!1 &993935076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 993935078} + - component: {fileID: 993935077} + m_Layer: 0 + m_Name: RightCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &993935077 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993935076} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + 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 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!4 &993935078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993935076} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20.22, y: 7.17, z: -10.077069} + 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!1 &1092777149 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, @@ -951,6 +1109,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 39adebf01b966e048b9a111f5b090ef6, type: 3} m_Name: m_EditorClassIdentifier: + speed: 2 + leftBoundary: -5 + rightBoundary: 5 --- !u!1 &1101254690 GameObject: m_ObjectHideFlags: 0 @@ -2053,6 +2214,153 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1584568253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1584568254} + - component: {fileID: 1584568256} + - component: {fileID: 1584568255} + - component: {fileID: 1584568257} + m_Layer: 5 + m_Name: Health + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1584568254 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584568253} + 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: [] + m_Father: {fileID: 365590511} + 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: -226, y: 129} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1584568255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584568253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Health:3 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1584568256 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584568253} + m_CullTransparentMesh: 1 +--- !u!114 &1584568257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584568253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e005ec1c123e9ee49abe5ef27650fd37, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1751292479 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, @@ -2153,6 +2461,7 @@ MonoBehaviour: speed: 5 jump: 2 scoreController: {fileID: 625562598} + healthController: {fileID: 1584568257} --- !u!4 &1751292492 stripped Transform: m_CorrespondingSourceObject: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, @@ -2662,17 +2971,17 @@ PrefabInstance: - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, type: 3} propertyPath: m_LocalPosition.x - value: 15.2198 + value: 17.55 objectReference: {fileID: 0} - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, type: 3} propertyPath: m_LocalPosition.y - value: 6.68 + value: 6.72 objectReference: {fileID: 0} - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, type: 3} propertyPath: m_LocalPosition.z - value: -6.09 + value: -3.62 objectReference: {fileID: 0} - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, type: 3} @@ -2737,3 +3046,5 @@ SceneRoots: - {fileID: 1862444160} - {fileID: 365590511} - {fileID: 1329991810} + - {fileID: 700601725} + - {fileID: 993935078} diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 59573aec43..b9830c2738 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Game + m_Title: Scene m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 76 + controlID: 69 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 77 + controlID: 70 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -198,7 +198,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 47 + controlID: 71 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -236,7 +236,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -245,15 +245,15 @@ MonoBehaviour: y: 0 width: 687.2 height: 450.4 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 17} - {fileID: 18} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -264,7 +264,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -273,15 +273,15 @@ MonoBehaviour: y: 450.4 width: 1172.8 height: 272.4 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 19} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 20} m_Panes: - {fileID: 19} - {fileID: 20} - {fileID: 13} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -345,7 +345,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 23654 + m_LastSelectedObjectID: -12576 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -750,9 +750,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 11.488715, y: 3.8280876, z: -10.030642} + m_Target: {x: 9.194726, y: 4.1043186, z: -10.077069} speed: 2 - m_Value: {x: 11.488715, y: 3.8280876, z: -10.030642} + m_Value: {x: 9.194726, y: 4.1043186, z: -10.077069} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -774,7 +774,7 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -782,15 +782,15 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -800,11 +800,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0, y: 0, z: -0, w: -1} + m_Value: {x: 0.000000046813376, y: 0, z: 0, w: 0.99999994} m_Size: - m_Target: 5.117203 + m_Target: 9.760913 speed: 2 - m_Value: 5.117203 + m_Value: 9.760913 m_Ortho: m_Target: 1 speed: 2 @@ -822,8 +822,8 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - m_LastSceneViewOrtho: 0 + m_LastSceneViewRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LastSceneViewOrtho: 1 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 @@ -867,9 +867,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 28fbffffcc5c0000 + m_SelectedIDs: e0ceffff + m_LastClickedID: -12576 + m_ExpandedIDs: 28fbffff625c0000e05c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -961,7 +961,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1177,9 +1177,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3c5e0000 - m_LastClickedID: 24124 - m_ExpandedIDs: 00000000b45500005c570000265e0000285e00002a5e00002c5e00002e5e0000305e0000325e0000345e0000365e0000385e00003a5e00003c5e00003e5e0000405e0000425e0000445e0000465e0000485e00004a5e00004c5e0000545e00007e5e000000ca9a3b + m_SelectedIDs: 645e0000 + m_LastClickedID: 24164 + m_ExpandedIDs: 00000000b65500005e5700004e5e0000505e0000525e0000545e0000565e0000585e00005a5e00005c5e00005e5e0000605e0000625e0000645e0000665e0000685e00006a5e00006c5e00006e5e0000705e0000725e0000745e0000765e00007e5e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1207,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000b4550000265e0000285e00002a5e00002c5e00002e5e0000305e0000325e0000345e0000365e0000385e00003a5e00003c5e00003e5e0000405e0000425e0000445e0000465e0000485e00004a5e00004c5e0000 + m_ExpandedIDs: 00000000b65500005e5700004e5e0000505e0000525e0000545e0000565e0000585e00005a5e00005c5e00005e5e0000605e0000625e0000645e0000665e0000685e00006a5e00006c5e00006e5e0000705e0000725e0000745e0000765e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1232,8 +1232,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: d2060000 + m_LastClickedInstanceID: 1746 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300005c5c0000605c0000a65e0000 m_RenameOverlay: From e7adbea2d8ac140a1a77310f7fc7a6c67da33e2f Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Thu, 17 Oct 2024 14:45:41 +0530 Subject: [PATCH 14/18] Created Start and Quit functions --- Assets/Animate/DeathScript.cs | 5 + Assets/Animate/EnemyController.cs | 46 +- Assets/Animate/GameOverController.cs | 34 + Assets/Animate/GameOverController.cs.meta | 11 + Assets/Animate/HealthController.cs | 5 +- Assets/Animate/Lobby.unity | 873 ++++++++++++++++++++++ Assets/Animate/Lobby.unity.meta | 7 + Assets/Animate/LobbyController.cs | 21 + Assets/Animate/LobbyController.cs.meta | 11 + Assets/Animate/PlayerController.cs | 2 + Assets/Animate/Scene.unity | 446 ++++++++--- ProjectSettings/EditorBuildSettings.asset | 3 + UserSettings/EditorUserSettings.asset | 3 + UserSettings/Layouts/default-2022.dwlt | 162 ++-- 14 files changed, 1385 insertions(+), 244 deletions(-) create mode 100644 Assets/Animate/GameOverController.cs create mode 100644 Assets/Animate/GameOverController.cs.meta create mode 100644 Assets/Animate/Lobby.unity create mode 100644 Assets/Animate/Lobby.unity.meta create mode 100644 Assets/Animate/LobbyController.cs create mode 100644 Assets/Animate/LobbyController.cs.meta diff --git a/Assets/Animate/DeathScript.cs b/Assets/Animate/DeathScript.cs index 26c961fab3..f887ef7d7d 100644 --- a/Assets/Animate/DeathScript.cs +++ b/Assets/Animate/DeathScript.cs @@ -5,13 +5,18 @@ public class DeathScript : MonoBehaviour { + + public GameOverController gameOverController; private void OnTriggerEnter2D(Collider2D collision) { // Check if the object entering the trigger is the player if (collision.gameObject.GetComponent() != null) { + + // Reload the current scene when the player falls into the death zone SceneManager.LoadScene(SceneManager.GetActiveScene().name); + Debug.Log("Respawned player"); } } diff --git a/Assets/Animate/EnemyController.cs b/Assets/Animate/EnemyController.cs index 1d345dc752..5564fc6886 100644 --- a/Assets/Animate/EnemyController.cs +++ b/Assets/Animate/EnemyController.cs @@ -4,41 +4,7 @@ public class EnemyController : MonoBehaviour { - public float speed = 2f; // Speed of the enemy - public float leftBoundary = -5f; // Left boundary - public float rightBoundary = 5f; // Right boundary - - private bool movingRight = true; // Direction flag - - private void Update() - { - MoveEnemy(); - } - - private void MoveEnemy() - { - // Move the enemy - if (movingRight) - { - transform.Translate(Vector2.right * speed * Time.deltaTime); - - // Check if the enemy has reached the right boundary - if (transform.position.x >= rightBoundary) - { - movingRight = false; // Change direction to left - } - } - else - { - transform.Translate(Vector2.left * speed * Time.deltaTime); - - // Check if the enemy has reached the left boundary - if (transform.position.x <= leftBoundary) - { - movingRight = true; // Change direction to right - } - } - } + private void OnCollisionEnter2D(Collision2D collision) @@ -52,13 +18,5 @@ private void OnCollisionEnter2D(Collision2D collision) } - private void OnTriggerEnter2D(Collider2D other) - { - // Check if the enemy hit the boundary - if (other.CompareTag("Boundary")) - { - // Reverse direction if hitting a boundary - movingRight = !movingRight; - } - } + } diff --git a/Assets/Animate/GameOverController.cs b/Assets/Animate/GameOverController.cs new file mode 100644 index 0000000000..a2fe097c51 --- /dev/null +++ b/Assets/Animate/GameOverController.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +public class GameOverController : MonoBehaviour +{ + public GameObject gameOverUI; // The Game Over UI panel + public Button restartButton; // Reference to the restart button + public TextMeshProUGUI scoreText; // Optional: display score on Game Over screen + + private void Start() + { + // Ensure the Game Over UI is not visible at the start + gameOverUI.SetActive(false); + + // Add listener to the restart button + restartButton.onClick.AddListener(RestartGame); + } + + public void ShowGameOver() + { + gameOverUI.SetActive(true); // Show Game Over UI + // Optionally display score here if you have a score system + // scoreText.text = "Score: " + score; + } + + private void RestartGame() + { + SceneManager.LoadScene(SceneManager.GetActiveScene().name); // Reload the current scene + } +} diff --git a/Assets/Animate/GameOverController.cs.meta b/Assets/Animate/GameOverController.cs.meta new file mode 100644 index 0000000000..48e9c0b1c1 --- /dev/null +++ b/Assets/Animate/GameOverController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3dad76fb4268f3d43bec5a5864dd2d47 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/HealthController.cs b/Assets/Animate/HealthController.cs index d1e7db6387..824debf8b6 100644 --- a/Assets/Animate/HealthController.cs +++ b/Assets/Animate/HealthController.cs @@ -10,6 +10,8 @@ public class HealthController : MonoBehaviour private int maxHealth = 3; private int currentHealth; + public GameOverController gameOverController; + private void Awake() { healthText = GetComponent(); // Get the TextMeshProUGUI component @@ -39,7 +41,8 @@ public void TakeDamage(int damage) private void PlayerDies() { Debug.Log("Player died! Reloading scene..."); - SceneManager.LoadScene(SceneManager.GetActiveScene().name); // Reload the current scene when the player dies + gameOverController.ShowGameOver(); // Show the Game Over UI + gameObject.SetActive(false); } private void RefreshUI() diff --git a/Assets/Animate/Lobby.unity b/Assets/Animate/Lobby.unity new file mode 100644 index 0000000000..43929898c9 --- /dev/null +++ b/Assets/Animate/Lobby.unity @@ -0,0 +1,873 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &613148911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 613148912} + - component: {fileID: 613148914} + - component: {fileID: 613148913} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &613148912 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 613148911} + 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: [] + m_Father: {fileID: 633506575} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &613148913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 613148911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Quit +--- !u!222 &613148914 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 613148911} + m_CullTransparentMesh: 1 +--- !u!1 &633506574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 633506575} + - component: {fileID: 633506578} + - component: {fileID: 633506577} + - component: {fileID: 633506576} + m_Layer: 5 + m_Name: Quit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &633506575 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633506574} + 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: 613148912} + m_Father: {fileID: 1339842198} + 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: -5, y: -37} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &633506576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633506574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 633506577} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1339842194} + m_TargetAssemblyTypeName: LobbyController, Assembly-CSharp + m_MethodName: QuitGame + 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 +--- !u!114 &633506577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633506574} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &633506578 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633506574} + m_CullTransparentMesh: 1 +--- !u!1 &825373415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 825373416} + - component: {fileID: 825373418} + - component: {fileID: 825373417} + m_Layer: 5 + m_Name: GameTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &825373416 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 825373415} + 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: [] + m_Father: {fileID: 1339842198} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 26, y: -44} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &825373417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 825373415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Welcome to Platformer 2D + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -133.99237, y: 0, z: -136.15512, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &825373418 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 825373415} + m_CullTransparentMesh: 1 +--- !u!1 &1250256840 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1250256841} + - component: {fileID: 1250256844} + - component: {fileID: 1250256843} + - component: {fileID: 1250256842} + m_Layer: 5 + m_Name: Play + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1250256841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1250256840} + 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: 1728087408} + m_Father: {fileID: 1339842198} + 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: -6, y: 49} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1250256842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1250256840} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1250256843} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1339842194} + m_TargetAssemblyTypeName: LobbyController, Assembly-CSharp + m_MethodName: PlayGame + 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 +--- !u!114 &1250256843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1250256840} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1250256844 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1250256840} + m_CullTransparentMesh: 1 +--- !u!1 &1339842193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1339842198} + - component: {fileID: 1339842197} + - component: {fileID: 1339842196} + - component: {fileID: 1339842195} + - component: {fileID: 1339842194} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1339842194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339842193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d1e6b038eeddc04bbfc245d6cbeac8b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1339842195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339842193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1339842196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339842193} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1339842197 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339842193} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1339842198 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339842193} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 825373416} + - {fileID: 1250256841} + - {fileID: 633506575} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1728087407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1728087408} + - component: {fileID: 1728087410} + - component: {fileID: 1728087409} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1728087408 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728087407} + 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: [] + m_Father: {fileID: 1250256841} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1728087409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728087407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Play +--- !u!222 &1728087410 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728087407} + m_CullTransparentMesh: 1 +--- !u!1 &1989579475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1989579478} + - component: {fileID: 1989579477} + - component: {fileID: 1989579476} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1989579476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1989579475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1989579477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1989579475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1989579478 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1989579475} + 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: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1339842198} + - {fileID: 1989579478} diff --git a/Assets/Animate/Lobby.unity.meta b/Assets/Animate/Lobby.unity.meta new file mode 100644 index 0000000000..8b0f87d695 --- /dev/null +++ b/Assets/Animate/Lobby.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d8e60a133335271469862d522f56d014 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/LobbyController.cs b/Assets/Animate/LobbyController.cs new file mode 100644 index 0000000000..6ebea97b12 --- /dev/null +++ b/Assets/Animate/LobbyController.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class LobbyController : MonoBehaviour +{ + // This method will be called when the Play button is clicked + public void PlayGame() + { + // Load Scene 1 (index 1 in the Build Settings) + SceneManager.LoadScene(1); + } + + // This method will be called when the Quit button is clicked + public void QuitGame() + { + // Load Scene 2 (index 2 in the Build Settings) + SceneManager.LoadScene(2); + } +} diff --git a/Assets/Animate/LobbyController.cs.meta b/Assets/Animate/LobbyController.cs.meta new file mode 100644 index 0000000000..ae2ceb6870 --- /dev/null +++ b/Assets/Animate/LobbyController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2d1e6b038eeddc04bbfc245d6cbeac8b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/PlayerController.cs b/Assets/Animate/PlayerController.cs index e786feb648..1bd9eb3001 100644 --- a/Assets/Animate/PlayerController.cs +++ b/Assets/Animate/PlayerController.cs @@ -16,6 +16,8 @@ public class PlayerController : MonoBehaviour public ScoreController scoreController; public HealthController healthController; + public GameOverController gameOverController; + //Take a reference from inspector. private void Awake() diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Scene.unity index 446be0a009..cfabe00a8e 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Scene.unity @@ -242,6 +242,7 @@ RectTransform: m_Children: - {fileID: 625562595} - {fileID: 1584568254} + - {fileID: 1314853573} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -279,6 +280,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ce33d66041d8894cb5071c618ac76c0, type: 3} m_Name: m_EditorClassIdentifier: + gameOverController: {fileID: 1314853576} --- !u!61 &410899625 BoxCollider2D: m_ObjectHideFlags: 0 @@ -817,7 +819,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &700601723 +--- !u!1 &670264994 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -825,75 +827,119 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 700601725} - - component: {fileID: 700601724} - m_Layer: 0 - m_Name: LeftCollider + - component: {fileID: 670264995} + - component: {fileID: 670264998} + - component: {fileID: 670264997} + - component: {fileID: 670264996} + m_Layer: 5 + m_Name: ButtonRestart m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!61 &700601724 -BoxCollider2D: +--- !u!224 &670264995 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 700601723} + m_GameObject: {fileID: 670264994} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -66} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1060922157} + m_Father: {fileID: 1314853573} + 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: 12.4, y: -103.3} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &670264996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670264994} m_Enabled: 1 - m_Density: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 670264997} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &670264997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670264994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: 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_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - 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 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!4 &700601725 -Transform: + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &670264998 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 700601723} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 14.91, y: 7.13, z: -10.077069} - 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} + m_GameObject: {fileID: 670264994} + m_CullTransparentMesh: 1 --- !u!1001 &736344553 PrefabInstance: m_ObjectHideFlags: 0 @@ -1005,10 +1051,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 39adebf01b966e048b9a111f5b090ef6, type: 3} m_Name: m_EditorClassIdentifier: - speed: 2 - leftBoundary: -5 - rightBoundary: 5 ---- !u!1 &993935076 +--- !u!1 &1060922156 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1016,75 +1059,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 993935078} - - component: {fileID: 993935077} - m_Layer: 0 - m_Name: RightCollider + - component: {fileID: 1060922157} + - component: {fileID: 1060922159} + - component: {fileID: 1060922158} + m_Layer: 5 + m_Name: Text (Legacy) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!61 &993935077 -BoxCollider2D: +--- !u!224 &1060922157 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1060922156} + 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: [] + m_Father: {fileID: 670264995} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1060922158 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 993935076} + m_GameObject: {fileID: 1060922156} m_Enabled: 1 - m_Density: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: 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_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - 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 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!4 &993935078 -Transform: + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Restart ' +--- !u!222 &1060922159 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 993935076} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 20.22, y: 7.17, z: -10.077069} - 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} + m_GameObject: {fileID: 1060922156} + m_CullTransparentMesh: 1 --- !u!1 &1092777149 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, @@ -1109,9 +1154,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 39adebf01b966e048b9a111f5b090ef6, type: 3} m_Name: m_EditorClassIdentifier: - speed: 2 - leftBoundary: -5 - rightBoundary: 5 --- !u!1 &1101254690 GameObject: m_ObjectHideFlags: 0 @@ -2035,6 +2077,99 @@ Transform: m_Children: [] m_Father: {fileID: 1751292492} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1314853572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1314853573} + - component: {fileID: 1314853575} + - component: {fileID: 1314853574} + - component: {fileID: 1314853576} + m_Layer: 5 + m_Name: GameOver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1314853573 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314853572} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 47} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 670264995} + - {fileID: 1336875025} + m_Father: {fileID: 365590511} + 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: 105} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1314853574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314853572} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: be668f8b2ae220b4ba6ed120e2613f06, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1314853575 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314853572} + m_CullTransparentMesh: 1 +--- !u!114 &1314853576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314853572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dad76fb4268f3d43bec5a5864dd2d47, type: 3} + m_Name: + m_EditorClassIdentifier: + gameOverUI: {fileID: 1314853572} + restartButton: {fileID: 670264996} + scoreText: {fileID: 625562596} --- !u!1 &1329991807 GameObject: m_ObjectHideFlags: 0 @@ -2103,6 +2238,81 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1336875024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1336875025} + - component: {fileID: 1336875027} + - component: {fileID: 1336875026} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1336875025 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336875024} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 189.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1314853573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.075, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -3.399994, y: -38.199997} + m_SizeDelta: {x: -3.7164917, y: 120.04581} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1336875026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336875024} + 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: 0.97735846, g: 0.97735846, b: 0.97735846, a: 0.25490198} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1336875027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336875024} + m_CullTransparentMesh: 1 --- !u!1001 &1395568090 PrefabInstance: m_ObjectHideFlags: 0 @@ -2361,6 +2571,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e005ec1c123e9ee49abe5ef27650fd37, type: 3} m_Name: m_EditorClassIdentifier: + gameOverController: {fileID: 1314853576} --- !u!1 &1751292479 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, @@ -2462,6 +2673,7 @@ MonoBehaviour: jump: 2 scoreController: {fileID: 625562598} healthController: {fileID: 1584568257} + gameOverController: {fileID: 1314853576} --- !u!4 &1751292492 stripped Transform: m_CorrespondingSourceObject: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, @@ -3046,5 +3258,3 @@ SceneRoots: - {fileID: 1862444160} - {fileID: 365590511} - {fileID: 1329991810} - - {fileID: 700601725} - - {fileID: 993935078} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d7c2d7a0e8..84edee4465 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,6 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/Animate/Lobby.unity + guid: d8e60a133335271469862d522f56d014 - enabled: 1 path: Assets/Animate/Scene.unity guid: cacf87822d5d7cd4598de741ac3398e5 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index acf2f14436..73be7c56fe 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,6 +9,9 @@ EditorUserSettings: value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e flags: 0 RecentlyUsedSceneGuid-1: + value: 07095150555458085e5d5f7742740e44404e407c7e2c73627f2f4865e6b0656c + flags: 0 + RecentlyUsedSceneGuid-2: value: 005057005d0251095f0a592647205b44434e402e297f72612c2a4e60bbb8316d flags: 0 vcSharedLogLevel: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index b9830c2738..fa9417e257 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Scene + m_Title: Game m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,12 +39,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 992 + x: 1072.8 y: 0 - width: 180.80005 - height: 450.4 - m_MinSize: {x: 240, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 100 + height: 454.4 + m_MinSize: {x: 242, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 69 + controlID: 45 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 70 + controlID: 46 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -194,11 +194,11 @@ MonoBehaviour: x: 0 y: 0 width: 1172.8 - height: 450.4 + height: 454.4 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 71 + controlID: 47 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -218,7 +218,7 @@ MonoBehaviour: x: 0 y: 0 width: 304.8 - height: 450.4 + height: 454.4 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} @@ -236,24 +236,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 304.8 y: 0 - width: 687.2 - height: 450.4 + width: 768.00006 + height: 454.4 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 15} - {fileID: 17} - {fileID: 18} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -264,24 +264,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 450.4 + y: 454.4 width: 1172.8 - height: 272.4 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 20} + height: 268.4 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} - {fileID: 20} - {fileID: 13} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -345,7 +345,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -12576 + m_LastSelectedObjectID: -10942 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -366,10 +366,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 992 + x: 1072.8 y: 73.6 - width: 178.80005 - height: 429.4 + width: 98 + height: 433.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -403,8 +403,8 @@ MonoBehaviour: serializedVersion: 2 x: 304.80002 y: 73.6 - width: 685.2 - height: 429.4 + width: 766.00006 + height: 433.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -745,14 +745,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 1 + m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 9.194726, y: 4.1043186, z: -10.077069} + m_Target: {x: 236.28178, y: 66.5588, z: -14.476279} speed: 2 - m_Value: {x: 9.194726, y: 4.1043186, z: -10.077069} + m_Value: {x: 236.28178, y: 66.5588, z: -14.476279} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -774,13 +774,13 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} yGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} @@ -788,9 +788,9 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -798,17 +798,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} speed: 2 - m_Value: {x: 0.000000046813376, y: 0, z: 0, w: 0.99999994} + m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_Size: - m_Target: 9.760913 + m_Target: 341.13303 speed: 2 - m_Value: 9.760913 + m_Value: 341.13303 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -822,8 +822,8 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LastSceneViewOrtho: 1 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 @@ -853,7 +853,7 @@ MonoBehaviour: x: 0 y: 73.6 width: 303.8 - height: 429.4 + height: 433.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -867,9 +867,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e0ceffff - m_LastClickedID: -12576 - m_ExpandedIDs: 28fbffff625c0000e05c0000 + m_SelectedIDs: ba680000 + m_LastClickedID: 0 + m_ExpandedIDs: ccb9ffffb0bcffff40c0ffff96c0ffff18c5ffff2cd3ffff9ad3ffff42d5ffffa2d5ffff28fbffff665c0000d25c00004e7c0000ba7c0000827e00001a7f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -916,8 +916,8 @@ MonoBehaviour: serializedVersion: 2 x: 304.80002 y: 73.6 - width: 685.2 - height: 429.4 + width: 766.00006 + height: 433.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -934,7 +934,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 685.2, y: 408.4} + m_TargetSize: {x: 766.00006, y: 412.4} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -949,19 +949,19 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -274.08002 - m_HBaseRangeMax: 274.08002 - m_VBaseRangeMin: -163.36 - m_VBaseRangeMax: 163.36 + m_HBaseRangeMin: -306.40002 + m_HBaseRangeMax: 306.40002 + m_VBaseRangeMin: -164.96 + m_VBaseRangeMax: 164.96 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 m_HSlider: 0 - m_VSlider: 0 + m_VSlider: 1 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -970,25 +970,25 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 685.2 - height: 408.4 + width: 766.00006 + height: 412.4 m_Scale: {x: 1.25, y: 1.25} - m_Translation: {x: 342.60004, y: 204.2} + m_Translation: {x: 383.00003, y: 206.19998} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -274.08002 - y: -163.36 - width: 548.16003 - height: 326.72 + x: -306.40002 + y: -164.95999 + width: 612.80005 + height: 329.91998 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 856.5, y: 536.75} + m_LastWindowPixelSize: {x: 957.50006, y: 541.75} m_ClearInEditMode: 1 - m_NoCameraWarning: 1 + m_NoCameraWarning: 0 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} @@ -1013,10 +1013,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 388 + x: 304.80002 y: 73.6 - width: 602 - height: 428.6 + width: 685.2 + height: 429.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1138,9 +1138,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 524 + y: 528 width: 1171.8 - height: 251.4 + height: 247.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1176,10 +1176,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 645e0000 - m_LastClickedID: 24164 - m_ExpandedIDs: 00000000b65500005e5700004e5e0000505e0000525e0000545e0000565e0000585e00005a5e00005c5e00005e5e0000605e0000625e0000645e0000665e0000685e00006a5e00006c5e00006e5e0000705e0000725e0000745e0000765e00007e5e000000ca9a3b + scrollPos: {x: 0, y: 848.6} + m_SelectedIDs: 925e0000 + m_LastClickedID: 24210 + m_ExpandedIDs: 00000000ba550000625700007c5e00007e5e0000805e0000825e0000845e0000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e00009478000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1207,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000b65500005e5700004e5e0000505e0000525e0000545e0000565e0000585e00005a5e00005c5e00005e5e0000605e0000625e0000645e0000665e0000685e00006a5e00006c5e00006e5e0000705e0000725e0000745e0000765e0000 + m_ExpandedIDs: 00000000ba550000625700007c5e00007e5e0000805e0000825e0000845e0000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1232,8 +1232,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: d2060000 - m_LastClickedInstanceID: 1746 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300005c5c0000605c0000a65e0000 m_RenameOverlay: @@ -1259,7 +1259,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 78.600006} m_GridSize: 57 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 From 0597a014c051f6f17a8e71101079309b84706d67 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Fri, 18 Oct 2024 11:28:00 +0530 Subject: [PATCH 15/18] Created Lobby setup Setup a Lobby Scene. Add button sprites to make buttons beautiful. Make a 'Play' button to enable the 'Level Selection' pop-up. Make separate buttons in the pop-up for loading each level. Make a 'Quit' button to quit the application . --- Assets/Animate/GameOverController.cs | 12 +- Assets/Animate/{Scene.unity => Level 2.unity} | 149 +- Assets/Animate/Level 2.unity.meta | 7 + Assets/Animate/Level1.unity | 3601 +++++++++++++++++ .../{Scene.unity.meta => Level1.unity.meta} | 0 Assets/Animate/LevelButtonController.cs | 19 + Assets/Animate/LevelButtonController.cs.meta | 11 + Assets/Animate/LevelSelectionController.cs | 20 + .../Animate/LevelSelectionController.cs.meta | 11 + Assets/Animate/Lobby.unity | 788 +++- Assets/Animate/LobbyController.cs | 4 +- ProjectSettings/EditorBuildSettings.asset | 5 +- UserSettings/EditorUserSettings.asset | 5 +- UserSettings/Layouts/default-2022.dwlt | 52 +- 14 files changed, 4644 insertions(+), 40 deletions(-) rename Assets/Animate/{Scene.unity => Level 2.unity} (95%) create mode 100644 Assets/Animate/Level 2.unity.meta create mode 100644 Assets/Animate/Level1.unity rename Assets/Animate/{Scene.unity.meta => Level1.unity.meta} (100%) create mode 100644 Assets/Animate/LevelButtonController.cs create mode 100644 Assets/Animate/LevelButtonController.cs.meta create mode 100644 Assets/Animate/LevelSelectionController.cs create mode 100644 Assets/Animate/LevelSelectionController.cs.meta diff --git a/Assets/Animate/GameOverController.cs b/Assets/Animate/GameOverController.cs index a2fe097c51..e70ec1b5c4 100644 --- a/Assets/Animate/GameOverController.cs +++ b/Assets/Animate/GameOverController.cs @@ -9,6 +9,7 @@ public class GameOverController : MonoBehaviour { public GameObject gameOverUI; // The Game Over UI panel public Button restartButton; // Reference to the restart button + public Button lobby; public TextMeshProUGUI scoreText; // Optional: display score on Game Over screen private void Start() @@ -18,17 +19,24 @@ private void Start() // Add listener to the restart button restartButton.onClick.AddListener(RestartGame); + lobby.onClick.AddListener(Lobby); } public void ShowGameOver() { gameOverUI.SetActive(true); // Show Game Over UI - // Optionally display score here if you have a score system - // scoreText.text = "Score: " + score; + } private void RestartGame() { SceneManager.LoadScene(SceneManager.GetActiveScene().name); // Reload the current scene } + + private void Lobby() + { + + SceneManager.LoadScene(0, LoadSceneMode.Single); //reload lobby + + } } diff --git a/Assets/Animate/Scene.unity b/Assets/Animate/Level 2.unity similarity index 95% rename from Assets/Animate/Scene.unity rename to Assets/Animate/Level 2.unity index cfabe00a8e..4c9e8c49fd 100644 --- a/Assets/Animate/Scene.unity +++ b/Assets/Animate/Level 2.unity @@ -243,6 +243,7 @@ RectTransform: - {fileID: 625562595} - {fileID: 1584568254} - {fileID: 1314853573} + - {fileID: 2122436363} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -596,7 +597,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -198.2, y: -29} + m_AnchoredPosition: {x: -281, y: -29} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &625562596 @@ -734,12 +735,12 @@ PrefabInstance: - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} propertyPath: m_LocalPosition.x - value: 9.83 + value: 6.01 objectReference: {fileID: 0} - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} propertyPath: m_LocalPosition.y - value: 3.2 + value: 3.03 objectReference: {fileID: 0} - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} @@ -2459,7 +2460,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: -226, y: 129} + m_AnchoredPosition: {x: -307, y: 132} m_SizeDelta: {x: 150, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1584568255 @@ -2986,6 +2987,142 @@ Transform: - {fileID: 738745606} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2122436362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2122436363} + - component: {fileID: 2122436365} + - component: {fileID: 2122436364} + m_Layer: 5 + m_Name: Level 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2122436363 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122436362} + 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: [] + m_Father: {fileID: 365590511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 327, y: -29} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2122436364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122436362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Level 2 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2122436365 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122436362} + m_CullTransparentMesh: 1 --- !u!1001 &3967004074362709419 PrefabInstance: m_ObjectHideFlags: 0 @@ -3101,12 +3238,12 @@ PrefabInstance: - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} propertyPath: m_LocalPosition.x - value: 2.98 + value: -0.71 objectReference: {fileID: 0} - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} propertyPath: m_LocalPosition.y - value: 0.39 + value: 3.43 objectReference: {fileID: 0} - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} diff --git a/Assets/Animate/Level 2.unity.meta b/Assets/Animate/Level 2.unity.meta new file mode 100644 index 0000000000..ffad5bca36 --- /dev/null +++ b/Assets/Animate/Level 2.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 92b41286ed7357445a14bc0df7a4c702 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Level1.unity b/Assets/Animate/Level1.unity new file mode 100644 index 0000000000..7369460154 --- /dev/null +++ b/Assets/Animate/Level1.unity @@ -0,0 +1,3601 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &250651287 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 6947531162802009278} + m_PrefabAsset: {fileID: 0} +--- !u!4 &250651291 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 6947531162802009278} + m_PrefabAsset: {fileID: 0} +--- !u!114 &250651292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 250651287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &365590507 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 365590511} + - component: {fileID: 365590510} + - component: {fileID: 365590509} + - component: {fileID: 365590508} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &365590508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365590507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &365590509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365590507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &365590510 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365590507} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &365590511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365590507} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 625562595} + - {fileID: 1584568254} + - {fileID: 1314853573} + - {fileID: 2122436363} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &410899623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 410899626} + - component: {fileID: 410899625} + - component: {fileID: 410899624} + m_Layer: 0 + m_Name: DeathScene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &410899624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410899623} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ce33d66041d8894cb5071c618ac76c0, type: 3} + m_Name: + m_EditorClassIdentifier: + gameOverController: {fileID: 1314853576} +--- !u!61 &410899625 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410899623} + m_Enabled: 1 + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + 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 + serializedVersion: 2 + m_Size: {x: 8, y: 3} + m_EdgeRadius: 0 +--- !u!4 &410899626 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 410899623} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.34, y: -6.04, z: -10.002488} + m_LocalScale: {x: 4.79, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1862444160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &475681475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 475681478} + - component: {fileID: 475681477} + - component: {fileID: 475681476} + m_Layer: 0 + m_Name: LevelComplete + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &475681476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475681475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a4d87f7f531eee49828b60c76b785bb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &475681477 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475681475} + m_Enabled: 1 + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + 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 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!4 &475681478 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475681475} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 20.59, y: 7.31, z: -9.987183} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1862444160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &558003131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 558003134} + - component: {fileID: 558003133} + - component: {fileID: 558003132} + m_Layer: 0 + m_Name: Platform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &558003132 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558003131} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.07955372} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 2, y: 2} + newSize: {x: 2, y: 2} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2, y: 1.8408926} + m_EdgeRadius: 0 +--- !u!212 &558003133 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558003131} + 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_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: 21300000, guid: aac9a30c9c349534990e2d84f22e7b28, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &558003134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558003131} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.1663, y: -2.11, z: 0} + m_LocalScale: {x: 6.489827, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &625562594 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 625562595} + - component: {fileID: 625562597} + - component: {fileID: 625562596} + - component: {fileID: 625562598} + m_Layer: 5 + m_Name: Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &625562595 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625562594} + 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: [] + m_Father: {fileID: 365590511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -281, y: -29} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &625562596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625562594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Score:0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 50.914642, w: 5.8187866} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &625562597 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625562594} + m_CullTransparentMesh: 1 +--- !u!114 &625562598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625562594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d69a2b42aff05241acd5e92c806d787, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &636899476 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Size.x + value: 0.6511822 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Offset.x + value: -0.027538061 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.x + value: 9.83 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.2 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.z + value: -9.15 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Name + value: Key (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + insertIndex: -1 + addedObject: {fileID: 636899479} + m_SourcePrefab: {fileID: 100100000, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} +--- !u!4 &636899477 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 636899476} + m_PrefabAsset: {fileID: 0} +--- !u!1 &636899478 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 636899476} + m_PrefabAsset: {fileID: 0} +--- !u!114 &636899479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636899478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &649036042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 649036043} + - component: {fileID: 649036046} + - component: {fileID: 649036045} + - component: {fileID: 649036044} + m_Layer: 5 + m_Name: Lobby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &649036043 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649036042} + 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: 694610221} + m_Father: {fileID: 1314853573} + 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: 173.1, y: -186.5} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &649036044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649036042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 649036045} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &649036045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649036042} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &649036046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649036042} + m_CullTransparentMesh: 1 +--- !u!1 &670264994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 670264995} + - component: {fileID: 670264998} + - component: {fileID: 670264997} + - component: {fileID: 670264996} + m_Layer: 5 + m_Name: ButtonRestart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &670264995 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670264994} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -66} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1060922157} + m_Father: {fileID: 1314853573} + 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: -140, y: -184} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &670264996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670264994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 670264997} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &670264997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670264994} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &670264998 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 670264994} + m_CullTransparentMesh: 1 +--- !u!1 &694610220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 694610221} + - component: {fileID: 694610223} + - component: {fileID: 694610222} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &694610221 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 694610220} + 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: [] + m_Father: {fileID: 649036043} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -2, y: -9} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &694610222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 694610220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Lobby + +' +--- !u!222 &694610223 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 694610220} + m_CullTransparentMesh: 1 +--- !u!1001 &736344553 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalScale.x + value: 1.0061 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.x + value: 12.72 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.59 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.z + value: -5.39 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770629241357128503, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_Name + value: Enemy (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + insertIndex: -1 + addedObject: {fileID: 738745607} + m_SourcePrefab: {fileID: 100100000, guid: 65fc1650608efec44b1e592b339f3fbd, type: 3} +--- !u!1 &738745605 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + m_PrefabInstance: {fileID: 736344553} + m_PrefabAsset: {fileID: 0} +--- !u!4 &738745606 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + m_PrefabInstance: {fileID: 736344553} + m_PrefabAsset: {fileID: 0} +--- !u!114 &738745607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 738745605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39adebf01b966e048b9a111f5b090ef6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1060922156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1060922157} + - component: {fileID: 1060922159} + - component: {fileID: 1060922158} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1060922157 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1060922156} + 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: [] + m_Father: {fileID: 670264995} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1060922158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1060922156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Restart ' +--- !u!222 &1060922159 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1060922156} + m_CullTransparentMesh: 1 +--- !u!1 &1092777149 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + m_PrefabInstance: {fileID: 8292547381967525297} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1092777151 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + m_PrefabInstance: {fileID: 8292547381967525297} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1092777154 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092777149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39adebf01b966e048b9a111f5b090ef6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1101254690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1101254692} + - component: {fileID: 1101254691} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1101254691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101254690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d22f7cd5a7e61f4993e40420e145043, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1101254692 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101254690} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 16.434763, y: 7.0660567, z: -9.987183} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1862444160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1245773821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1245773822} + - component: {fileID: 1245773824} + - component: {fileID: 1245773823} + - component: {fileID: 1245773825} + m_Layer: 0 + m_Name: GroundTileMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1245773822 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245773821} + 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: [] + m_Father: {fileID: 1862444160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1245773823 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245773821} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1245773824 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245773821} + m_Enabled: 1 + m_Tiles: + - first: {x: -2, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -14, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -13, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -12, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -11, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -10, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -9, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -9, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 10, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 11, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 12, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -5, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 13, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 15, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 17, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 18, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 19, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 20, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 21, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 22, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 23, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 24, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 10, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 11, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 13, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 13, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 14, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 14, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 15, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 15, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 14 + m_Data: {fileID: 11400000, guid: 69361ffd63f17044f88038ae4abc1936, type: 2} + - m_RefCount: 39 + m_Data: {fileID: 11400000, guid: 157bdf764da51a94892dfc1201d04da0, type: 2} + - m_RefCount: 5 + m_Data: {fileID: 11400000, guid: 4dd8162b80d03fe4c96efbdec81132e2, type: 2} + m_TileSpriteArray: + - m_RefCount: 14 + m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + - m_RefCount: 39 + m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} + - m_RefCount: 5 + m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + m_TileMatrixArray: + - m_RefCount: 1 + m_Data: + e00: -1 + e01: 0 + e02: -0.00000008742278 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0.00000008742278 + e21: 0 + e22: -1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - m_RefCount: 57 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 58 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: -14, y: -3, z: 0} + m_Size: {x: 41, y: 19, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!19719996 &1245773825 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245773821} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0 + m_UseDelaunayMesh: 0 +--- !u!1 &1260965266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1260965269} + - component: {fileID: 1260965268} + - component: {fileID: 1260965267} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1260965267 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260965266} + m_Enabled: 1 +--- !u!20 &1260965268 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260965266} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1260965269 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260965266} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.06, y: 1.19, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1751292492} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1314853572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1314853573} + - component: {fileID: 1314853575} + - component: {fileID: 1314853574} + - component: {fileID: 1314853576} + m_Layer: 5 + m_Name: GameOver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1314853573 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314853572} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 47} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 670264995} + - {fileID: 1336875025} + - {fileID: 649036043} + m_Father: {fileID: 365590511} + 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: 105} + m_SizeDelta: {x: 600, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1314853574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314853572} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: be668f8b2ae220b4ba6ed120e2613f06, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1314853575 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314853572} + m_CullTransparentMesh: 1 +--- !u!114 &1314853576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314853572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3dad76fb4268f3d43bec5a5864dd2d47, type: 3} + m_Name: + m_EditorClassIdentifier: + gameOverUI: {fileID: 1314853572} + restartButton: {fileID: 670264996} + lobby: {fileID: 649036044} + scoreText: {fileID: 625562596} +--- !u!1 &1329991807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1329991810} + - component: {fileID: 1329991809} + - component: {fileID: 1329991808} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1329991808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329991807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1329991809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329991807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1329991810 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329991807} + 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: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1336875024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1336875025} + - component: {fileID: 1336875027} + - component: {fileID: 1336875026} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1336875025 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336875024} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 189.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1314853573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.075, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -3.399994, y: -38.199997} + m_SizeDelta: {x: -3.7164917, y: 120.04581} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1336875026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336875024} + 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: 0.97735846, g: 0.97735846, b: 0.97735846, a: 0.25490198} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1336875027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336875024} + m_CullTransparentMesh: 1 +--- !u!1001 &1395568090 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Size.x + value: 0.6511822 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Offset.x + value: -0.027538061 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.x + value: 13.35 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.y + value: 7.06 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.z + value: -9.15 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Name + value: Key (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1395568093} + m_SourcePrefab: {fileID: 100100000, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} +--- !u!4 &1395568091 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 1395568090} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1395568092 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + m_PrefabInstance: {fileID: 1395568090} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1395568093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1395568092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7c3ab241ab687a46a05a0ed533682fd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1584568253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1584568254} + - component: {fileID: 1584568256} + - component: {fileID: 1584568255} + - component: {fileID: 1584568257} + m_Layer: 5 + m_Name: Health + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1584568254 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584568253} + 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: [] + m_Father: {fileID: 365590511} + 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: -307, y: 132} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1584568255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584568253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Health:3 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1584568256 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584568253} + m_CullTransparentMesh: 1 +--- !u!114 &1584568257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584568253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e005ec1c123e9ee49abe5ef27650fd37, type: 3} + m_Name: + m_EditorClassIdentifier: + gameOverController: {fileID: 1314853576} +--- !u!1 &1751292479 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + m_PrefabInstance: {fileID: 3967004074362709419} + m_PrefabAsset: {fileID: 0} +--- !u!50 &1751292483 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751292479} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 20 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!61 &1751292484 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751292479} + m_Enabled: 1 + 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_UsedByComposite: 0 + m_Offset: {x: 0.10452217, y: 1.1572213} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.42, y: 0.1} + oldSize: {x: 3.7534883, y: 2.8325582} + newSize: {x: 3.7534883, y: 2.8325582} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.9264215, y: 2.6536584} + m_EdgeRadius: 0 +--- !u!95 &1751292486 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 7403193974885477311, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + m_PrefabInstance: {fileID: 3967004074362709419} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1751292490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751292479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45f348235c5c0fa44b9fa36af9e72fd2, type: 3} + m_Name: + m_EditorClassIdentifier: + playerAnimator: {fileID: 1751292486} + speed: 5 + jump: 2 + scoreController: {fileID: 625562598} + healthController: {fileID: 1584568257} + gameOverController: {fileID: 1314853576} +--- !u!4 &1751292492 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + m_PrefabInstance: {fileID: 3967004074362709419} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1765070226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1765070227} + - component: {fileID: 1765070229} + - component: {fileID: 1765070228} + m_Layer: 0 + m_Name: FLoatingPlants + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1765070227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765070226} + 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: [] + m_Father: {fileID: 1862444160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1765070228 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765070226} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: -1 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0.79296875, y: 0.3935547, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1765070229 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765070226} + m_Enabled: 1 + m_Tiles: + - first: {x: -2, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 22, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -12, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: 12, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 15, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: 15, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: 19, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: caf2c1ff95e2b9841896050569b9c69f, type: 2} + - m_RefCount: 5 + m_Data: {fileID: 11400000, guid: 75fcebf21484c8340a3ffac20e2c2edf, type: 2} + - m_RefCount: 3 + m_Data: {fileID: 11400000, guid: 1350e70668a734346bbc88d381756717, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: 21300002, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + - m_RefCount: 5 + m_Data: {fileID: 21300000, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + - m_RefCount: 3 + m_Data: {fileID: 21300004, guid: cad6f8f282a98b04b9027eadbdb78451, type: 3} + m_TileMatrixArray: + - m_RefCount: 10 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 10 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 0.73333335} + m_Origin: {x: -12, y: 0, z: 0} + m_Size: {x: 35, y: 20, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!1 &1862444158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1862444160} + - component: {fileID: 1862444159} + m_Layer: 0 + m_Name: Levels + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!156049354 &1862444159 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1862444158} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!4 &1862444160 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1862444158} + 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: 1245773822} + - {fileID: 1765070227} + - {fileID: 475681478} + - {fileID: 1101254692} + - {fileID: 410899626} + - {fileID: 250651291} + - {fileID: 636899477} + - {fileID: 1395568091} + - {fileID: 1092777151} + - {fileID: 738745606} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2122436362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2122436363} + - component: {fileID: 2122436365} + - component: {fileID: 2122436364} + m_Layer: 5 + m_Name: Level 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2122436363 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122436362} + 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: [] + m_Father: {fileID: 365590511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 327, y: -29} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2122436364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122436362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Level 1 + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2122436365 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2122436362} + m_CullTransparentMesh: 1 +--- !u!1001 &3967004074362709419 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2279333339517451720, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.72 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.27 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2914634761343525767, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1260965269} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1751292483} + - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1751292484} + - targetCorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1751292490} + m_SourcePrefab: {fileID: 100100000, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, type: 3} +--- !u!1001 &6947531162802009278 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Size.x + value: 0.6511822 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Offset.x + value: -0.027538061 + objectReference: {fileID: 0} + - target: {fileID: 1914986659107461387, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.98 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.39 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalPosition.z + value: -9.15 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5983613665179582198, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + propertyPath: m_Name + value: Key + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7764031903348430351, guid: 4a4259d3cfd853f408f44e3440e48dca, + type: 3} + insertIndex: -1 + addedObject: {fileID: 250651292} + m_SourcePrefab: {fileID: 100100000, guid: 4a4259d3cfd853f408f44e3440e48dca, type: 3} +--- !u!1001 &8292547381967525297 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862444160} + m_Modifications: + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalScale.x + value: 1.0061 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.x + value: 17.55 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.y + value: 6.72 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalPosition.z + value: -3.62 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1461414725886577495, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770629241357128503, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + propertyPath: m_Name + value: Enemy + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6407788976565314730, guid: 65fc1650608efec44b1e592b339f3fbd, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1092777154} + m_SourcePrefab: {fileID: 100100000, guid: 65fc1650608efec44b1e592b339f3fbd, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 3967004074362709419} + - {fileID: 558003134} + - {fileID: 1862444160} + - {fileID: 365590511} + - {fileID: 1329991810} diff --git a/Assets/Animate/Scene.unity.meta b/Assets/Animate/Level1.unity.meta similarity index 100% rename from Assets/Animate/Scene.unity.meta rename to Assets/Animate/Level1.unity.meta diff --git a/Assets/Animate/LevelButtonController.cs b/Assets/Animate/LevelButtonController.cs new file mode 100644 index 0000000000..bf0176a715 --- /dev/null +++ b/Assets/Animate/LevelButtonController.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class LevelButtonController : MonoBehaviour +{ + // Method for loading Level 1 (build index 1) + public void LoadLevel1() + { + SceneManager.LoadScene(1); // Load Level 1 (build index 1) + } + + // Method for loading Level 2 (build index 2) + public void LoadLevel2() + { + SceneManager.LoadScene(2); // Load Level 2 (build index 2) + } +} diff --git a/Assets/Animate/LevelButtonController.cs.meta b/Assets/Animate/LevelButtonController.cs.meta new file mode 100644 index 0000000000..aabbfda18f --- /dev/null +++ b/Assets/Animate/LevelButtonController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3f088c32fa9f5e0428fc295887e8422d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/LevelSelectionController.cs b/Assets/Animate/LevelSelectionController.cs new file mode 100644 index 0000000000..873bdd1256 --- /dev/null +++ b/Assets/Animate/LevelSelectionController.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LevelSelection : MonoBehaviour +{ + public GameObject levelSelectionPopup; + + // Call this method when the "Choose Level" button is clicked + public void ShowLevelSelectionPopup() + { + levelSelectionPopup.SetActive(true); // Show the popup + } + + // Call this method when the level selection is cancelled or done + public void HideLevelSelectionPopup() + { + levelSelectionPopup.SetActive(false); // Hide the popup + } +} diff --git a/Assets/Animate/LevelSelectionController.cs.meta b/Assets/Animate/LevelSelectionController.cs.meta new file mode 100644 index 0000000000..c25c9a0d7c --- /dev/null +++ b/Assets/Animate/LevelSelectionController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 805a7dde08305a74ca1b04e6ddf02a44 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Lobby.unity b/Assets/Animate/Lobby.unity index 43929898c9..1fe7ea48bc 100644 --- a/Assets/Animate/Lobby.unity +++ b/Assets/Animate/Lobby.unity @@ -122,6 +122,401 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &60592737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 60592738} + - component: {fileID: 60592740} + - component: {fileID: 60592739} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &60592738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60592737} + 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: [] + m_Father: {fileID: 1388519354} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &60592739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60592737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Level 1 +--- !u!222 &60592740 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60592737} + m_CullTransparentMesh: 1 +--- !u!1 &128995388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 128995389} + - component: {fileID: 128995391} + - component: {fileID: 128995390} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &128995389 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 128995388} + 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: [] + m_Father: {fileID: 831906334} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &128995390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 128995388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Level 2 +--- !u!222 &128995391 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 128995388} + m_CullTransparentMesh: 1 +--- !u!1 &547204349 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 547204350} + - component: {fileID: 547204352} + - component: {fileID: 547204351} + - component: {fileID: 547204353} + m_Layer: 5 + m_Name: Level Selection Popup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &547204350 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547204349} + 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: 1388519354} + - {fileID: 831906334} + m_Father: {fileID: 1339842198} + 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: -3} + m_SizeDelta: {x: 500, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &547204351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547204349} + 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: 0.94716984, g: 0.8846209, b: 0.8846209, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &547204352 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547204349} + m_CullTransparentMesh: 1 +--- !u!114 &547204353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 547204349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f088c32fa9f5e0428fc295887e8422d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &587762991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 587762992} + - component: {fileID: 587762995} + - component: {fileID: 587762994} + - component: {fileID: 587762993} + - component: {fileID: 587762996} + m_Layer: 5 + m_Name: Level Selection + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &587762992 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587762991} + 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: 1896578646} + m_Father: {fileID: 1339842198} + 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: -5, y: -20} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &587762993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587762991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 587762994} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 587762996} + m_TargetAssemblyTypeName: LevelSelection, Assembly-CSharp + m_MethodName: ShowLevelSelectionPopup + 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 +--- !u!114 &587762994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587762991} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &587762995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587762991} + m_CullTransparentMesh: 1 +--- !u!114 &587762996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587762991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 805a7dde08305a74ca1b04e6ddf02a44, type: 3} + m_Name: + m_EditorClassIdentifier: + levelSelectionPopup: {fileID: 547204349} --- !u!1 &613148911 GameObject: m_ObjectHideFlags: 0 @@ -237,7 +632,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: -5, y: -37} + m_AnchoredPosition: {x: -4, y: -82} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &633506576 @@ -466,7 +861,140 @@ CanvasRenderer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 825373415} + m_GameObject: {fileID: 825373415} + m_CullTransparentMesh: 1 +--- !u!1 &831906333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 831906334} + - component: {fileID: 831906337} + - component: {fileID: 831906336} + - component: {fileID: 831906335} + m_Layer: 5 + m_Name: Level 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &831906334 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831906333} + 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: 128995389} + m_Father: {fileID: 547204350} + 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: 4, y: -40} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &831906335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831906333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 831906336} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 547204353} + m_TargetAssemblyTypeName: LevelButtonController, Assembly-CSharp + m_MethodName: LoadLevel2 + 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 +--- !u!114 &831906336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831906333} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &831906337 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 831906333} m_CullTransparentMesh: 1 --- !u!1 &1250256840 GameObject: @@ -614,6 +1142,8 @@ GameObject: - component: {fileID: 1339842196} - component: {fileID: 1339842195} - component: {fileID: 1339842194} + - component: {fileID: 1339842200} + - component: {fileID: 1339842199} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -711,6 +1241,8 @@ RectTransform: - {fileID: 825373416} - {fileID: 1250256841} - {fileID: 633506575} + - {fileID: 587762992} + - {fileID: 547204350} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -718,6 +1250,177 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1339842199 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339842193} + 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: 0.4113207, g: 0.18858662, b: 0.18858662, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &1339842200 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339842193} + m_CullTransparentMesh: 1 +--- !u!1 &1388519353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1388519354} + - component: {fileID: 1388519357} + - component: {fileID: 1388519356} + - component: {fileID: 1388519355} + m_Layer: 5 + m_Name: Level 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1388519354 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388519353} + 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: 60592738} + m_Father: {fileID: 547204350} + 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: 2, y: 69} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1388519355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388519353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1388519356} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 547204353} + m_TargetAssemblyTypeName: LevelButtonController, Assembly-CSharp + m_MethodName: LoadLevel1 + 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 +--- !u!114 &1388519356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388519353} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1388519357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388519353} + m_CullTransparentMesh: 1 --- !u!1 &1728087407 GameObject: m_ObjectHideFlags: 0 @@ -797,6 +1500,87 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1728087407} m_CullTransparentMesh: 1 +--- !u!1 &1896578645 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1896578646} + - component: {fileID: 1896578648} + - component: {fileID: 1896578647} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1896578646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896578645} + 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: [] + m_Father: {fileID: 587762992} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1896578647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896578645} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Choose Level + +' +--- !u!222 &1896578648 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896578645} + m_CullTransparentMesh: 1 --- !u!1 &1989579475 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Animate/LobbyController.cs b/Assets/Animate/LobbyController.cs index 6ebea97b12..8d716bbf4e 100644 --- a/Assets/Animate/LobbyController.cs +++ b/Assets/Animate/LobbyController.cs @@ -15,7 +15,7 @@ public void PlayGame() // This method will be called when the Quit button is clicked public void QuitGame() { - // Load Scene 2 (index 2 in the Build Settings) - SceneManager.LoadScene(2); + // Load Scene 3 (index 3 in the Build Settings) + SceneManager.LoadScene(3); } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 84edee4465..b4aa148ae5 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -9,8 +9,11 @@ EditorBuildSettings: path: Assets/Animate/Lobby.unity guid: d8e60a133335271469862d522f56d014 - enabled: 1 - path: Assets/Animate/Scene.unity + path: Assets/Animate/Level1.unity guid: cacf87822d5d7cd4598de741ac3398e5 + - enabled: 1 + path: Assets/Animate/Level 2.unity + guid: 92b41286ed7357445a14bc0df7a4c702 - enabled: 1 path: Assets/Scenes/SampleScene.unity guid: 3a46aa8073dff7744a2d6a6be0f747bf diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 73be7c56fe..f69c3a87f7 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,9 +9,12 @@ EditorUserSettings: value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e flags: 0 RecentlyUsedSceneGuid-1: - value: 07095150555458085e5d5f7742740e44404e407c7e2c73627f2f4865e6b0656c + value: 5a0356525407510d080a5b7145740b444316497e2e2b76342b7e1c67e1b7646a flags: 0 RecentlyUsedSceneGuid-2: + value: 07095150555458085e5d5f7742740e44404e407c7e2c73627f2f4865e6b0656c + flags: 0 + RecentlyUsedSceneGuid-3: value: 005057005d0251095f0a592647205b44434e402e297f72612c2a4e60bbb8316d flags: 0 vcSharedLogLevel: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index fa9417e257..592efc7e0e 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -245,8 +245,8 @@ MonoBehaviour: y: 0 width: 768.00006 height: 454.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 15} @@ -345,7 +345,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -10942 + m_LastSelectedObjectID: 32084 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -704,7 +704,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -745,14 +745,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 236.28178, y: 66.5588, z: -14.476279} + m_Target: {x: 406.50357, y: 191.17503, z: 0.29705077} speed: 2 - m_Value: {x: 236.28178, y: 66.5588, z: -14.476279} + m_Value: {x: 406.50357, y: 191.17503, z: 0.29705077} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -780,17 +780,17 @@ MonoBehaviour: m_Size: {x: 1, y: 1} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -798,17 +798,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 341.13303 + m_Target: 249.8034 speed: 2 - m_Value: 341.13303 + m_Value: 249.8034 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -867,9 +867,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ba680000 + m_SelectedIDs: 705f0000 m_LastClickedID: 0 - m_ExpandedIDs: ccb9ffffb0bcffff40c0ffff96c0ffff18c5ffff2cd3ffff9ad3ffff42d5ffffa2d5ffff28fbffff665c0000d25c00004e7c0000ba7c0000827e00001a7f0000 + m_ExpandedIDs: 6e97ffff2699ffff80a2ffff5ea4ffffeca4ffff60a5ffff7cbfffff96c1ffff58e2ffff4ce4ffff68e4ffffeee8ffff56e9fffff8eaffffc6ecffff2aedffff16eeffff96f0ffffd4f3ffff72f4ffff82f9ffffc2f9ffff28fbffffe25f0000166000004e600000626200000e630000e0630000d4640000b06d0000506f0000f87300000a74000014740000e87c00001c7d0000547d0000b2900000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1176,10 +1176,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 848.6} - m_SelectedIDs: 925e0000 - m_LastClickedID: 24210 - m_ExpandedIDs: 00000000ba550000625700007c5e00007e5e0000805e0000825e0000845e0000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e00009478000000ca9a3b + scrollPos: {x: 0, y: 95} + m_SelectedIDs: 9c5e0000 + m_LastClickedID: 24220 + m_ExpandedIDs: 00000000bc55000064570000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000b65e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1207,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ba550000625700007c5e00007e5e0000805e0000825e0000845e0000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000 + m_ExpandedIDs: 00000000bc55000064570000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1285,9 +1285,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 524 + y: 528 width: 1171.8 - height: 251.4 + height: 247.4 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 From 99b389b1b1a8b3b6d53dfaa38d57af0ee273ef1b Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Fri, 18 Oct 2024 14:47:40 +0530 Subject: [PATCH 16/18] Wrong commit --- Assets/Animate/LevelButtonController.cs | 45 +++++++++++++- Assets/Animate/LevelController.cs | 2 + Assets/Animate/LevelManager.cs | 82 +++++++++++++++++++++++++ Assets/Animate/LevelManager.cs.meta | 11 ++++ Assets/Animate/Lobby.unity | 2 + UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2022.dwlt | 42 ++++++------- 7 files changed, 163 insertions(+), 25 deletions(-) create mode 100644 Assets/Animate/LevelManager.cs create mode 100644 Assets/Animate/LevelManager.cs.meta diff --git a/Assets/Animate/LevelButtonController.cs b/Assets/Animate/LevelButtonController.cs index bf0176a715..cf7dae96b9 100644 --- a/Assets/Animate/LevelButtonController.cs +++ b/Assets/Animate/LevelButtonController.cs @@ -2,18 +2,59 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UIElements; public class LevelButtonController : MonoBehaviour { + + public GameObject level1Button; // Assign the Level 1 Button GameObject in the Unity editor + public GameObject level2Button; // Assign the Level 2 Button GameObject in the Unity editor + + private void Start() + { + // Enable/Disable buttons based on whether the levels are unlocked + level1Button.SetActive(LevelManager.instance.IsLevelUnlocked(1)); + level2Button.SetActive(LevelManager.instance.IsLevelUnlocked(2)); + } + // Method for loading Level 1 (build index 1) public void LoadLevel1() { - SceneManager.LoadScene(1); // Load Level 1 (build index 1) + if (LevelManager.instance.IsLevelUnlocked(1)) + { + SceneManager.LoadScene(1); // Load Level 1 if unlocked + } + else + { + Debug.Log("Level 1 is locked!"); + } } // Method for loading Level 2 (build index 2) public void LoadLevel2() { - SceneManager.LoadScene(2); // Load Level 2 (build index 2) + if (LevelManager.instance.IsLevelUnlocked(2)) + { + SceneManager.LoadScene(2); // Load Level 2 if unlocked + } + else + { + Debug.Log("Level 2 is locked!"); + } } + + // Method for loading Level 1 (build index 1) + //public void LoadLevel1() + //{ + + // LevelManager.instance.LoadAnyLevel(1); + // //SceneManager.LoadScene(1); // Load Level 1 (build index 1) + //} + + //// Method for loading Level 2 (build index 2) + //public void LoadLevel2() + //{ + // LevelManager.instance.LoadAnyLevel(2); + // //SceneManager.LoadScene(2); // Load Level 2 (build index 2) + //} } diff --git a/Assets/Animate/LevelController.cs b/Assets/Animate/LevelController.cs index 1e95b2b47a..0b2fd61349 100644 --- a/Assets/Animate/LevelController.cs +++ b/Assets/Animate/LevelController.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public class LevelController : MonoBehaviour { @@ -8,6 +9,7 @@ private void OnTriggerEnter2D(Collider2D collision) { if (collision.gameObject.GetComponent() != null) { Debug.Log("Level finished"); + //LevelManager.instance.CompleteLevel(SceneManager.GetActiveScene().buildIndex); SceneController.instance.nextLevel(); } } diff --git a/Assets/Animate/LevelManager.cs b/Assets/Animate/LevelManager.cs new file mode 100644 index 0000000000..92022c3aca --- /dev/null +++ b/Assets/Animate/LevelManager.cs @@ -0,0 +1,82 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class LevelManager : MonoBehaviour +{ + public static LevelManager instance; + + private bool[] unlockedLevels; + + private void Awake() + { + if (instance == null) + { + instance = this; + DontDestroyOnLoad(gameObject); // Make sure this persists across scenes + } + else + { + Destroy(gameObject); + } + + InitializeLevels(); + } + + // Initialize level unlocking system (level 1 is unlocked by default) + private void InitializeLevels() + { + int totalLevels = 3; // Assume 3 levels including the lobby + unlockedLevels = new bool[totalLevels]; + + // Load from PlayerPrefs + for (int i = 0; i < totalLevels; i++) + { + unlockedLevels[i] = PlayerPrefs.GetInt("LevelUnlocked_" + i, i == 1 ? 1 : 0) == 1; + } + } + + // Method to check if a level is unlocked + public bool IsLevelUnlocked(int levelIndex) + { + if (levelIndex < 0 || levelIndex >= unlockedLevels.Length) + { + return false; + } + return unlockedLevels[levelIndex]; + } + + // Method to unlock a level + public void UnlockLevel(int levelIndex) + { + if (levelIndex < unlockedLevels.Length) + { + unlockedLevels[levelIndex] = true; + PlayerPrefs.SetInt("LevelUnlocked_" + levelIndex, 1); + PlayerPrefs.Save(); + } + } + + // Load any level by index, but ensure it's unlocked first + public void LoadAnyLevel(int levelIndex) + { + if (IsLevelUnlocked(levelIndex)) + { + SceneManager.LoadScene(levelIndex); + } + else + { + Debug.LogError("Level " + levelIndex + " is locked!"); + } + } + + // Call this after finishing a level to unlock the next one + public void CompleteLevel(int currentLevelIndex) + { + if (currentLevelIndex + 1 < unlockedLevels.Length) + { + UnlockLevel(currentLevelIndex + 1); + } + } +} diff --git a/Assets/Animate/LevelManager.cs.meta b/Assets/Animate/LevelManager.cs.meta new file mode 100644 index 0000000000..00f468c4c1 --- /dev/null +++ b/Assets/Animate/LevelManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6eafbf064f8f04b4faf1e53677b27b94 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animate/Lobby.unity b/Assets/Animate/Lobby.unity index 1fe7ea48bc..ac0c4f1cd9 100644 --- a/Assets/Animate/Lobby.unity +++ b/Assets/Animate/Lobby.unity @@ -370,6 +370,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f088c32fa9f5e0428fc295887e8422d, type: 3} m_Name: m_EditorClassIdentifier: + level1Button: {fileID: 1388519353} + level2Button: {fileID: 831906333} --- !u!1 &587762991 GameObject: m_ObjectHideFlags: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f69c3a87f7..6a2605db8e 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 5a0356525407510d080a5b7145740b444316497e2e2b76342b7e1c67e1b7646a flags: 0 RecentlyUsedSceneGuid-2: - value: 07095150555458085e5d5f7742740e44404e407c7e2c73627f2f4865e6b0656c + value: 005057005d0251095f0a592647205b44434e402e297f72612c2a4e60bbb8316d flags: 0 RecentlyUsedSceneGuid-3: - value: 005057005d0251095f0a592647205b44434e402e297f72612c2a4e60bbb8316d + value: 07095150555458085e5d5f7742740e44404e407c7e2c73627f2f4865e6b0656c flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 592efc7e0e..6cf12325eb 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Game + m_Title: Console m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 45 + controlID: 134 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 46 + controlID: 83 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -198,7 +198,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 47 + controlID: 23 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -264,7 +264,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -273,15 +273,15 @@ MonoBehaviour: y: 454.4 width: 1172.8 height: 268.4 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 19} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 20} m_Panes: - {fileID: 19} - {fileID: 20} - {fileID: 13} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -301,8 +301,8 @@ MonoBehaviour: y: 0 width: 363.19995 height: 722.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} @@ -345,7 +345,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 32084 + m_LastSelectedObjectID: 29082 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -867,9 +867,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 705f0000 + m_SelectedIDs: 8a5f0000 m_LastClickedID: 0 - m_ExpandedIDs: 6e97ffff2699ffff80a2ffff5ea4ffffeca4ffff60a5ffff7cbfffff96c1ffff58e2ffff4ce4ffff68e4ffffeee8ffff56e9fffff8eaffffc6ecffff2aedffff16eeffff96f0ffffd4f3ffff72f4ffff82f9ffffc2f9ffff28fbffffe25f0000166000004e600000626200000e630000e0630000d4640000b06d0000506f0000f87300000a74000014740000e87c00001c7d0000547d0000b2900000 + m_ExpandedIDs: c6d8ffff6adeffffc4f9ffff28fbffffbc5f0000006000001060000046720000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1177,9 +1177,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 95} - m_SelectedIDs: 9c5e0000 - m_LastClickedID: 24220 - m_ExpandedIDs: 00000000bc55000064570000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000b65e000000ca9a3b + m_SelectedIDs: b45e0000 + m_LastClickedID: 24244 + m_ExpandedIDs: 00000000c0550000685700009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000b05e0000b25e0000b45e0000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000ce5e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1207,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000bc55000064570000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000 + m_ExpandedIDs: 00000000c0550000685700009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000b05e0000b25e0000b45e0000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1232,8 +1232,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 8a5f0000 + m_LastClickedInstanceID: 24458 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300005c5c0000605c0000a65e0000 m_RenameOverlay: From 7aa4fad1b87163631dc37fa3d260b875ff2d53d3 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Fri, 18 Oct 2024 14:47:54 +0530 Subject: [PATCH 17/18] Revert "Wrong commit" This reverts commit 99b389b1b1a8b3b6d53dfaa38d57af0ee273ef1b. --- Assets/Animate/LevelButtonController.cs | 45 +------------- Assets/Animate/LevelController.cs | 2 - Assets/Animate/LevelManager.cs | 82 ------------------------- Assets/Animate/LevelManager.cs.meta | 11 ---- Assets/Animate/Lobby.unity | 2 - UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2022.dwlt | 42 ++++++------- 7 files changed, 25 insertions(+), 163 deletions(-) delete mode 100644 Assets/Animate/LevelManager.cs delete mode 100644 Assets/Animate/LevelManager.cs.meta diff --git a/Assets/Animate/LevelButtonController.cs b/Assets/Animate/LevelButtonController.cs index cf7dae96b9..bf0176a715 100644 --- a/Assets/Animate/LevelButtonController.cs +++ b/Assets/Animate/LevelButtonController.cs @@ -2,59 +2,18 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; -using UnityEngine.UIElements; public class LevelButtonController : MonoBehaviour { - - public GameObject level1Button; // Assign the Level 1 Button GameObject in the Unity editor - public GameObject level2Button; // Assign the Level 2 Button GameObject in the Unity editor - - private void Start() - { - // Enable/Disable buttons based on whether the levels are unlocked - level1Button.SetActive(LevelManager.instance.IsLevelUnlocked(1)); - level2Button.SetActive(LevelManager.instance.IsLevelUnlocked(2)); - } - // Method for loading Level 1 (build index 1) public void LoadLevel1() { - if (LevelManager.instance.IsLevelUnlocked(1)) - { - SceneManager.LoadScene(1); // Load Level 1 if unlocked - } - else - { - Debug.Log("Level 1 is locked!"); - } + SceneManager.LoadScene(1); // Load Level 1 (build index 1) } // Method for loading Level 2 (build index 2) public void LoadLevel2() { - if (LevelManager.instance.IsLevelUnlocked(2)) - { - SceneManager.LoadScene(2); // Load Level 2 if unlocked - } - else - { - Debug.Log("Level 2 is locked!"); - } + SceneManager.LoadScene(2); // Load Level 2 (build index 2) } - - // Method for loading Level 1 (build index 1) - //public void LoadLevel1() - //{ - - // LevelManager.instance.LoadAnyLevel(1); - // //SceneManager.LoadScene(1); // Load Level 1 (build index 1) - //} - - //// Method for loading Level 2 (build index 2) - //public void LoadLevel2() - //{ - // LevelManager.instance.LoadAnyLevel(2); - // //SceneManager.LoadScene(2); // Load Level 2 (build index 2) - //} } diff --git a/Assets/Animate/LevelController.cs b/Assets/Animate/LevelController.cs index 0b2fd61349..1e95b2b47a 100644 --- a/Assets/Animate/LevelController.cs +++ b/Assets/Animate/LevelController.cs @@ -1,7 +1,6 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using UnityEngine.SceneManagement; public class LevelController : MonoBehaviour { @@ -9,7 +8,6 @@ private void OnTriggerEnter2D(Collider2D collision) { if (collision.gameObject.GetComponent() != null) { Debug.Log("Level finished"); - //LevelManager.instance.CompleteLevel(SceneManager.GetActiveScene().buildIndex); SceneController.instance.nextLevel(); } } diff --git a/Assets/Animate/LevelManager.cs b/Assets/Animate/LevelManager.cs deleted file mode 100644 index 92022c3aca..0000000000 --- a/Assets/Animate/LevelManager.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.SceneManagement; - -public class LevelManager : MonoBehaviour -{ - public static LevelManager instance; - - private bool[] unlockedLevels; - - private void Awake() - { - if (instance == null) - { - instance = this; - DontDestroyOnLoad(gameObject); // Make sure this persists across scenes - } - else - { - Destroy(gameObject); - } - - InitializeLevels(); - } - - // Initialize level unlocking system (level 1 is unlocked by default) - private void InitializeLevels() - { - int totalLevels = 3; // Assume 3 levels including the lobby - unlockedLevels = new bool[totalLevels]; - - // Load from PlayerPrefs - for (int i = 0; i < totalLevels; i++) - { - unlockedLevels[i] = PlayerPrefs.GetInt("LevelUnlocked_" + i, i == 1 ? 1 : 0) == 1; - } - } - - // Method to check if a level is unlocked - public bool IsLevelUnlocked(int levelIndex) - { - if (levelIndex < 0 || levelIndex >= unlockedLevels.Length) - { - return false; - } - return unlockedLevels[levelIndex]; - } - - // Method to unlock a level - public void UnlockLevel(int levelIndex) - { - if (levelIndex < unlockedLevels.Length) - { - unlockedLevels[levelIndex] = true; - PlayerPrefs.SetInt("LevelUnlocked_" + levelIndex, 1); - PlayerPrefs.Save(); - } - } - - // Load any level by index, but ensure it's unlocked first - public void LoadAnyLevel(int levelIndex) - { - if (IsLevelUnlocked(levelIndex)) - { - SceneManager.LoadScene(levelIndex); - } - else - { - Debug.LogError("Level " + levelIndex + " is locked!"); - } - } - - // Call this after finishing a level to unlock the next one - public void CompleteLevel(int currentLevelIndex) - { - if (currentLevelIndex + 1 < unlockedLevels.Length) - { - UnlockLevel(currentLevelIndex + 1); - } - } -} diff --git a/Assets/Animate/LevelManager.cs.meta b/Assets/Animate/LevelManager.cs.meta deleted file mode 100644 index 00f468c4c1..0000000000 --- a/Assets/Animate/LevelManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6eafbf064f8f04b4faf1e53677b27b94 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Animate/Lobby.unity b/Assets/Animate/Lobby.unity index ac0c4f1cd9..1fe7ea48bc 100644 --- a/Assets/Animate/Lobby.unity +++ b/Assets/Animate/Lobby.unity @@ -370,8 +370,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f088c32fa9f5e0428fc295887e8422d, type: 3} m_Name: m_EditorClassIdentifier: - level1Button: {fileID: 1388519353} - level2Button: {fileID: 831906333} --- !u!1 &587762991 GameObject: m_ObjectHideFlags: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 6a2605db8e..f69c3a87f7 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 5a0356525407510d080a5b7145740b444316497e2e2b76342b7e1c67e1b7646a flags: 0 RecentlyUsedSceneGuid-2: - value: 005057005d0251095f0a592647205b44434e402e297f72612c2a4e60bbb8316d + value: 07095150555458085e5d5f7742740e44404e407c7e2c73627f2f4865e6b0656c flags: 0 RecentlyUsedSceneGuid-3: - value: 07095150555458085e5d5f7742740e44404e407c7e2c73627f2f4865e6b0656c + value: 005057005d0251095f0a592647205b44434e402e297f72612c2a4e60bbb8316d flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 6cf12325eb..592efc7e0e 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Console + m_Title: Game m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 134 + controlID: 45 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 83 + controlID: 46 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -198,7 +198,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 23 + controlID: 47 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -264,7 +264,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -273,15 +273,15 @@ MonoBehaviour: y: 454.4 width: 1172.8 height: 268.4 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 20} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} - {fileID: 20} - {fileID: 13} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -301,8 +301,8 @@ MonoBehaviour: y: 0 width: 363.19995 height: 722.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} @@ -345,7 +345,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 29082 + m_LastSelectedObjectID: 32084 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -867,9 +867,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 8a5f0000 + m_SelectedIDs: 705f0000 m_LastClickedID: 0 - m_ExpandedIDs: c6d8ffff6adeffffc4f9ffff28fbffffbc5f0000006000001060000046720000 + m_ExpandedIDs: 6e97ffff2699ffff80a2ffff5ea4ffffeca4ffff60a5ffff7cbfffff96c1ffff58e2ffff4ce4ffff68e4ffffeee8ffff56e9fffff8eaffffc6ecffff2aedffff16eeffff96f0ffffd4f3ffff72f4ffff82f9ffffc2f9ffff28fbffffe25f0000166000004e600000626200000e630000e0630000d4640000b06d0000506f0000f87300000a74000014740000e87c00001c7d0000547d0000b2900000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1177,9 +1177,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 95} - m_SelectedIDs: b45e0000 - m_LastClickedID: 24244 - m_ExpandedIDs: 00000000c0550000685700009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000b05e0000b25e0000b45e0000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000ce5e000000ca9a3b + m_SelectedIDs: 9c5e0000 + m_LastClickedID: 24220 + m_ExpandedIDs: 00000000bc55000064570000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000b65e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1207,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c0550000685700009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000b05e0000b25e0000b45e0000b65e0000b85e0000ba5e0000bc5e0000be5e0000c05e0000c25e0000c45e0000c65e0000 + m_ExpandedIDs: 00000000bc55000064570000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1232,8 +1232,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 8a5f0000 - m_LastClickedInstanceID: 24458 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300005c5c0000605c0000a65e0000 m_RenameOverlay: From ce76b89e977453023923a62f965c0d765ade5597 Mon Sep 17 00:00:00 2001 From: Parth Vaidya Date: Sat, 19 Oct 2024 19:45:30 +0530 Subject: [PATCH 18/18] Added level locking unlocking --- Assets/Animate/Level 2.unity | 204 ++++++++++++++++++++++++ Assets/Animate/LevelButtonController.cs | 23 +++ Assets/Animate/LevelController.cs | 22 +++ Assets/Animate/Lobby.unity | 3 + UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-2022.dwlt | 46 +++--- 6 files changed, 277 insertions(+), 25 deletions(-) diff --git a/Assets/Animate/Level 2.unity b/Assets/Animate/Level 2.unity index 4c9e8c49fd..49fbdd7f07 100644 --- a/Assets/Animate/Level 2.unity +++ b/Assets/Animate/Level 2.unity @@ -1052,6 +1052,127 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 39adebf01b966e048b9a111f5b090ef6, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &910046908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 910046909} + - component: {fileID: 910046912} + - component: {fileID: 910046911} + - component: {fileID: 910046910} + m_Layer: 5 + m_Name: Lobby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &910046909 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910046908} + 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: 1627301081} + m_Father: {fileID: 1314853573} + 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: 7, y: -61} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &910046910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910046908} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 910046911} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &910046911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910046908} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &910046912 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910046908} + m_CullTransparentMesh: 1 --- !u!1 &1060922156 GameObject: m_ObjectHideFlags: 0 @@ -2111,6 +2232,7 @@ RectTransform: m_Children: - {fileID: 670264995} - {fileID: 1336875025} + - {fileID: 910046909} m_Father: {fileID: 365590511} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2170,6 +2292,7 @@ MonoBehaviour: m_EditorClassIdentifier: gameOverUI: {fileID: 1314853572} restartButton: {fileID: 670264996} + lobby: {fileID: 910046910} scoreText: {fileID: 625562596} --- !u!1 &1329991807 GameObject: @@ -2573,6 +2696,87 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: gameOverController: {fileID: 1314853576} +--- !u!1 &1627301080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1627301081} + - component: {fileID: 1627301083} + - component: {fileID: 1627301082} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1627301081 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627301080} + 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: [] + m_Father: {fileID: 910046909} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1627301082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627301080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Lobby + +' +--- !u!222 &1627301083 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627301080} + m_CullTransparentMesh: 1 --- !u!1 &1751292479 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5158019043804637083, guid: 731a3c0e5bbd44d48b3e6521c9899f8f, diff --git a/Assets/Animate/LevelButtonController.cs b/Assets/Animate/LevelButtonController.cs index bf0176a715..fd84e7eb7b 100644 --- a/Assets/Animate/LevelButtonController.cs +++ b/Assets/Animate/LevelButtonController.cs @@ -2,9 +2,32 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; public class LevelButtonController : MonoBehaviour { + + public Button[] button; + + private void Awake() + { + // Ensure you are using the same key name + int levelAt = PlayerPrefs.GetInt("levelAt", 1); + + for (int i = 0; i < button.Length; i++) + { + button[i].interactable = false; + + } + + for (int i = 0; i < levelAt; i++) + { + button[i].interactable = true; + + } + + + } // Method for loading Level 1 (build index 1) public void LoadLevel1() { diff --git a/Assets/Animate/LevelController.cs b/Assets/Animate/LevelController.cs index 1e95b2b47a..5ebad07196 100644 --- a/Assets/Animate/LevelController.cs +++ b/Assets/Animate/LevelController.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public class LevelController : MonoBehaviour { @@ -8,7 +9,28 @@ private void OnTriggerEnter2D(Collider2D collision) { if (collision.gameObject.GetComponent() != null) { Debug.Log("Level finished"); + UnlockNewLevel(); SceneController.instance.nextLevel(); } } + + + void UnlockNewLevel() + { + // Get the current level index and the levelAt value + int currentLevelIndex = SceneManager.GetActiveScene().buildIndex; + int levelAt = PlayerPrefs.GetInt("levelAt", 1); + + // Check if the current level index is the last unlocked level + if (currentLevelIndex == levelAt) + { + PlayerPrefs.SetInt("levelAt", levelAt + 1); // Increment levelAt to unlock the next level + PlayerPrefs.Save(); // Save the changes + Debug.Log("Unlocked level: " + (levelAt + 1)); // Log the new unlocked level + } + } + } + + + diff --git a/Assets/Animate/Lobby.unity b/Assets/Animate/Lobby.unity index 1fe7ea48bc..f74f4fbf9d 100644 --- a/Assets/Animate/Lobby.unity +++ b/Assets/Animate/Lobby.unity @@ -370,6 +370,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f088c32fa9f5e0428fc295887e8422d, type: 3} m_Name: m_EditorClassIdentifier: + button: + - {fileID: 1388519355} + - {fileID: 831906335} --- !u!1 &587762991 GameObject: m_ObjectHideFlags: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f69c3a87f7..6a2605db8e 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 5a0356525407510d080a5b7145740b444316497e2e2b76342b7e1c67e1b7646a flags: 0 RecentlyUsedSceneGuid-2: - value: 07095150555458085e5d5f7742740e44404e407c7e2c73627f2f4865e6b0656c + value: 005057005d0251095f0a592647205b44434e402e297f72612c2a4e60bbb8316d flags: 0 RecentlyUsedSceneGuid-3: - value: 005057005d0251095f0a592647205b44434e402e297f72612c2a4e60bbb8316d + value: 07095150555458085e5d5f7742740e44404e407c7e2c73627f2f4865e6b0656c flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 592efc7e0e..dd6736fb8b 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 45 + controlID: 115 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 46 + controlID: 73 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -198,7 +198,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 47 + controlID: 74 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -245,8 +245,8 @@ MonoBehaviour: y: 0 width: 768.00006 height: 454.4 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 15} @@ -264,7 +264,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -273,15 +273,15 @@ MonoBehaviour: y: 454.4 width: 1172.8 height: 268.4 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 19} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 20} m_Panes: - {fileID: 19} - {fileID: 20} - {fileID: 13} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -301,8 +301,8 @@ MonoBehaviour: y: 0 width: 363.19995 height: 722.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} @@ -345,7 +345,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 32084 + m_LastSelectedObjectID: 23670 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -867,9 +867,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 705f0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 6e97ffff2699ffff80a2ffff5ea4ffffeca4ffff60a5ffff7cbfffff96c1ffff58e2ffff4ce4ffff68e4ffffeee8ffff56e9fffff8eaffffc6ecffff2aedffff16eeffff96f0ffffd4f3ffff72f4ffff82f9ffffc2f9ffff28fbffffe25f0000166000004e600000626200000e630000e0630000d4640000b06d0000506f0000f87300000a74000014740000e87c00001c7d0000547d0000b2900000 + m_ExpandedIDs: 28fbffff765c0000ba5c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1177,9 +1177,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 95} - m_SelectedIDs: 9c5e0000 - m_LastClickedID: 24220 - m_ExpandedIDs: 00000000bc55000064570000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000b65e000000ca9a3b + m_SelectedIDs: 285e0000 + m_LastClickedID: 24104 + m_ExpandedIDs: 00000000c055000068570000125e0000145e0000165e0000185e00001a5e00001c5e00001e5e0000205e0000225e0000245e0000265e0000285e00002a5e00002c5e00002e5e0000305e0000325e0000345e0000365e0000385e00003a5e0000ae64000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1207,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000bc55000064570000865e0000885e00008a5e00008c5e00008e5e0000905e0000925e0000945e0000965e0000985e00009a5e00009c5e00009e5e0000a05e0000a25e0000a45e0000a65e0000a85e0000aa5e0000ac5e0000ae5e0000 + m_ExpandedIDs: 00000000c055000068570000125e0000145e0000165e0000185e00001a5e00001c5e00001e5e0000205e0000225e0000245e0000265e0000285e00002a5e00002c5e00002e5e0000305e0000325e0000345e0000365e0000385e00003a5e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1232,8 +1232,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: e4180000 + m_LastClickedInstanceID: 6372 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300005c5c0000605c0000a65e0000 m_RenameOverlay: @@ -1259,7 +1259,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 78.600006} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 57 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207