From 622af0cc386caf9c1131069f3514ab7f8cde61d8 Mon Sep 17 00:00:00 2001 From: Akash Date: Mon, 28 Oct 2024 00:15:25 +0530 Subject: [PATCH 01/11] 27/10/24 --- Assets/Animation.meta | 8 + Assets/Animation/Player.meta | 8 + Assets/Animation/Player/Player.controller | 278 ++++++++ .../Animation/Player/Player.controller.meta | 8 + Assets/Animation/Player/Player_Idle.anim | 110 +++ Assets/Animation/Player/Player_Idle.anim.meta | 8 + Assets/Animation/Player/Player_Jump.anim | 122 ++++ Assets/Animation/Player/Player_Jump.anim.meta | 8 + Assets/Animation/Player/Player_Run.anim | 131 ++++ Assets/Animation/Player/Player_Run.anim.meta | 8 + .../Ellen/EllenAtlas.spriteatlas | 9 +- .../Ellen/EllenCutsceneAtlas.spriteatlas | 9 +- .../Enemies/ChomperAtlas.spriteatlas | 9 +- .../Enemies/SpitterAtlas.spriteatlas | 9 +- Assets/Prefabs.meta | 8 + Assets/Prefabs/Player.prefab | 86 +++ Assets/Prefabs/Player.prefab.meta | 7 + Assets/Scenes/GameScene.unity | 305 ++++++++ Assets/Scenes/GameScene.unity.meta | 7 + Packages/manifest.json | 14 +- Packages/packages-lock.json | 44 +- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/SceneTemplateSettings.json | 167 +++++ UserSettings/EditorUserSettings.asset | 3 + UserSettings/Layouts/default-2021.dwlt | 653 ++++++++++++++---- 25 files changed, 1834 insertions(+), 189 deletions(-) create mode 100644 Assets/Animation.meta create mode 100644 Assets/Animation/Player.meta create mode 100644 Assets/Animation/Player/Player.controller create mode 100644 Assets/Animation/Player/Player.controller.meta create mode 100644 Assets/Animation/Player/Player_Idle.anim create mode 100644 Assets/Animation/Player/Player_Idle.anim.meta create mode 100644 Assets/Animation/Player/Player_Jump.anim create mode 100644 Assets/Animation/Player/Player_Jump.anim.meta create mode 100644 Assets/Animation/Player/Player_Run.anim create mode 100644 Assets/Animation/Player/Player_Run.anim.meta create mode 100644 Assets/Prefabs.meta create mode 100644 Assets/Prefabs/Player.prefab create mode 100644 Assets/Prefabs/Player.prefab.meta create mode 100644 Assets/Scenes/GameScene.unity create mode 100644 Assets/Scenes/GameScene.unity.meta create mode 100644 ProjectSettings/SceneTemplateSettings.json diff --git a/Assets/Animation.meta b/Assets/Animation.meta new file mode 100644 index 0000000000..2eadeb942b --- /dev/null +++ b/Assets/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ce2016252b4de8439d6dd63efba1b00 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Player.meta b/Assets/Animation/Player.meta new file mode 100644 index 0000000000..1b9e69455d --- /dev/null +++ b/Assets/Animation/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7aa386fe1660664c92f840a1e6c8ac4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Player/Player.controller b/Assets/Animation/Player/Player.controller new file mode 100644 index 0000000000..86db9b99fc --- /dev/null +++ b/Assets/Animation/Player/Player.controller @@ -0,0 +1,278 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7572164546155968529 +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: + - {fileID: -6028510316402985611} + 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: 313a3050a1b8e5a45a31f6c55f0241c9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-6028510316402985611 +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: 3076586384186182164} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.65116274 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2859379486156080382 +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_ConditionMode: 2 + m_ConditionEvent: Jump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3076586384186182164} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5945946 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-2004796894295772469 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Jump + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2859379486156080382} + - {fileID: 8508362208506447737} + 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: 7351bc592154d2c4c9377c639bf23a48, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !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_Name: Speed + m_Type: 1 + m_DefaultFloat: 0.3 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Jump + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1994824599072847136} + 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 &1994824599072847136 +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: 3076586384186182164} + m_Position: {x: 120, y: 240, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7572164546155968529} + m_Position: {x: 390, y: 150, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2004796894295772469} + m_Position: {x: 400, y: 320, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 4599713188957750583} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 120, y: 320, 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: 3076586384186182164} +--- !u!1102 &3076586384186182164 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4611771482754873255} + 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: 09d2bd9847ae15444a4c18d7fd2f6d94, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &4599713188957750583 +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: -2004796894295772469} + 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!1101 &4611771482754873255 +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: -7572164546155968529} + 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!1101 &8508362208506447737 +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_ConditionMode: 2 + m_ConditionEvent: Jump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7572164546155968529} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.5945946 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animation/Player/Player.controller.meta b/Assets/Animation/Player/Player.controller.meta new file mode 100644 index 0000000000..7c54d73215 --- /dev/null +++ b/Assets/Animation/Player/Player.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7434f485d873f8a48943a9802f164a62 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Player/Player_Idle.anim b/Assets/Animation/Player/Player_Idle.anim new file mode 100644 index 0000000000..300a0989cc --- /dev/null +++ b/Assets/Animation/Player/Player_Idle.anim @@ -0,0 +1,110 @@ +%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: Player_Idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 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.16666667 + value: {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: 76089009971280441963c2a3a55b5071, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} + - time: 0.65 + value: {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + 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.76666665 + 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/Animation/Player/Player_Idle.anim.meta b/Assets/Animation/Player/Player_Idle.anim.meta new file mode 100644 index 0000000000..8cad87eb01 --- /dev/null +++ b/Assets/Animation/Player/Player_Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09d2bd9847ae15444a4c18d7fd2f6d94 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Player/Player_Jump.anim b/Assets/Animation/Player/Player_Jump.anim new file mode 100644 index 0000000000..7564a731f6 --- /dev/null +++ b/Assets/Animation/Player/Player_Jump.anim @@ -0,0 +1,122 @@ +%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: Player_Jump + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 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.1 + value: {fileID: 21300000, guid: affa4f4470b317440b7cb5187df710ef, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 4214a14962bcf4943baf9e184b9b928e, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: bb6a891737c56e6438e808fb4e716321, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: af68c0be2e67f3846bcdf33841f8312b, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: ae6184443cb4d0f439bab73e9e76df4a, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} + - time: 0.56666666 + value: {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + 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.6166667 + 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/Animation/Player/Player_Jump.anim.meta b/Assets/Animation/Player/Player_Jump.anim.meta new file mode 100644 index 0000000000..1891d91f43 --- /dev/null +++ b/Assets/Animation/Player/Player_Jump.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7351bc592154d2c4c9377c639bf23a48 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Player/Player_Run.anim b/Assets/Animation/Player/Player_Run.anim new file mode 100644 index 0000000000..80ded299da --- /dev/null +++ b/Assets/Animation/Player/Player_Run.anim @@ -0,0 +1,131 @@ +%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: Player_Run + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: ff33d6adfeac52e419af23fad2d0abfd, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 12ea17332fa174442af48960686e1769, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 45ed26a75477df843a013176e95192a9, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 3a5b7c781691c8642af63e9c1e6c14de, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 87e29b609bb169245a2df3d89266630c, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: a4cfd522aaaa4ac45980e1828c8dea2c, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 2eaa4938329e1204ca267982a8cdb3fa, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: dfd2eca0b8de7a443a0b28c6466f55ba, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 301fc9f2a0405ee45ad84f7b550051d5, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 05df8025a12814d46b434681a6989133, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 5d25d9e1de070994db63a462e89932d7, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: 9989c37dedfecfa4591fd9f1821713cb, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: 89339a864e8d9994ea7c9531ae92e67e, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: 453c8803862e72b43ad3652b8fe03437, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: eb350ede4895d6d418689eb126b772cb, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 79d7163dfd26ad748bf88cdc6b98d2f5, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: 690102d87edd7d047824362d73a02788, type: 3} + - time: 0.56666666 + value: {fileID: 21300000, guid: 5cdf5107efb2e8c4d980153f752a57c1, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: 3b3834ff0aab3d849bca2adc0c0d5f84, type: 3} + - time: 0.6333333 + value: {fileID: 21300000, guid: d3c1e30225625c14e9bf351c35be2fd9, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: 88f2ac18ae0c71845bc1d47bd924f8a8, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: 37547022c0607c544915b3089832635d, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + 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.71666664 + 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/Animation/Player/Player_Run.anim.meta b/Assets/Animation/Player/Player_Run.anim.meta new file mode 100644 index 0000000000..35a07751a0 --- /dev/null +++ b/Assets/Animation/Player/Player_Run.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 313a3050a1b8e5a45a31f6c55f0241c9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + 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..b4ee00222b 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 @@ -32,6 +32,7 @@ SpriteAtlas: m_AllowsAlphaSplitting: 0 m_Overridden: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +40,14 @@ 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} m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} @@ -447,5 +451,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..95d25b4102 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 @@ -32,6 +32,7 @@ SpriteAtlas: m_AllowsAlphaSplitting: 0 m_Overridden: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +40,14 @@ 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} m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: a5bd89109aa6b2040899eb517d4ff269, type: 3} @@ -161,5 +165,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..e3bd26f855 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 @@ -32,6 +32,7 @@ SpriteAtlas: m_AllowsAlphaSplitting: 0 m_Overridden: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +40,14 @@ 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} m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: ab415a003dc7634428737e396fb6b118, type: 3} @@ -173,5 +177,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..5e96e715f8 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 @@ -32,6 +32,7 @@ SpriteAtlas: m_AllowsAlphaSplitting: 0 m_Overridden: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +40,14 @@ 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} m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: 8adfa5608930ca2439e971779195e6d5, type: 3} @@ -153,5 +157,6 @@ SpriteAtlas: - SpitterAttack_16 - SpitterWalk_09 - SpitterAttack_18 + m_RenderDataMap: {} m_Tag: SpitterAtlas m_IsVariant: 0 diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000000..3335f202c1 --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 594c1bda4f2ea124b98d6721c96636b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000000..82ae51b8ed --- /dev/null +++ b/Assets/Prefabs/Player.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &119708198454689196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3679550784524527443} + - component: {fileID: 5743594417375524470} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3679550784524527443 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119708198454689196} + 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_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5743594417375524470 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119708198454689196} + 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 diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 0000000000..ce144883fa --- /dev/null +++ b/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity new file mode 100644 index 0000000000..5ca4e4557e --- /dev/null +++ b/Assets/Scenes/GameScene.unity @@ -0,0 +1,305 @@ +%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_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + 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: 2 + 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 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &808561118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 808561121} + - component: {fileID: 808561120} + - component: {fileID: 808561119} + 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 &808561119 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808561118} + m_Enabled: 1 +--- !u!20 &808561120 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808561118} + 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_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + 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 &808561121 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808561118} + 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_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3637415917317152292 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 119708198454689196, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} +--- !u!1 &3637415917317152293 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 119708198454689196, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + m_PrefabInstance: {fileID: 3637415917317152292} + m_PrefabAsset: {fileID: 0} +--- !u!95 &3637415917317152294 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3637415917317152293} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7434f485d873f8a48943a9802f164a62, 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/Scenes/GameScene.unity.meta b/Assets/Scenes/GameScene.unity.meta new file mode 100644 index 0000000000..64ea2cb547 --- /dev/null +++ b/Assets/Scenes/GameScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5593c1c21f2854643b88258a0aaeeeee +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index c6d072b59a..44e8f59f6b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,16 +2,16 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.ads": "4.4.1", + "com.unity.ads": "4.4.2", "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.collab-proxy": "2.0.4", + "com.unity.ide.rider": "3.0.21", + "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", - "com.unity.purchasing": "4.6.0", - "com.unity.test-framework": "1.1.31", + "com.unity.purchasing": "4.8.0", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", + "com.unity.timeline": "1.6.5", "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..a290e4ea7e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -13,7 +13,7 @@ "dependencies": {} }, "com.unity.ads": { - "version": "4.4.1", + "version": "4.4.2", "depth": 0, "source": "registry", "dependencies": { @@ -31,7 +31,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.1", + "version": "2.0.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -45,7 +45,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.18", + "version": "3.0.21", "depth": 0, "source": "registry", "dependencies": { @@ -54,7 +54,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -70,51 +70,39 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", + "version": "3.2.0", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.purchasing": { - "version": "4.6.0", + "version": "4.8.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.services.core": "1.8.1", "com.unity.modules.androidjni": "1.0.0", - "com.unity.services.core": "1.5.2", - "com.unity.services.analytics": "4.2.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.services.analytics": { - "version": "4.3.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.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.8.1", + "version": "1.8.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" + "com.unity.modules.unitywebrequest": "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 +122,13 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.6.5", "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" diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index bca3d022af..77ebdac1e8 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: 2021.3.26f1 +m_EditorVersionWithRevision: 2021.3.26f1 (a16dc32e0ff2) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000000..6f3e60fd8b --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f145fa853e..d31c6cc3e9 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -8,6 +8,9 @@ EditorUserSettings: RecentlyUsedSceneGuid-0: value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e flags: 0 + RecentlyUsedSceneGuid-1: + value: 56040d5506040a095c085e7a45770944451540727e7d7e317d281c36e7e5313d + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 6a0b8ede35..89eed70f74 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 2249 - y: 302.5 - width: 1206 - height: 715 + x: 1920 + y: 43 + width: 1920 + height: 1037 m_ShowMode: 4 - m_Title: + m_Title: Project m_RootView: {fileID: 6} 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 @@ -43,12 +43,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1206 - height: 665 - m_MinSize: {x: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} + width: 1920 + height: 987 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 119 + controlID: 638 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,15 +64,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 921 + x: 1542 y: 0 - width: 285 - height: 665 + width: 378 + height: 987 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 13} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 --- !u!114 &4 @@ -92,13 +92,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 228 - height: 394 + width: 271 + height: 469 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 &5 @@ -117,17 +117,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 394 - width: 921 - height: 271 + y: 469 + width: 1542 + height: 518 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 12} - - {fileID: 17} + - {fileID: 14} + - {fileID: 19} + - {fileID: 13} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 2 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -148,10 +149,14 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1206 - height: 715 + width: 1920 + height: 1037 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 @@ -169,13 +174,11 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1206 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LoadedToolbars: [] - m_MainToolbar: {fileID: 18} - m_LastLoadedLayoutName: Default + m_LastLoadedLayoutName: Default2 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -192,8 +195,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 695 - width: 1206 + y: 1017 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -216,12 +219,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 921 - height: 665 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + width: 1542 + height: 987 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 92 + controlID: 639 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -241,12 +244,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 921 - height: 394 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + width: 1542 + height: 469 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 93 + controlID: 640 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -257,24 +260,126 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 228 + x: 271 y: 0 - width: 693 - height: 394 + width: 1271 + height: 469 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: 16} + - {fileID: 17} + - {fileID: 18} + - {fileID: 12} m_Selected: 0 - m_LastSelected: 1 + 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: 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: -1673928668082335149, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2113 + y: 73 + width: 902 + height: 435 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -6816357663705468446, guid: db82b9ab52ae914499846db5a12cb966, type: 2} + m_ValueSerializationHelper: + - 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: db82b9ab52ae914499846db5a12cb966, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -6816357663705468446, guid: db82b9ab52ae914499846db5a12cb966, + 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: 0 + 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_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1920 + y: 542 + width: 1541 + height: 497 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -16390 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -290,15 +395,20 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 1920 + y: 542 + width: 1541 + height: 497 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 m_SearchFilter: m_NameFilter: m_ClassNames: [] @@ -312,37 +422,38 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scenes m_Globs: [] + m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scenes m_LastFoldersGridSize: -1 - m_LastProjectPath: U:\layout + m_LastProjectPath: D:\GitFiles\2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f4350000 - m_LastClickedID: 13812 - m_ExpandedIDs: 00000000f435000000ca9a3b + m_SelectedIDs: 98980000 + m_LastClickedID: 39064 + m_ExpandedIDs: 00000000787a000092980000949800009a980000b0980000b8980000ba980000c8980000de980000ea98000062990000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Resources + m_OriginalName: Resources m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 39062 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -354,7 +465,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f4350000 + m_ExpandedIDs: 00000000787a000092980000a4980000b0980000b8980000ba980000c8980000de980000ea980000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -381,7 +492,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -398,7 +509,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -410,7 +521,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -426,15 +537,20 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 3170 - y: 332.5 - width: 284 - height: 644 + x: 3462 + y: 73 + width: 377 + height: 966 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: @@ -443,12 +559,12 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 - m_AssetGUID: - m_InstanceID: 0 + m_GlobalObjectId: + m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -464,21 +580,26 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 332.5 - width: 227 - height: 373 + x: 1920 + y: 73 + width: 270 + height: 448 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_SelectedIDs: 80990000 m_LastClickedID: 0 - m_ExpandedIDs: 42fbffff + m_ExpandedIDs: 70b3ffff18b4ffff56b4ffff02c7ffff26fbffff42fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -502,7 +623,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} @@ -518,29 +639,275 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2477 - y: 332.5 - width: 691 - height: 373 + x: 2191 + y: 73 + width: 1269 + height: 448 m_ViewDataDictionary: {fileID: 0} - m_ShowContextualTools: 0 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - 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 + - 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 + - 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 + - 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 + - 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: 0 + layout: 4 + - 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 + - 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: 2 + layout: 4 + - 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: 3 + layout: 4 + - 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 + - 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 + - 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 + - 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: 7 + layout: 4 + - 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: 8 + layout: 4 + - 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: 9 + layout: 4 + - 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: 10 + layout: 4 + - 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 + - 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 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 3 + layout: 4 + m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 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: 0, y: 0, z: 0} + m_Target: {x: 4.8259006, y: 2.647788, z: 0.06623819} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: 5.0221496, y: 2.6810832, z: 0.06488717} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -550,13 +917,14 @@ MonoBehaviour: m_DoValidateTrueMetals: 0 m_ExposureSliderValue: 0 m_SceneViewState: + m_AlwaysRefresh: 0 showFog: 1 - showMaterialUpdate: 0 showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 showVisualEffectGraphs: 1 + m_FxEnabled: 1 m_Grid: xGrid: m_Fade: @@ -568,35 +936,35 @@ MonoBehaviour: m_Size: {x: 0, y: 0} 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: 0, y: 0} + m_Size: {x: 0.55, y: 0.55} m_ShowGrid: 1 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: 10 + m_Target: 2.867148 speed: 2 - m_Value: 10 + m_Value: 3.0022492 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 @@ -605,19 +973,19 @@ MonoBehaviour: m_EasingEnabled: 1 m_EasingDuration: 0.4 m_AccelerationEnabled: 1 - m_FieldOfView: 90 + m_FieldOfViewHorizontalOrVertical: 60 m_NearClip: 0.03 m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 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 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -633,7 +1001,8 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -642,17 +1011,21 @@ MonoBehaviour: width: 1532 height: 790 m_ViewDataDictionary: {fileID: 0} - m_SerializedViewsNames: [] - m_SerializedViewsValues: [] + 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: 640, y: 480} + m_TargetSize: {x: 1532, y: 769} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 0 - m_MaximizeOnPlay: 0 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -665,8 +1038,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -766 m_HBaseRangeMax: 766 - m_VBaseRangeMin: -395 - m_VBaseRangeMax: 395 + m_VBaseRangeMin: -384.5 + m_VBaseRangeMax: 384.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -683,11 +1056,11 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 0 + y: 21 width: 1532 - height: 790 + height: 769 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 395} + m_Translation: {x: 766, y: 384.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -695,9 +1068,9 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -766 - y: -395 + y: -384.5 width: 1532 - height: 790 + height: 769 m_MinimalGUI: 1 m_defaultScale: 1 m_LastWindowPixelSize: {x: 1532, y: 790} @@ -706,7 +1079,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -722,25 +1095,17 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 740 + width: 1541 + height: 299 m_ViewDataDictionary: {fileID: 0} ---- !u!114 &18 -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: 13963, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_DontSaveToLayout: 0 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 From 64402035296902fa721787a93697be96c62b1b1d Mon Sep 17 00:00:00 2001 From: Akash Date: Mon, 28 Oct 2024 00:21:37 +0530 Subject: [PATCH 02/11] animation --- Assets/Animation/Player/Player_Walk.anim.meta | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Assets/Animation/Player/Player_Walk.anim.meta diff --git a/Assets/Animation/Player/Player_Walk.anim.meta b/Assets/Animation/Player/Player_Walk.anim.meta new file mode 100644 index 0000000000..76fbf9505a --- /dev/null +++ b/Assets/Animation/Player/Player_Walk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db59666de78bd964680a5952513534b5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: From fc6861ba50090abd54b1d0ab8f7f1762e4474264 Mon Sep 17 00:00:00 2001 From: Akash Date: Mon, 28 Oct 2024 00:29:24 +0530 Subject: [PATCH 03/11] Crouch --- Assets/Animation/Player/Player.controller | 120 +++++++++++++++++- Assets/Animation/Player/Player_Crouch.anim | 80 ++++++++++++ .../Animation/Player/Player_Crouch.anim.meta | 8 ++ Assets/Animation/Player/Player_Walk.anim | 110 ++++++++++++++++ 4 files changed, 316 insertions(+), 2 deletions(-) create mode 100644 Assets/Animation/Player/Player_Crouch.anim create mode 100644 Assets/Animation/Player/Player_Crouch.anim.meta create mode 100644 Assets/Animation/Player/Player_Walk.anim diff --git a/Assets/Animation/Player/Player.controller b/Assets/Animation/Player/Player.controller index 86db9b99fc..6629a38d90 100644 --- a/Assets/Animation/Player/Player.controller +++ b/Assets/Animation/Player/Player.controller @@ -52,6 +52,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-3591481035464551782 +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: 3076586384186182164} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-2859379486156080382 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -108,6 +133,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-1445811024750606540 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Walk + 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: db59666de78bd964680a5952513534b5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -129,6 +180,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: Crouch + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -156,10 +213,16 @@ AnimatorStateMachine: m_Position: {x: 120, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: -7572164546155968529} - m_Position: {x: 390, y: 150, z: 0} + m_Position: {x: 570, y: 140, z: 0} - serializedVersion: 1 m_State: {fileID: -2004796894295772469} - m_Position: {x: 400, y: 320, z: 0} + m_Position: {x: 440, y: 450, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1445811024750606540} + m_Position: {x: 320, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5821149053454519540} + m_Position: {x: 730, y: 290, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 4599713188957750583} @@ -183,6 +246,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 4611771482754873255} + - {fileID: 4130911658247162747} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -198,6 +262,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &4130911658247162747 +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: 5821149053454519540} + 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!1101 &4599713188957750583 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -248,6 +337,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &5821149053454519540 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Crouch + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3591481035464551782} + 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: 8cbccfeb301f1914ba4d53ea93cbd993, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &8508362208506447737 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Animation/Player/Player_Crouch.anim b/Assets/Animation/Player/Player_Crouch.anim new file mode 100644 index 0000000000..cdb345fb49 --- /dev/null +++ b/Assets/Animation/Player/Player_Crouch.anim @@ -0,0 +1,80 @@ +%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: Player_Crouch + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 5a1cef7e9c9ed034da742d0e08ea786a, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: a9c37448b62c0d149aced6ded9e44e4a, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 7d37e1dfeba60ea4a8803c12675079b6, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: a9e9e74909b5a0947a093069d6a017cc, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: b5b9f448600b9aa4daa1d9fd5069a764, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + 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.51666665 + 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/Animation/Player/Player_Crouch.anim.meta b/Assets/Animation/Player/Player_Crouch.anim.meta new file mode 100644 index 0000000000..6043e37185 --- /dev/null +++ b/Assets/Animation/Player/Player_Crouch.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8cbccfeb301f1914ba4d53ea93cbd993 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Player/Player_Walk.anim b/Assets/Animation/Player/Player_Walk.anim new file mode 100644 index 0000000000..f2bc5c3850 --- /dev/null +++ b/Assets/Animation/Player/Player_Walk.anim @@ -0,0 +1,110 @@ +%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: Player_Walk + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: b38d007a84ef48c45b4026b9be16e76b, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: ec7d0c8717f6c3b428b3f277de956cea, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 929a47e4f89792c4aa28ae41634348c3, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 8fc33c704bf75524facc770a491ffd2f, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: d4e307e6ea003de4bbc0d28256e6a032, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 6b56e26ee92b18e4aa775af7975a9b17, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: d0505258bec70ac40b68ec355beaff76, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: 9d98f19e89667e84fa99ae2d2c01ad66, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: 365443fb827749b4db671a5038ff79b1, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: c865be1abede9a048a20b6904ee2219a, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: bb0dc30aba14f084b9f20cd11d7f59d8, type: 3} + - time: 0.56666666 + value: {fileID: 21300000, guid: f3e9585781fa62242a3018cd3dd529dd, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: b38254315edf5904d987dbca58a71ca0, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: 82bf8779d3330604c9cec1bf2f219329, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: bcd729389571a684eb0951d69a67af73, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 21300000, guid: b38d007a84ef48c45b4026b9be16e76b, type: 3} + - {fileID: 21300000, guid: ec7d0c8717f6c3b428b3f277de956cea, type: 3} + - {fileID: 21300000, guid: 929a47e4f89792c4aa28ae41634348c3, type: 3} + - {fileID: 21300000, guid: 8fc33c704bf75524facc770a491ffd2f, type: 3} + - {fileID: 21300000, guid: d4e307e6ea003de4bbc0d28256e6a032, type: 3} + - {fileID: 21300000, guid: 6b56e26ee92b18e4aa775af7975a9b17, type: 3} + - {fileID: 21300000, guid: d0505258bec70ac40b68ec355beaff76, type: 3} + - {fileID: 21300000, guid: 9d98f19e89667e84fa99ae2d2c01ad66, type: 3} + - {fileID: 21300000, guid: 365443fb827749b4db671a5038ff79b1, type: 3} + - {fileID: 21300000, guid: c865be1abede9a048a20b6904ee2219a, type: 3} + - {fileID: 21300000, guid: bb0dc30aba14f084b9f20cd11d7f59d8, type: 3} + - {fileID: 21300000, guid: f3e9585781fa62242a3018cd3dd529dd, type: 3} + - {fileID: 21300000, guid: b38254315edf5904d987dbca58a71ca0, type: 3} + - {fileID: 21300000, guid: 82bf8779d3330604c9cec1bf2f219329, type: 3} + - {fileID: 21300000, guid: bcd729389571a684eb0951d69a67af73, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.71666664 + 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: [] From a30de7ec4102eb73b0cfb8f2d4d3f4d76aa9379a Mon Sep 17 00:00:00 2001 From: Akash Date: Tue, 29 Oct 2024 01:00:22 +0530 Subject: [PATCH 04/11] Add animation and collision --- Assets/Animation/Player/Player.controller | 54 +- Assets/Scenes/GameScene.unity | 171 +++ Assets/Script.meta | 8 + Assets/Script/PlayerController.cs | 27 + Assets/Script/PlayerController.cs.meta | 11 + .../Layouts/CurrentMaximizeLayout.dwlt | 1016 +++++++++++++++++ UserSettings/Layouts/default-2021.dwlt | 181 +-- 7 files changed, 1359 insertions(+), 109 deletions(-) create mode 100644 Assets/Script.meta create mode 100644 Assets/Script/PlayerController.cs create mode 100644 Assets/Script/PlayerController.cs.meta create mode 100644 UserSettings/Layouts/CurrentMaximizeLayout.dwlt diff --git a/Assets/Animation/Player/Player.controller b/Assets/Animation/Player/Player.controller index 6629a38d90..22b26c4ff2 100644 --- a/Assets/Animation/Player/Player.controller +++ b/Assets/Animation/Player/Player.controller @@ -52,6 +52,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-4904421164483582186 +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: 5821149053454519540} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-3591481035464551782 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -170,7 +195,7 @@ AnimatorController: m_AnimatorParameters: - m_Name: Speed m_Type: 1 - m_DefaultFloat: 0.3 + m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} @@ -226,6 +251,7 @@ AnimatorStateMachine: m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 4599713188957750583} + - {fileID: -4904421164483582186} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -246,7 +272,6 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 4611771482754873255} - - {fileID: 4130911658247162747} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -262,31 +287,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &4130911658247162747 -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: 5821149053454519540} - 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!1101 &4599713188957750583 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 5ca4e4557e..3ef900af7f 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -123,6 +123,117 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &13219308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 13219311} + - component: {fileID: 13219310} + - component: {fileID: 13219312} + m_Layer: 0 + m_Name: Platform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &13219310 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13219308} + 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: 21300004, guid: 6e1db66fc7e57884380659e0a55351f0, 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!4 &13219311 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13219308} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.05, y: -0.6, z: 0} + m_LocalScale: {x: 5, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &13219312 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13219308} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.10829738} + 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: 0.78340524} + m_EdgeRadius: 0 --- !u!1 &808561118 GameObject: m_ObjectHideFlags: 0 @@ -303,3 +414,63 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!50 &3637415917317152295 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3637415917317152293} + 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_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &3637415917317152298 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3637415917317152293} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.030628681, y: 0.96984535} + 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: 0.4444108, y: 2.0643733} + m_EdgeRadius: 0 +--- !u!114 &3637415917317152299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3637415917317152293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0e43ed7f46b5ff48b64210831c5d92e, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 3637415917317152294} diff --git a/Assets/Script.meta b/Assets/Script.meta new file mode 100644 index 0000000000..47723e29d1 --- /dev/null +++ b/Assets/Script.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba9f29a9303151d4293531d035a00990 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/PlayerController.cs b/Assets/Script/PlayerController.cs new file mode 100644 index 0000000000..ddc919ce4c --- /dev/null +++ b/Assets/Script/PlayerController.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerController : MonoBehaviour +{ + public Animator animator; + private void Update() + { + float speed = Input.GetAxis("Horizontal"); + animator.SetFloat("Speed", Mathf.Abs(speed)); + + Vector2 scale = transform.localScale; + + if (speed < 0) + { + scale.x = -1 * Mathf.Abs(scale.x); + } + + if (speed > 0) + { + scale.x = Mathf.Abs(scale.x); + } + + transform.localScale = scale; + } +} diff --git a/Assets/Script/PlayerController.cs.meta b/Assets/Script/PlayerController.cs.meta new file mode 100644 index 0000000000..7719e9c5c0 --- /dev/null +++ b/Assets/Script/PlayerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a0e43ed7f46b5ff48b64210831c5d92e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt new file mode 100644 index 0000000000..dadf43cec8 --- /dev/null +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -0,0 +1,1016 @@ +%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: 1920 + height: 987 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 4662 +--- !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: 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: -6423792434712278376, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 271 + y: 73 + width: 1269 + height: 646 + 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: 1269, y: 625} + 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: -634.5 + m_HBaseRangeMax: 634.5 + m_VBaseRangeMin: -312.5 + m_VBaseRangeMax: 312.5 + 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: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1269 + height: 625 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 634.5, y: 312.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -634.5 + y: -312.5 + width: 1269 + height: 625 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1269, y: 646} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 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: 1542 + height: 987 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 4663 +--- !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: 1542 + height: 667 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 4664 +--- !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: 271 + height: 667 + 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: 7966133145522015247, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73 + width: 270 + height: 646 + 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: 2af8ffff + m_LastClickedID: -2006 + m_ExpandedIDs: 26fbffff2afbffff42fbffff + 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 &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: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 271 + y: 0 + width: 1271 + height: 667 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 8} + - {fileID: 2} + - {fileID: 9} + m_Selected: 1 + m_LastSelected: 0 +--- !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: 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: 2593428753322112591, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 271 + y: 73 + width: 1269 + height: 646 + 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: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - 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 + - 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 + - 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 + - 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 + - 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: 0 + layout: 4 + - 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 + - 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: 2 + layout: 4 + - 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: 3 + layout: 4 + - 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 + - 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 + - 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 + - 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: 7 + layout: 4 + - 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: 8 + layout: 4 + - 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: 9 + layout: 4 + - 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: 10 + layout: 4 + - 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 + - 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 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 3 + layout: 4 + 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.25563425, y: -0.100489125, z: 0.00381052} + speed: 2 + m_Value: {x: 0.25563425, y: -0.100489125, z: 0.00381052} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 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: 0.55, y: 0.55} + 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.9722444 + speed: 2 + m_Value: 1.9722444 + 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 &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: -1673928668082335149, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 271 + y: 73 + width: 1269 + height: 646 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: -6 + e10: 0 + e11: 1 + e12: 0 + e13: -6.5 + 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: 7434f485d873f8a48943a9802f164a62, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, + 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: 0 + 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: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 667 + width: 1542 + height: 320 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 11} + m_Panes: + - {fileID: 11} + - {fileID: 12} + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 2 +--- !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: -5467254957812901981, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 740 + width: 1541 + height: 299 + 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_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Script + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Script + m_LastFoldersGridSize: -1 + m_LastProjectPath: D:\GitFiles\2D-Platformer-Game + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 807c0000 + m_LastClickedID: 31872 + m_ExpandedIDs: 000000005c510000405300004453000046530000485300004a5300004c5300004e53000050530000 + 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_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000005c510000405300004453000046530000485300004a5300004c5300004e53000050530000 + 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: 2af8ffff + m_LastClickedInstanceID: -2006 + m_HadKeyboardFocusLastEvent: 0 + 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: 0} + 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: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2249 + y: 726.5 + width: 920 + height: 250 + 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: -8166618308981325432, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 740 + width: 1541 + height: 299 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -2006 +--- !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: 1542 + y: 0 + width: 378 + height: 987 + 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 +--- !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: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1542 + y: 73 + width: 377 + height: 966 + 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} diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 89eed70f74..66f66b366d 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 1037 m_ShowMode: 4 - m_Title: Project + m_Title: Animator 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: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 638 + controlID: 1649 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,9 +64,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1542 + x: 1373 y: 0 - width: 378 + width: 547 height: 987 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -92,8 +92,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 271 - height: 469 + width: 242 + height: 488 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} @@ -117,9 +117,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 469 - width: 1542 - height: 518 + y: 488 + width: 1373 + height: 499 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 14} @@ -219,12 +219,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1542 + width: 1373 height: 987 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 639 + controlID: 1650 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -244,12 +244,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1542 - height: 469 + width: 1373 + height: 488 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 640 + controlID: 1651 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -260,24 +260,24 @@ 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: serializedVersion: 2 - x: 271 + x: 242 y: 0 - width: 1271 - height: 469 - m_MinSize: {x: 202, y: 221} + width: 1131 + height: 488 + m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 17} - {fileID: 18} - {fileID: 12} - m_Selected: 0 - m_LastSelected: 0 + m_Selected: 2 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -299,10 +299,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2113 - y: 73 - width: 902 - height: 435 + x: -31758 + y: -31970 + width: 1129 + height: 467 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -311,6 +311,7 @@ MonoBehaviour: m_ViewTransforms: m_KeySerializationHelper: - {fileID: -6816357663705468446, guid: db82b9ab52ae914499846db5a12cb966, type: 2} + - {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, type: 2} m_ValueSerializationHelper: - e00: 1 e01: 0 @@ -328,11 +329,27 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 + - e00: 0.8016126 + e01: 0 + e02: 0 + e03: -26.164032 + e10: 0 + e11: 0.8016126 + e12: 0 + e13: -45.493805 + 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: db82b9ab52ae914499846db5a12cb966, + m_AnimatorController: {fileID: 9100000, guid: 7434f485d873f8a48943a9802f164a62, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -6816357663705468446, guid: db82b9ab52ae914499846db5a12cb966, + - m_Target: {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} @@ -343,7 +360,7 @@ MonoBehaviour: m_MiniTool: 0 m_LockTracker: m_IsLocked: 0 - m_CurrentEditor: 0 + m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 --- !u!114 &13 @@ -368,9 +385,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 542 - width: 1541 - height: 497 + y: 561 + width: 1372 + height: 478 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -378,7 +395,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -16390 + m_LastSelectedObjectID: 20802 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -401,9 +418,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 542 - width: 1541 - height: 497 + y: 561 + width: 1372 + height: 478 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -422,36 +439,36 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch m_LastFoldersGridSize: -1 m_LastProjectPath: D:\GitFiles\2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 98980000 - m_LastClickedID: 39064 - m_ExpandedIDs: 00000000787a000092980000949800009a980000b0980000b8980000ba980000c8980000de980000ea98000062990000 + scrollPos: {x: 0, y: 130} + m_SelectedIDs: 8a5e0000 + m_LastClickedID: 24202 + m_ExpandedIDs: 00000000d6510000d8510000da510000dc510000de510000e0510000e2510000e4510000e6510000e8510000ea5100001a520000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Resources - m_OriginalName: Resources + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 39062 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -465,7 +482,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000787a000092980000a4980000b0980000b8980000ba980000c8980000de980000ea980000 + m_ExpandedIDs: 00000000d6510000d8510000da510000dc510000de510000e0510000e2510000e4510000e6510000e8510000ea510000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -493,7 +510,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000 + m_ExpandedInstanceIDs: c62300004c510000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -509,7 +526,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -520,7 +537,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 + m_DirectoriesAreaWidth: 328 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -542,9 +559,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3462 + x: 3293 y: 73 - width: 377 + width: 546 height: 966 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -587,8 +604,8 @@ MonoBehaviour: serializedVersion: 2 x: 1920 y: 73 - width: 270 - height: 448 + width: 241 + height: 467 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -597,9 +614,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 80990000 + m_SelectedIDs: 80d3ffff m_LastClickedID: 0 - m_ExpandedIDs: 70b3ffff18b4ffff56b4ffff02c7ffff26fbffff42fbffff + m_ExpandedIDs: 26fbffff2afbffff42fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -644,10 +661,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2191 + x: 271 y: 73 width: 1269 - height: 448 + height: 646 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -907,7 +924,7 @@ MonoBehaviour: m_Position: m_Target: {x: 4.8259006, y: 2.647788, z: 0.06623819} speed: 2 - m_Value: {x: 5.0221496, y: 2.6810832, z: 0.06488717} + m_Value: {x: 0.07478237, y: 1.8668708, z: -1.0500523} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -960,7 +977,7 @@ MonoBehaviour: m_Size: m_Target: 2.867148 speed: 2 - m_Value: 3.0022492 + m_Value: 2.9683285 m_Ortho: m_Target: 1 speed: 2 @@ -1006,10 +1023,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 507 - y: 94 - width: 1532 - height: 790 + x: 2162 + y: 73 + width: 1129 + height: 467 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1021,10 +1038,10 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1532, y: 769} + m_TargetSize: {x: 1129, y: 446} m_TextureFilterMode: 0 m_TextureHideFlags: 61 - m_RenderIMGUI: 0 + m_RenderIMGUI: 1 m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 @@ -1036,10 +1053,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -766 - m_HBaseRangeMax: 766 - m_VBaseRangeMin: -384.5 - m_VBaseRangeMax: 384.5 + m_HBaseRangeMin: -564.5 + m_HBaseRangeMax: 564.5 + m_VBaseRangeMin: -223 + m_VBaseRangeMax: 223 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1057,23 +1074,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1532 - height: 769 + width: 1129 + height: 446 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 384.5} + m_Translation: {x: 564.5, y: 223} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -766 - y: -384.5 - width: 1532 - height: 769 + x: -564.5 + y: -223 + width: 1129 + height: 446 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1532, y: 790} + m_LastWindowPixelSize: {x: 1129, y: 467} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1100,10 +1117,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 740 - width: 1541 - height: 299 + x: 1920 + y: 561 + width: 1372 + height: 478 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default From 42dfa106a76ad0c932b2f1e4c46380b02f93287c Mon Sep 17 00:00:00 2001 From: Akash Date: Tue, 29 Oct 2024 22:59:26 +0530 Subject: [PATCH 05/11] 29/10 --- Assets/Animation/Player/Player.controller | 88 +- Assets/Animation/Player/Player_Crouch.anim | 2 +- Assets/Scenes/GameScene.unity | 3 +- Assets/Script/PlayerController.cs | 78 +- UserSettings/Layouts/default-2021.dwlt | 947 ++++++++++----------- 5 files changed, 581 insertions(+), 537 deletions(-) diff --git a/Assets/Animation/Player/Player.controller b/Assets/Animation/Player/Player.controller index 22b26c4ff2..86569ec465 100644 --- a/Assets/Animation/Player/Player.controller +++ b/Assets/Animation/Player/Player.controller @@ -27,32 +27,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-6028510316402985611 -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: 3076586384186182164} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.65116274 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-4904421164483582186 +--- !u!1101 &-6959311710714356503 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -77,7 +52,7 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-3591481035464551782 +--- !u!1101 &-6028510316402985611 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -85,9 +60,9 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: Crouch - m_EventTreshold: 0 + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.25 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3076586384186182164} m_Solo: 0 @@ -96,13 +71,13 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.516129 + m_ExitTime: 0.65116274 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-2859379486156080382 +--- !u!1101 &-4819478421963247867 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -113,9 +88,6 @@ AnimatorStateTransition: - m_ConditionMode: 4 m_ConditionEvent: Speed m_EventTreshold: 0.25 - - m_ConditionMode: 2 - m_ConditionEvent: Jump - m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3076586384186182164} m_Solo: 0 @@ -141,8 +113,8 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -2859379486156080382} - {fileID: 8508362208506447737} + - {fileID: -4819478421963247867} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -199,14 +171,14 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} - - m_Name: Jump + - m_Name: Crouch m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} - - m_Name: Crouch - m_Type: 4 + - m_Name: Jump + m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 @@ -241,7 +213,7 @@ AnimatorStateMachine: m_Position: {x: 570, y: 140, z: 0} - serializedVersion: 1 m_State: {fileID: -2004796894295772469} - m_Position: {x: 440, y: 450, z: 0} + m_Position: {x: 390, y: 430, z: 0} - serializedVersion: 1 m_State: {fileID: -1445811024750606540} m_Position: {x: 320, y: 130, z: 0} @@ -251,7 +223,7 @@ AnimatorStateMachine: m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 4599713188957750583} - - {fileID: -4904421164483582186} + - {fileID: -6959311710714356503} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -337,6 +309,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &4783490127651285038 +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: 3076586384186182164} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5821149053454519540 AnimatorState: serializedVersion: 6 @@ -348,7 +345,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -3591481035464551782} + - {fileID: 4783490127651285038} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -375,19 +372,16 @@ AnimatorStateTransition: - m_ConditionMode: 3 m_ConditionEvent: Speed m_EventTreshold: 0.25 - - m_ConditionMode: 2 - m_ConditionEvent: Jump - m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -7572164546155968529} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.5945946 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animation/Player/Player_Crouch.anim b/Assets/Animation/Player/Player_Crouch.anim index cdb345fb49..2f6e98271b 100644 --- a/Assets/Animation/Player/Player_Crouch.anim +++ b/Assets/Animation/Player/Player_Crouch.anim @@ -63,7 +63,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 3ef900af7f..30220f027a 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -473,4 +473,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a0e43ed7f46b5ff48b64210831c5d92e, type: 3} m_Name: m_EditorClassIdentifier: - animator: {fileID: 3637415917317152294} + playerAnimator: {fileID: 3637415917317152294} + boxCol: {fileID: 3637415917317152298} diff --git a/Assets/Script/PlayerController.cs b/Assets/Script/PlayerController.cs index ddc919ce4c..918eac52e4 100644 --- a/Assets/Script/PlayerController.cs +++ b/Assets/Script/PlayerController.cs @@ -4,24 +4,90 @@ public class PlayerController : MonoBehaviour { - public Animator animator; + [SerializeField] private Animator playerAnimator; + [SerializeField] private BoxCollider2D boxCol; + + //Collider Variables + private Vector2 boxColInitSize; + private Vector2 boxColInitOffset; + + public float speed; + + private void Start() + { + //Fetching initial collider properties + boxColInitSize = boxCol.size; + boxColInitOffset = boxCol.offset; + } private void Update() { - float speed = Input.GetAxis("Horizontal"); - animator.SetFloat("Speed", Mathf.Abs(speed)); + float horizontal = Input.GetAxis("Horizontal"); + PlayMovementAnimation(horizontal); + + float VerticalInput = Input.GetAxis("Vertical"); + + PlayJumpAnimation(VerticalInput); + + if (Input.GetKey(KeyCode.LeftControl)) + { + Crouch(true); + } + else + { + Crouch(false); + } + + } + + private void PlayMovementAnimation(float horizontal) + { + + playerAnimator.SetFloat("Speed", Mathf.Abs(horizontal)); Vector2 scale = transform.localScale; - if (speed < 0) + if (horizontal < 0) { scale.x = -1 * Mathf.Abs(scale.x); } - if (speed > 0) + if (horizontal > 0) { scale.x = Mathf.Abs(scale.x); } - transform.localScale = scale; } + + public void Crouch(bool crouch) + { + if (crouch == true) + { + float offX = -0.12494f; //Offset X + float offY = 0.61027f; //Offset Y + + float sizeX = 0.8923f; //Size X + float sizeY = 1.3452f; //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 + { + //Reset collider to initial values + boxCol.size = boxColInitSize; + boxCol.offset = boxColInitOffset; + } + + //Play Crouch animation + playerAnimator.SetBool("Crouch", crouch); + } + + public void PlayJumpAnimation(float vertical) + { + if (vertical > 0) + { + playerAnimator.SetTrigger("Jump"); + } + } } diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 66f66b366d..f745bb0f24 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,13 +14,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 1920 + x: 0 y: 43 width: 1920 height: 1037 m_ShowMode: 4 - m_Title: Animator - m_RootView: {fileID: 6} + m_Title: Scene + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 @@ -33,22 +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 + y: 0 width: 1920 - height: 987 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 1649 + height: 1037 + 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 @@ -58,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: 1373 + x: 0 y: 0 - width: 547 - height: 987 - 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 + width: 1920 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: Default2 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -84,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: 242 - height: 488 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 + y: 1017 + width: 1920 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -110,25 +104,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + 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: 488 - width: 1373 - height: 499 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - - {fileID: 19} - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 2 + y: 30 + width: 1920 + height: 987 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 4954 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,25 +129,22 @@ 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: 1920 - height: 1037 - 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: 1475 + height: 987 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 4918 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,19 +154,22 @@ 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: 1920 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: Default2 + width: 1475 + height: 446 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 4919 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,18 +179,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: 1017 - width: 1920 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} + y: 0 + width: 260 + height: 446 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -209,22 +205,24 @@ 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: 260 y: 0 - width: 1373 - height: 987 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 1650 + width: 1215 + height: 446 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + - {fileID: 12} + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -234,22 +232,26 @@ 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: 1373 - height: 488 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 1651 + y: 446 + width: 1475 + height: 541 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 16} + - {fileID: 17} + - {fileID: 18} + - {fileID: 15} + m_Selected: 2 + m_LastSelected: 3 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -260,24 +262,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: 242 + x: 1475 y: 0 - width: 1131 - height: 488 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + width: 445 + height: 987 + 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 @@ -286,302 +286,93 @@ 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: -1673928668082335149, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: -31758 - y: -31970 - width: 1129 - height: 467 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: -6816357663705468446, guid: db82b9ab52ae914499846db5a12cb966, type: 2} - - {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, type: 2} - m_ValueSerializationHelper: - - 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 - - e00: 0.8016126 - e01: 0 - e02: 0 - e03: -26.164032 - e10: 0 - e11: 0.8016126 - e12: 0 - e13: -45.493805 - 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: 7434f485d873f8a48943a9802f164a62, - type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, - 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: 12015, 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: -8166618308981325432, guid: 0000000000000000d000000000000000, + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 - y: 561 - width: 1372 - height: 478 + x: 260 + y: 73 + width: 1213 + height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: 20802 ---- !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: -5467254957812901981, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1920 - y: 561 - width: 1372 - height: 478 - 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_VersionControlStates: [] - m_SoftLockControlStates: [] - 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_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch - m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\GitFiles\2D-Platformer-Game - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 130} - m_SelectedIDs: 8a5e0000 - m_LastClickedID: 24202 - m_ExpandedIDs: 00000000d6510000d8510000da510000dc510000de510000e0510000e2510000e4510000e6510000e8510000ea5100001a520000 - 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: 00000000d6510000d8510000da510000dc510000de510000e0510000e2510000e4510000e6510000e8510000ea510000 - 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: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c62300004c510000 - 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_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: 328 ---- !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: -2667387946076563598, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 3293 - y: 73 - width: 546 - height: 966 - 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 + 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: 1213, y: 404} + 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: -606.5 + m_HBaseRangeMax: 606.5 + m_VBaseRangeMin: -202 + m_VBaseRangeMax: 202 + 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: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1213 + height: 404 + m_Scale: {x: 1.8818951, y: 1.8818947} + m_Translation: {x: 606.50037, y: 202.00026} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -322.2817 + y: -107.33877 + width: 644.56305 + height: 214.67726 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1213, y: 425} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -602,10 +393,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 + x: 0 y: 73 - width: 241 - height: 467 + width: 259 + height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -614,7 +405,7 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 80d3ffff + m_SelectedIDs: m_LastClickedID: 0 m_ExpandedIDs: 26fbffff2afbffff42fbffff m_RenameOverlay: @@ -640,7 +431,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -661,10 +452,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 271 + x: 260 y: 73 - width: 1269 - height: 646 + width: 1213 + height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -922,9 +713,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 4.8259006, y: 2.647788, z: 0.06623819} + m_Target: {x: 0.47517174, y: 1.0542016, z: 0.007215727} speed: 2 - m_Value: {x: 0.07478237, y: 1.8668708, z: -1.0500523} + m_Value: {x: 0.47517174, y: 1.0542016, z: 0.007215727} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -975,9 +766,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.867148 + m_Target: 2.3519382 speed: 2 - m_Value: 2.9683285 + m_Value: 2.3519382 m_Ortho: m_Target: 1 speed: 2 @@ -1002,7 +793,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1010,93 +801,209 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2162 - y: 73 - width: 1129 - height: 467 + x: 0 + y: 519 + width: 1474 + height: 520 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: 1129, y: 446} - 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: -564.5 - m_HBaseRangeMax: 564.5 - m_VBaseRangeMin: -223 - m_VBaseRangeMax: 223 - 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: 1129 - height: 446 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 564.5, y: 223} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -564.5 - y: -223 - width: 1129 - height: 446 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1129, y: 467} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &19 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: -6 + e10: 0 + e11: 1 + e12: 0 + e13: -49 + 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: 7434f485d873f8a48943a9802f164a62, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, + 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: -5467254957812901981, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 519 + width: 1474 + height: 520 + 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_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Animation/Player + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Animation/Player + m_LastFoldersGridSize: -1 + m_LastProjectPath: D:\GitFiles\2D-Platformer-Game + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 80530000 + m_LastClickedID: 21376 + m_ExpandedIDs: 000000005c510000405300004453000046530000485300004a5300004c5300004e5300005053000052530000 + 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_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000005c510000405300004453000046530000485300004a5300004c5300004e53000050530000 + 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: 12530000 + m_LastClickedInstanceID: 21266 + 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: 0} + 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} @@ -1117,12 +1024,88 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 - y: 561 - width: 1372 - height: 478 + x: 2249 + y: 726.5 + width: 920 + height: 250 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: 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: -8166618308981325432, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 519 + width: 1474 + height: 520 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 20810 +--- !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: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1475 + y: 73 + width: 444 + height: 966 + 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 c25028415129c20a5837be150ccd81dd653a9b07 Mon Sep 17 00:00:00 2001 From: Akash Date: Wed, 30 Oct 2024 01:05:39 +0530 Subject: [PATCH 06/11] 30/10 --- Assets/Animation/Player/Player.controller | 8 +- Assets/Prefabs/Player.prefab | 87 ++++++ Assets/Scenes/GameScene.unity | 100 +----- Assets/Script/PlayerController.cs | 45 ++- .../Layouts/CurrentMaximizeLayout.dwlt | 294 +++++++++--------- 5 files changed, 283 insertions(+), 251 deletions(-) diff --git a/Assets/Animation/Player/Player.controller b/Assets/Animation/Player/Player.controller index 86569ec465..d372653694 100644 --- a/Assets/Animation/Player/Player.controller +++ b/Assets/Animation/Player/Player.controller @@ -88,6 +88,9 @@ AnimatorStateTransition: - m_ConditionMode: 4 m_ConditionEvent: Speed m_EventTreshold: 0.25 + - m_ConditionMode: 2 + m_ConditionEvent: Jump + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3076586384186182164} m_Solo: 0 @@ -178,7 +181,7 @@ AnimatorController: m_DefaultBool: 0 m_Controller: {fileID: 0} - m_Name: Jump - m_Type: 9 + m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 @@ -372,6 +375,9 @@ AnimatorStateTransition: - m_ConditionMode: 3 m_ConditionEvent: Speed m_EventTreshold: 0.25 + - m_ConditionMode: 2 + m_ConditionEvent: Jump + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -7572164546155968529} m_Solo: 0 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 82ae51b8ed..02577adb3c 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -10,6 +10,10 @@ GameObject: m_Component: - component: {fileID: 3679550784524527443} - component: {fileID: 5743594417375524470} + - component: {fileID: 3637415917317152295} + - component: {fileID: 3637415917317152298} + - component: {fileID: 3637415917317152294} + - component: {fileID: 3637415917317152299} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -84,3 +88,86 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!50 &3637415917317152295 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119708198454689196} + 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_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &3637415917317152298 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119708198454689196} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.030628681, y: 0.96984535} + 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: 0.4444108, y: 2.0643733} + m_EdgeRadius: 0 +--- !u!95 &3637415917317152294 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119708198454689196} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7434f485d873f8a48943a9802f164a62, 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 +--- !u!114 &3637415917317152299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119708198454689196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0e43ed7f46b5ff48b64210831c5d92e, type: 3} + m_Name: + m_EditorClassIdentifier: + playerAnimator: {fileID: 3637415917317152294} + boxCol: {fileID: 3637415917317152298} + speed: 4 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 30220f027a..88be169f2a 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -202,7 +202,7 @@ Transform: m_GameObject: {fileID: 13219308} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.05, y: -0.6, z: 0} - m_LocalScale: {x: 5, y: 1, z: 1} + m_LocalScale: {x: 30, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -330,6 +330,16 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 3637415917317152295, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_Constraints + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3637415917317152299, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: jump + value: 10 + objectReference: {fileID: 0} - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} propertyPath: m_RootOrder @@ -387,91 +397,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} ---- !u!1 &3637415917317152293 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 119708198454689196, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, - type: 3} - m_PrefabInstance: {fileID: 3637415917317152292} - m_PrefabAsset: {fileID: 0} ---- !u!95 &3637415917317152294 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3637415917317152293} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 7434f485d873f8a48943a9802f164a62, 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 ---- !u!50 &3637415917317152295 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3637415917317152293} - 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_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!61 &3637415917317152298 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3637415917317152293} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.030628681, y: 0.96984535} - 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: 0.4444108, y: 2.0643733} - m_EdgeRadius: 0 ---- !u!114 &3637415917317152299 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3637415917317152293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a0e43ed7f46b5ff48b64210831c5d92e, type: 3} - m_Name: - m_EditorClassIdentifier: - playerAnimator: {fileID: 3637415917317152294} - boxCol: {fileID: 3637415917317152298} diff --git a/Assets/Script/PlayerController.cs b/Assets/Script/PlayerController.cs index 918eac52e4..e462ea0e5f 100644 --- a/Assets/Script/PlayerController.cs +++ b/Assets/Script/PlayerController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -12,21 +13,23 @@ public class PlayerController : MonoBehaviour private Vector2 boxColInitOffset; public float speed; + public float jump; + public Rigidbody2D rigidbody2D; private void Start() { //Fetching initial collider properties boxColInitSize = boxCol.size; boxColInitOffset = boxCol.offset; + + rigidbody2D = GetComponent(); } private void Update() { float horizontal = Input.GetAxis("Horizontal"); - PlayMovementAnimation(horizontal); - - float VerticalInput = Input.GetAxis("Vertical"); - - PlayJumpAnimation(VerticalInput); + float vertical = Input.GetAxisRaw("Jump"); + PlayerMovementAnimation(horizontal, vertical); + PlayerMovement(horizontal, vertical); if (Input.GetKey(KeyCode.LeftControl)) { @@ -39,9 +42,22 @@ private void Update() } - private void PlayMovementAnimation(float horizontal) + private void PlayerMovement(float horizontal, float vertical) { + Vector2 pos = transform.position; + pos.x += speed * horizontal * Time.deltaTime; + + transform.position = pos; + + if (vertical > 0) + { + rigidbody2D.AddForce(new Vector2(0, jump), ForceMode2D.Force); + } + + } + private void PlayerMovementAnimation(float horizontal, float vertical) + { playerAnimator.SetFloat("Speed", Mathf.Abs(horizontal)); Vector2 scale = transform.localScale; @@ -56,6 +72,15 @@ private void PlayMovementAnimation(float horizontal) scale.x = Mathf.Abs(scale.x); } transform.localScale = scale; + + if (vertical > 0) + { + playerAnimator.SetBool("Jump", true); + } + else + { + playerAnimator.SetBool("Jump", false); + } } public void Crouch(bool crouch) @@ -82,12 +107,4 @@ public void Crouch(bool crouch) //Play Crouch animation playerAnimator.SetBool("Crouch", crouch); } - - public void PlayJumpAnimation(float vertical) - { - if (vertical > 0) - { - playerAnimator.SetTrigger("Jump"); - } - } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index dadf43cec8..14f20b7810 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 4662 + controlID: 72 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 271 + x: 260 y: 73 - width: 1269 - height: 646 + width: 1213 + height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -61,7 +61,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1269, y: 625} + m_TargetSize: {x: 1213, y: 404} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -76,10 +76,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -634.5 - m_HBaseRangeMax: 634.5 - m_VBaseRangeMin: -312.5 - m_VBaseRangeMax: 312.5 + m_HBaseRangeMin: -606.5 + m_HBaseRangeMax: 606.5 + m_VBaseRangeMin: -202 + m_VBaseRangeMax: 202 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -97,23 +97,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1269 - height: 625 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 634.5, y: 312.5} + width: 1213 + height: 404 + m_Scale: {x: 1.8818951, y: 1.8818947} + m_Translation: {x: 606.50037, y: 202.00026} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -634.5 - y: -312.5 - width: 1269 - height: 625 + x: -322.2817 + y: -107.33877 + width: 644.56305 + height: 214.67726 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1269, y: 646} + m_LastWindowPixelSize: {x: 1213, y: 425} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -133,17 +133,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 10} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1542 + width: 1475 height: 987 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 4663 + controlID: 73 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,12 +163,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1542 - height: 667 + width: 1475 + height: 446 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 4664 + controlID: 74 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -186,8 +186,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 271 - height: 667 + width: 260 + height: 446 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -218,8 +218,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 270 - height: 646 + width: 259 + height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -228,25 +228,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2af8ffff - m_LastClickedID: -2006 - m_ExpandedIDs: 26fbffff2afbffff42fbffff + m_SelectedIDs: 067b0000 + m_LastClickedID: 31494 + m_ExpandedIDs: 12f3ffff2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Platform + m_OriginalName: Platform m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 31494 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -269,17 +269,16 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 271 + x: 260 y: 0 - width: 1271 - height: 667 + width: 1215 + height: 446 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} - {fileID: 2} - - {fileID: 9} m_Selected: 1 m_LastSelected: 0 --- !u!114 &8 @@ -303,10 +302,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 271 + x: 260 y: 73 - width: 1269 - height: 646 + width: 1213 + height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -564,9 +563,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.25563425, y: -0.100489125, z: 0.00381052} + m_Target: {x: 0.2636291, y: -0.272861, z: -0.025885496} speed: 2 - m_Value: {x: 0.25563425, y: -0.100489125, z: 0.00381052} + m_Value: {x: 0.2636291, y: -0.272861, z: -0.025885496} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -617,9 +616,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1.9722444 + m_Target: 5.140021 speed: 2 - m_Value: 1.9722444 + m_Value: 5.140021 m_Ortho: m_Target: 1 speed: 2 @@ -645,74 +644,6 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 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: -1673928668082335149, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 271 - y: 73 - width: 1269 - height: 646 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, type: 2} - m_ValueSerializationHelper: - - e00: 1 - e01: 0 - e02: 0 - e03: -6 - e10: 0 - e11: 1 - e12: 0 - e13: -6.5 - 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: 7434f485d873f8a48943a9802f164a62, - type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, - 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: 0 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -722,25 +653,26 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: AnimatorControllerTool m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 667 - width: 1542 - height: 320 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 11} + y: 446 + width: 1475 + height: 541 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} m_Panes: + - {fileID: 10} - {fileID: 11} - {fileID: 12} - {fileID: 13} - m_Selected: 0 - m_LastSelected: 2 ---- !u!114 &11 + m_Selected: 3 + m_LastSelected: 0 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -762,9 +694,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 740 - width: 1541 - height: 299 + y: 519 + width: 1474 + height: 520 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -796,9 +728,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 807c0000 - m_LastClickedID: 31872 - m_ExpandedIDs: 000000005c510000405300004453000046530000485300004a5300004c5300004e53000050530000 + m_SelectedIDs: 9c530000 + m_LastClickedID: 21404 + m_ExpandedIDs: 0000000070510000585300005a5300005c5300005e5300006053000062530000645300006653000092530000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -826,7 +758,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005c510000405300004453000046530000485300004a5300004c5300004e53000050530000 + m_ExpandedIDs: 0000000070510000585300005a5300005c5300005e53000060530000625300006453000066530000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -851,9 +783,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 2af8ffff - m_LastClickedInstanceID: -2006 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -882,7 +814,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -912,7 +844,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &13 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -934,9 +866,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 740 - width: 1541 - height: 299 + y: 519 + width: 1474 + height: 520 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -944,7 +876,75 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -2006 + m_LastSelectedObjectID: 31512 +--- !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: 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: -1673928668082335149, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 519 + width: 1474 + height: 520 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: -6 + e10: 0 + e11: 1 + e12: 0 + e13: -49 + 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: 7434f485d873f8a48943a9802f164a62, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, + 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 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -960,12 +960,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1542 + x: 1475 y: 0 - width: 378 + width: 445 height: 987 - 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: 15} m_Panes: - {fileID: 15} @@ -992,9 +992,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1542 + x: 1475 y: 73 - width: 377 + width: 444 height: 966 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: From 7c10e4ec4297f8f64e9aed3fb9bf565cc6a7e0bd Mon Sep 17 00:00:00 2001 From: Akash Date: Sat, 2 Nov 2024 00:21:01 +0530 Subject: [PATCH 07/11] jump --- Assets/Scenes/GameScene.unity | 13 +- Assets/Script/PlayerController.cs | 26 +- ProjectSettings/TagManager.asset | 3 +- UserSettings/Layouts/default-2021.dwlt | 343 ++++++++++++++----------- 4 files changed, 223 insertions(+), 162 deletions(-) diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 88be169f2a..bce5b11537 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -136,11 +136,11 @@ GameObject: - component: {fileID: 13219312} m_Layer: 0 m_Name: Platform - m_TagString: Untagged + m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!212 &13219310 SpriteRenderer: m_ObjectHideFlags: 0 @@ -202,7 +202,7 @@ Transform: m_GameObject: {fileID: 13219308} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.05, y: -0.6, z: 0} - m_LocalScale: {x: 30, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -330,6 +330,11 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 3637415917317152295, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_Mass + value: 10 + objectReference: {fileID: 0} - target: {fileID: 3637415917317152295, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} propertyPath: m_Constraints @@ -338,7 +343,7 @@ PrefabInstance: - target: {fileID: 3637415917317152299, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} propertyPath: jump - value: 10 + value: 100 objectReference: {fileID: 0} - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} diff --git a/Assets/Script/PlayerController.cs b/Assets/Script/PlayerController.cs index e462ea0e5f..231d297462 100644 --- a/Assets/Script/PlayerController.cs +++ b/Assets/Script/PlayerController.cs @@ -13,7 +13,8 @@ public class PlayerController : MonoBehaviour private Vector2 boxColInitOffset; public float speed; - public float jump; + public float jumpForce; + public bool isGrounded = false; public Rigidbody2D rigidbody2D; private void Start() @@ -27,6 +28,7 @@ private void Start() private void Update() { float horizontal = Input.GetAxis("Horizontal"); + //float vertical = Input.GetAxisRaw("Jump"); float vertical = Input.GetAxisRaw("Jump"); PlayerMovementAnimation(horizontal, vertical); PlayerMovement(horizontal, vertical); @@ -49,9 +51,9 @@ private void PlayerMovement(float horizontal, float vertical) transform.position = pos; - if (vertical > 0) + if (vertical > 0 && isGrounded) { - rigidbody2D.AddForce(new Vector2(0, jump), ForceMode2D.Force); + rigidbody2D.AddForce(new Vector2(0, jumpForce), ForceMode2D.Force); } } @@ -73,7 +75,7 @@ private void PlayerMovementAnimation(float horizontal, float vertical) } transform.localScale = scale; - if (vertical > 0) + if (vertical > 0 && isGrounded) { playerAnimator.SetBool("Jump", true); } @@ -107,4 +109,20 @@ public void Crouch(bool crouch) //Play Crouch animation playerAnimator.SetBool("Crouch", crouch); } + + private void OnCollisionStay2D(Collision2D other) + { + if (other.transform.tag == "platform") + { + isGrounded = true; + } + } + + private void OnCollisionExit2D(Collision2D other) + { + if (other.transform.tag == "platform") + { + isGrounded = false; + } + } } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a7840e..f22224b533 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - platform layers: - Default - TransparentFX diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index f745bb0f24..b66c95f946 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 1037 m_ShowMode: 4 - m_Title: Scene + m_Title: Tile Palette m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -73,7 +73,7 @@ MonoBehaviour: height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: Default2 + m_LastLoadedLayoutName: --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 4954 + controlID: 91 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1475 + width: 1211 height: 987 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 4918 + controlID: 92 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1475 - height: 446 + width: 1211 + height: 586 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 4919 + controlID: 93 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,13 +187,13 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 260 - height: 446 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + width: 214 + height: 586 + 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 @@ -206,23 +206,23 @@ 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 + x: 214 y: 0 - width: 1215 - height: 446 + width: 997 + height: 586 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 14} - - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 + - {fileID: 15} + - {fileID: 13} + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -233,24 +233,24 @@ 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: serializedVersion: 2 x: 0 - y: 446 - width: 1475 - height: 541 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + y: 586 + width: 1211 + height: 401 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} - {fileID: 17} - {fileID: 18} - - {fileID: 15} - m_Selected: 2 + - {fileID: 19} + m_Selected: 0 m_LastSelected: 3 --- !u!114 &11 MonoBehaviour: @@ -262,23 +262,60 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: GridPaintPaletteWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1475 + x: 1211 y: 0 - width: 445 + width: 709 height: 987 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} + m_MinSize: {x: 241, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 19} - m_Selected: 0 + - {fileID: 20} + - {fileID: 12} + m_Selected: 1 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: 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: 1211 + y: 73 + width: 708 + height: 966 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_PreviewResizer: + m_CachedPref: 288 + m_ControlHash: 1964396721 + m_PrefName: Preview_TilemapBrushInspector + m_Palette: {fileID: 1802729619418120, guid: 3ae57766a9addd249a15631321e5e018, type: 3} + m_DrawGridGizmo: 1 + m_DrawGizmos: 0 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -299,10 +336,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 260 + x: 214 y: 73 - width: 1213 - height: 425 + width: 995 + height: 565 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -314,7 +351,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1213, y: 404} + m_TargetSize: {x: 995, y: 544} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -329,10 +366,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -606.5 - m_HBaseRangeMax: 606.5 - m_VBaseRangeMin: -202 - m_VBaseRangeMax: 202 + m_HBaseRangeMin: -497.5 + m_HBaseRangeMax: 497.5 + m_VBaseRangeMin: -272 + m_VBaseRangeMax: 272 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -341,7 +378,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 @@ -350,29 +387,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1213 - height: 404 - m_Scale: {x: 1.8818951, y: 1.8818947} - m_Translation: {x: 606.50037, y: 202.00026} + width: 995 + height: 544 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 497.5, y: 272} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -322.2817 - y: -107.33877 - width: 644.56305 - height: 214.67726 + x: -497.5 + y: -272 + width: 995 + height: 544 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1213, y: 425} + m_LastWindowPixelSize: {x: 995, y: 565} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -395,8 +432,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 259 - height: 425 + width: 213 + height: 565 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -405,9 +442,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: ea530000 m_LastClickedID: 0 - m_ExpandedIDs: 26fbffff2afbffff42fbffff + m_ExpandedIDs: 2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -423,7 +460,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -431,7 +468,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} @@ -713,9 +750,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.47517174, y: 1.0542016, z: 0.007215727} + m_Target: {x: 0.2636291, y: -0.272861, z: -0.025885496} speed: 2 - m_Value: {x: 0.47517174, y: 1.0542016, z: 0.007215727} + m_Value: {x: 0.2636291, y: -0.272861, z: -0.025885496} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -766,9 +803,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.3519382 + m_Target: 5.140021 speed: 2 - m_Value: 2.3519382 + m_Value: 5.140021 m_Ortho: m_Target: 1 speed: 2 @@ -793,74 +830,6 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 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: 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: -1673928668082335149, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 519 - width: 1474 - height: 520 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, type: 2} - m_ValueSerializationHelper: - - e00: 1 - e01: 0 - e02: 0 - e03: -6 - e10: 0 - e11: 1 - e12: 0 - e13: -49 - 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: 7434f485d873f8a48943a9802f164a62, - type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, - 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 @@ -883,16 +852,16 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 519 - width: 1474 - height: 520 + y: 659 + width: 1210 + height: 380 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 m_SearchFilter: - m_NameFilter: + m_NameFilter: tilesetrock m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] @@ -904,22 +873,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Animation/Player + - Assets m_Globs: [] - m_OriginalText: + m_OriginalText: tilesetrock m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Animation/Player + - Assets m_LastFoldersGridSize: -1 m_LastProjectPath: D:\GitFiles\2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 80530000 - m_LastClickedID: 21376 - m_ExpandedIDs: 000000005c510000405300004453000046530000485300004a5300004c5300004e5300005053000052530000 + m_SelectedIDs: 56530000 + m_LastClickedID: 21334 + m_ExpandedIDs: 000000006e51000056530000585300005a5300005c5300005e530000605300006253000064530000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -947,7 +916,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005c510000405300004453000046530000485300004a5300004c5300004e53000050530000 + m_ExpandedIDs: 000000006e51000056530000585300005a5300005c5300005e530000605300006253000064530000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -972,8 +941,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 12530000 - m_LastClickedInstanceID: 21266 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -1065,8 +1034,76 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 20810 + m_LastSelectedObjectID: 31512 --- !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: 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: -1673928668082335149, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 659 + width: 1210 + height: 380 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: -6 + e10: 0 + e11: 1 + e12: 0 + e13: -49 + 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: 7434f485d873f8a48943a9802f164a62, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 1994824599072847136, guid: 7434f485d873f8a48943a9802f164a62, + 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 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1087,9 +1124,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1475 + x: 1211 y: 73 - width: 444 + width: 708 height: 966 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: From 4fc2c85fcb556ce726ee79f94063ef763389691c Mon Sep 17 00:00:00 2001 From: Akash Date: Sat, 2 Nov 2024 02:31:13 +0530 Subject: [PATCH 08/11] tile map --- Assets/Game Assets/Art/TileMap.meta | 8 + .../Art/TileMap/FloatingRocks.prefab | 580 +++++++++ .../Art/TileMap/FloatingRocks.prefab.meta | 7 + .../Art/TileMap/FloatingRocks_0.asset | 36 + .../Art/TileMap/FloatingRocks_0.asset.meta | 8 + .../Art/TileMap/FloatingRocks_1.asset | 36 + .../Art/TileMap/FloatingRocks_1.asset.meta | 8 + .../Art/TileMap/FloatingRocks_10.asset | 36 + .../Art/TileMap/FloatingRocks_10.asset.meta | 8 + .../Art/TileMap/FloatingRocks_11.asset | 36 + .../Art/TileMap/FloatingRocks_11.asset.meta | 8 + .../Art/TileMap/FloatingRocks_12.asset | 36 + .../Art/TileMap/FloatingRocks_12.asset.meta | 8 + .../Art/TileMap/FloatingRocks_13.asset | 36 + .../Art/TileMap/FloatingRocks_13.asset.meta | 8 + .../Art/TileMap/FloatingRocks_14.asset | 36 + .../Art/TileMap/FloatingRocks_14.asset.meta | 8 + .../Art/TileMap/FloatingRocks_15.asset | 36 + .../Art/TileMap/FloatingRocks_15.asset.meta | 8 + .../Art/TileMap/FloatingRocks_16.asset | 36 + .../Art/TileMap/FloatingRocks_16.asset.meta | 8 + .../Art/TileMap/FloatingRocks_17.asset | 36 + .../Art/TileMap/FloatingRocks_17.asset.meta | 8 + .../Art/TileMap/FloatingRocks_18.asset | 36 + .../Art/TileMap/FloatingRocks_18.asset.meta | 8 + .../Art/TileMap/FloatingRocks_19.asset | 36 + .../Art/TileMap/FloatingRocks_19.asset.meta | 8 + .../Art/TileMap/FloatingRocks_2.asset | 36 + .../Art/TileMap/FloatingRocks_2.asset.meta | 8 + .../Art/TileMap/FloatingRocks_21.asset | 36 + .../Art/TileMap/FloatingRocks_21.asset.meta | 8 + .../Art/TileMap/FloatingRocks_3.asset | 36 + .../Art/TileMap/FloatingRocks_3.asset.meta | 8 + .../Art/TileMap/FloatingRocks_4.asset | 36 + .../Art/TileMap/FloatingRocks_4.asset.meta | 8 + .../Art/TileMap/FloatingRocks_5.asset | 36 + .../Art/TileMap/FloatingRocks_5.asset.meta | 8 + .../Art/TileMap/FloatingRocks_6.asset | 36 + .../Art/TileMap/FloatingRocks_6.asset.meta | 8 + .../Art/TileMap/FloatingRocks_7.asset | 36 + .../Art/TileMap/FloatingRocks_7.asset.meta | 8 + .../Art/TileMap/FloatingRocks_8.asset | 36 + .../Art/TileMap/FloatingRocks_8.asset.meta | 8 + .../Art/TileMap/FloatingRocks_9.asset | 36 + .../Art/TileMap/FloatingRocks_9.asset.meta | 8 + .../Game Assets/Art/TileMap/GroundTiles.meta | 8 + .../TileMap/GroundTiles/GroundPalette.prefab | 260 ++++ .../GroundTiles/GroundPalette.prefab.meta | 7 + .../Art/TileMap/GroundTiles/WallTile02.asset | 36 + .../TileMap/GroundTiles/WallTile02.asset.meta | 8 + .../Art/TileMap/GroundTiles/WallTileEnd.asset | 36 + .../GroundTiles/WallTileEnd.asset.meta | 8 + .../TileMap/GroundTiles/WallTileEnd_2.asset | 36 + .../GroundTiles/WallTileEnd_2.asset.meta | 8 + Assets/Game Assets/Art/TileMap/Rubble_0.asset | 36 + .../Art/TileMap/Rubble_0.asset.meta | 8 + Assets/Game Assets/Art/TileMap/Rubble_1.asset | 36 + .../Art/TileMap/Rubble_1.asset.meta | 8 + Assets/Game Assets/Art/TileMap/Rubble_2.asset | 36 + .../Art/TileMap/Rubble_2.asset.meta | 8 + Assets/Game Assets/Art/TileMap/Rubble_3.asset | 36 + .../Art/TileMap/Rubble_3.asset.meta | 8 + Assets/Game Assets/Art/TileMap/Rubble_4.asset | 36 + .../Art/TileMap/Rubble_4.asset.meta | 8 + Assets/Game Assets/Art/TileMap/Rubble_5.asset | 36 + .../Art/TileMap/Rubble_5.asset.meta | 8 + Assets/Prefabs/Player.prefab | 3 + Assets/Scenes/GameScene.unity | 1123 ++++++++++++++++- Assets/Script/FollowCamera.cs | 20 + Assets/Script/FollowCamera.cs.meta | 11 + Assets/Script/LevelOverController.cs | 14 + Assets/Script/LevelOverController.cs.meta | 11 + Assets/Script/PlayerController.cs | 2 +- 73 files changed, 3371 insertions(+), 3 deletions(-) create mode 100644 Assets/Game Assets/Art/TileMap.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks.prefab create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks.prefab.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_0.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_0.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_1.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_1.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_10.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_10.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_11.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_11.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_12.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_12.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_13.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_13.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_14.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_14.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_15.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_15.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_16.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_16.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_17.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_17.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_18.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_18.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_19.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_19.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_2.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_2.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_21.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_21.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_3.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_3.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_4.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_4.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_5.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_5.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_6.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_6.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_7.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_7.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_8.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_8.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_9.asset create mode 100644 Assets/Game Assets/Art/TileMap/FloatingRocks_9.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/GroundTiles.meta create mode 100644 Assets/Game Assets/Art/TileMap/GroundTiles/GroundPalette.prefab create mode 100644 Assets/Game Assets/Art/TileMap/GroundTiles/GroundPalette.prefab.meta create mode 100644 Assets/Game Assets/Art/TileMap/GroundTiles/WallTile02.asset create mode 100644 Assets/Game Assets/Art/TileMap/GroundTiles/WallTile02.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd.asset create mode 100644 Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd_2.asset create mode 100644 Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd_2.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_0.asset create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_0.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_1.asset create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_1.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_2.asset create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_2.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_3.asset create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_3.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_4.asset create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_4.asset.meta create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_5.asset create mode 100644 Assets/Game Assets/Art/TileMap/Rubble_5.asset.meta create mode 100644 Assets/Script/FollowCamera.cs create mode 100644 Assets/Script/FollowCamera.cs.meta create mode 100644 Assets/Script/LevelOverController.cs create mode 100644 Assets/Script/LevelOverController.cs.meta diff --git a/Assets/Game Assets/Art/TileMap.meta b/Assets/Game Assets/Art/TileMap.meta new file mode 100644 index 0000000000..97db43d5ae --- /dev/null +++ b/Assets/Game Assets/Art/TileMap.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa8e2e0dfc2a48d4d9e84804f8e39331 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks.prefab b/Assets/Game Assets/Art/TileMap/FloatingRocks.prefab new file mode 100644 index 0000000000..c818c5b5ea --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks.prefab @@ -0,0 +1,580 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2677626783270187390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7017595370879447147} + - component: {fileID: 8737069370547105754} + m_Layer: 0 + m_Name: FloatingRocks + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7017595370879447147 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2677626783270187390} + 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: 2493272206630376298} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &8737069370547105754 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2677626783270187390} + m_Enabled: 1 + m_CellSize: {x: 1.3125, y: 1.7304688, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!1 &5510010936352632461 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2493272206630376298} + - component: {fileID: 6620329136363277105} + - component: {fileID: 7557213140345095866} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2493272206630376298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5510010936352632461} + 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: 7017595370879447147} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &6620329136363277105 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5510010936352632461} + m_Enabled: 1 + m_Tiles: + - first: {x: -1, y: -6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 25 + m_TileSpriteIndex: 25 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 26 + m_TileSpriteIndex: 26 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 23 + m_TileSpriteIndex: 23 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 24 + m_TileSpriteIndex: 24 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 21 + m_TileSpriteIndex: 21 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 22 + m_TileSpriteIndex: 22 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 20 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 15 + m_TileSpriteIndex: 15 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 16 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 18 + m_TileSpriteIndex: 18 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 19 + m_TileSpriteIndex: 19 + 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: 10 + m_TileSpriteIndex: 10 + 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: 11 + m_TileSpriteIndex: 11 + 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: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 13 + m_TileSpriteIndex: 13 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + 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: 5 + m_TileSpriteIndex: 5 + 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: 6 + m_TileSpriteIndex: 6 + 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: 7 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 8 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 9 + m_TileSpriteIndex: 9 + 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 + - first: {x: 1, y: 1, 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: 2, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 4 + m_TileSpriteIndex: 4 + 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: 42fbf39857ea2f245be7fefff1380800, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 680c3af14b2cd7948955f0572964e2c5, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: aaa33bd7efacc194d9b45dfecc50dd34, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 144e818edc248bd47a3b5b0953258d16, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 4a7d97a966cc503448c8b6205fd461f3, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: a2dbcb493397db148afa29497bc72192, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 0af47ca82572a5d448a90b68399184cb, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: db69e7218c7c4b54fbf26e183ed96392, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 117a471e9d2ee8f4f9faa78eb5e7119e, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 626adaf2b216d2d479be068c7c74e6b8, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 6c3568dbd7b43944c86dcee74d4fe8fe, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 169e5bc46d50e1d48828c6a409288734, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 50995ea8eafc0b54e8b7e8b029024444, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 9a91c3c416b28f244a3cffa055a17c71, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 031682a72f7923e43a79bec2a137e189, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 031eb6ad0c7b9fe46956dad60a5ee60f, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 35800c32c9dc0464a875dd2328bf4242, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 7d27e21096eeaca40abffe41ffeead1e, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 51e936089e6a8af4a9f706e219854427, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: a46b65b48e946ff49a4b0bc4abad917f, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 2ba6068c47304e5478719b5a5dcc6f8c, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 08ddd6988f36cc741b3212c748c3c478, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: f7932c649f5081744990608154cf6f15, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 1717719eb798d604cbc8fcb708b36018, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 493cbafd6ae4f1e4097c5b73d0e358db, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: b899a079e08dfd644ae52bbaaa3cb1f9, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 18a24f159a26ba34180e0652be10b835, type: 2} + m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300002, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300004, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300006, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300008, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300010, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300012, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300014, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300016, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300018, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300020, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300022, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300024, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300026, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300028, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300030, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300032, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300034, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300036, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300038, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300040, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: d76850a37a3b5144093c7940ae562b4b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300002, guid: d76850a37a3b5144093c7940ae562b4b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300004, guid: d76850a37a3b5144093c7940ae562b4b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300006, guid: d76850a37a3b5144093c7940ae562b4b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300008, guid: d76850a37a3b5144093c7940ae562b4b, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300010, guid: d76850a37a3b5144093c7940ae562b4b, type: 3} + m_TileMatrixArray: + - m_RefCount: 27 + 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: 27 + 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: -6, z: 0} + m_Size: {x: 5, y: 8, 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 &7557213140345095866 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5510010936352632461} + 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.15625, y: 0.36523438, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!114 &7261523738242851163 +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/Game Assets/Art/TileMap/FloatingRocks.prefab.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks.prefab.meta new file mode 100644 index 0000000000..fee9998ec3 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6a2fc155ffb96f74a9635b9c4b865e02 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_0.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_0.asset new file mode 100644 index 0000000000..a669d7b6b1 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_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: FloatingRocks_0 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_0.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_0.asset.meta new file mode 100644 index 0000000000..a6f779210a --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_0.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42fbf39857ea2f245be7fefff1380800 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_1.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_1.asset new file mode 100644 index 0000000000..6bd8d6a313 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_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: FloatingRocks_1 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300002, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_1.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_1.asset.meta new file mode 100644 index 0000000000..ad6934861e --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 680c3af14b2cd7948955f0572964e2c5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_10.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_10.asset new file mode 100644 index 0000000000..7dfe4b91dd --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_10.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: FloatingRocks_10 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300020, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_10.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_10.asset.meta new file mode 100644 index 0000000000..32215961ff --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_10.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c3568dbd7b43944c86dcee74d4fe8fe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_11.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_11.asset new file mode 100644 index 0000000000..e252ba25e1 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_11.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: FloatingRocks_11 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300022, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_11.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_11.asset.meta new file mode 100644 index 0000000000..065d2d7455 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_11.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 169e5bc46d50e1d48828c6a409288734 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_12.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_12.asset new file mode 100644 index 0000000000..13bf3051a4 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_12.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: FloatingRocks_12 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300024, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_12.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_12.asset.meta new file mode 100644 index 0000000000..b55d11315d --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_12.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50995ea8eafc0b54e8b7e8b029024444 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_13.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_13.asset new file mode 100644 index 0000000000..926d2e8f82 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_13.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: FloatingRocks_13 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300026, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_13.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_13.asset.meta new file mode 100644 index 0000000000..61c68305fe --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_13.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a91c3c416b28f244a3cffa055a17c71 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_14.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_14.asset new file mode 100644 index 0000000000..41f042d3ee --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_14.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: FloatingRocks_14 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300028, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_14.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_14.asset.meta new file mode 100644 index 0000000000..e29f3c7d9b --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_14.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 031682a72f7923e43a79bec2a137e189 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_15.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_15.asset new file mode 100644 index 0000000000..2de5641127 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_15.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: FloatingRocks_15 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300030, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_15.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_15.asset.meta new file mode 100644 index 0000000000..9720255ffe --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_15.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 031eb6ad0c7b9fe46956dad60a5ee60f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_16.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_16.asset new file mode 100644 index 0000000000..f695ebc36d --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_16.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: FloatingRocks_16 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300032, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_16.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_16.asset.meta new file mode 100644 index 0000000000..661400b379 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_16.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35800c32c9dc0464a875dd2328bf4242 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_17.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_17.asset new file mode 100644 index 0000000000..90b9bde41b --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_17.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: FloatingRocks_17 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300034, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_17.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_17.asset.meta new file mode 100644 index 0000000000..3a6bda77a2 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_17.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7d27e21096eeaca40abffe41ffeead1e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_18.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_18.asset new file mode 100644 index 0000000000..dfac0b23e2 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_18.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: FloatingRocks_18 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300036, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_18.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_18.asset.meta new file mode 100644 index 0000000000..fd8b9f7bdb --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_18.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51e936089e6a8af4a9f706e219854427 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_19.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_19.asset new file mode 100644 index 0000000000..beb4d7c8a7 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_19.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: FloatingRocks_19 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300038, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_19.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_19.asset.meta new file mode 100644 index 0000000000..80933ea973 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_19.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a46b65b48e946ff49a4b0bc4abad917f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_2.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_2.asset new file mode 100644 index 0000000000..ad4d6bb1e4 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_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: FloatingRocks_2 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300004, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_2.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_2.asset.meta new file mode 100644 index 0000000000..ffa436fe89 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aaa33bd7efacc194d9b45dfecc50dd34 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_21.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_21.asset new file mode 100644 index 0000000000..cec2d912dd --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_21.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: FloatingRocks_21 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300040, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_21.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_21.asset.meta new file mode 100644 index 0000000000..17d65f7a64 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_21.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ba6068c47304e5478719b5a5dcc6f8c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_3.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_3.asset new file mode 100644 index 0000000000..9b8ce4c0d0 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_3.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: FloatingRocks_3 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300006, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_3.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_3.asset.meta new file mode 100644 index 0000000000..9915a303d0 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 144e818edc248bd47a3b5b0953258d16 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_4.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_4.asset new file mode 100644 index 0000000000..063da5c17c --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_4.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: FloatingRocks_4 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300008, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_4.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_4.asset.meta new file mode 100644 index 0000000000..8cad87d73e --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a7d97a966cc503448c8b6205fd461f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_5.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_5.asset new file mode 100644 index 0000000000..665d0b1fec --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_5.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: FloatingRocks_5 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300010, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_5.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_5.asset.meta new file mode 100644 index 0000000000..0c40f4d433 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2dbcb493397db148afa29497bc72192 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_6.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_6.asset new file mode 100644 index 0000000000..e310aa7c3b --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_6.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: FloatingRocks_6 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300012, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_6.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_6.asset.meta new file mode 100644 index 0000000000..d414bde914 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_6.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0af47ca82572a5d448a90b68399184cb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_7.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_7.asset new file mode 100644 index 0000000000..c70b8edd3c --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_7.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: FloatingRocks_7 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300014, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_7.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_7.asset.meta new file mode 100644 index 0000000000..fd9cc1210c --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_7.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db69e7218c7c4b54fbf26e183ed96392 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_8.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_8.asset new file mode 100644 index 0000000000..4a5bab1ad7 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_8.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: FloatingRocks_8 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300016, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_8.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_8.asset.meta new file mode 100644 index 0000000000..71c5080d48 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_8.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 117a471e9d2ee8f4f9faa78eb5e7119e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/FloatingRocks_9.asset b/Assets/Game Assets/Art/TileMap/FloatingRocks_9.asset new file mode 100644 index 0000000000..ef4e47dd07 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_9.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: FloatingRocks_9 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300018, guid: e49210b2eba9a5442b6fe40c91776cd2, 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/TileMap/FloatingRocks_9.asset.meta b/Assets/Game Assets/Art/TileMap/FloatingRocks_9.asset.meta new file mode 100644 index 0000000000..a98c9d6a58 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/FloatingRocks_9.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 626adaf2b216d2d479be068c7c74e6b8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/GroundTiles.meta b/Assets/Game Assets/Art/TileMap/GroundTiles.meta new file mode 100644 index 0000000000..2dcc2d2f6b --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/GroundTiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fceba4d7e97a99242926739e6b7ec2db +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/GroundTiles/GroundPalette.prefab b/Assets/Game Assets/Art/TileMap/GroundTiles/GroundPalette.prefab new file mode 100644 index 0000000000..b7c7947ba3 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/GroundTiles/GroundPalette.prefab @@ -0,0 +1,260 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1948808301031289073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1801680129888846289} + - component: {fileID: 819060884648935658} + m_Layer: 0 + m_Name: GroundPalette + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1801680129888846289 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948808301031289073} + 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: 9015534402701159964} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &819060884648935658 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948808301031289073} + 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!1 &7611523334244171209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9015534402701159964} + - component: {fileID: 4041256273731754453} + - component: {fileID: 8319233625191738011} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9015534402701159964 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7611523334244171209} + 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: 1801680129888846289} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &4041256273731754453 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7611523334244171209} + m_Enabled: 1 + m_Tiles: + - first: {x: -3, 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: -2, 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: -1, 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 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 0ef7887db3e55a94698872efe0bd81d9, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: fb2cfab2a8656e443bae6acaf3c1acae, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} + m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + m_TileMatrixArray: + - m_RefCount: 2 + 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: 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_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: -3, y: -1, z: 0} + m_Size: {x: 3, y: 3, 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 &8319233625191738011 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7611523334244171209} + 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!114 &1999908227050746999 +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/Game Assets/Art/TileMap/GroundTiles/GroundPalette.prefab.meta b/Assets/Game Assets/Art/TileMap/GroundTiles/GroundPalette.prefab.meta new file mode 100644 index 0000000000..65146d474f --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/GroundTiles/GroundPalette.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b229f7884b990504e88e9964382e8222 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/GroundTiles/WallTile02.asset b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTile02.asset new file mode 100644 index 0000000000..298e7bcd9e --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/GroundTiles/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/Game Assets/Art/TileMap/GroundTiles/WallTile02.asset.meta b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTile02.asset.meta new file mode 100644 index 0000000000..d3bf7f1de5 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTile02.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ef7887db3e55a94698872efe0bd81d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd.asset b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd.asset new file mode 100644 index 0000000000..b89c0f1ff5 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/GroundTiles/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/Game Assets/Art/TileMap/GroundTiles/WallTileEnd.asset.meta b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd.asset.meta new file mode 100644 index 0000000000..711c8b6d60 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb2cfab2a8656e443bae6acaf3c1acae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd_2.asset b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd_2.asset new file mode 100644 index 0000000000..c62aa68879 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd_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: WallTileEnd_2 + 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/Game Assets/Art/TileMap/GroundTiles/WallTileEnd_2.asset.meta b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd_2.asset.meta new file mode 100644 index 0000000000..2cf7904a65 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/GroundTiles/WallTileEnd_2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68cac801bc1b15449a230432c3b65254 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/Rubble_0.asset b/Assets/Game Assets/Art/TileMap/Rubble_0.asset new file mode 100644 index 0000000000..c00785093d --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_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: Rubble_0 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: d76850a37a3b5144093c7940ae562b4b, 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/TileMap/Rubble_0.asset.meta b/Assets/Game Assets/Art/TileMap/Rubble_0.asset.meta new file mode 100644 index 0000000000..de88775d44 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_0.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08ddd6988f36cc741b3212c748c3c478 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/Rubble_1.asset b/Assets/Game Assets/Art/TileMap/Rubble_1.asset new file mode 100644 index 0000000000..91ad678c98 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_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: Rubble_1 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300002, guid: d76850a37a3b5144093c7940ae562b4b, 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/TileMap/Rubble_1.asset.meta b/Assets/Game Assets/Art/TileMap/Rubble_1.asset.meta new file mode 100644 index 0000000000..a1efa77035 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7932c649f5081744990608154cf6f15 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/Rubble_2.asset b/Assets/Game Assets/Art/TileMap/Rubble_2.asset new file mode 100644 index 0000000000..408e075ca7 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_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: Rubble_2 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300004, guid: d76850a37a3b5144093c7940ae562b4b, 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/TileMap/Rubble_2.asset.meta b/Assets/Game Assets/Art/TileMap/Rubble_2.asset.meta new file mode 100644 index 0000000000..f0ea7d4d18 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1717719eb798d604cbc8fcb708b36018 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/Rubble_3.asset b/Assets/Game Assets/Art/TileMap/Rubble_3.asset new file mode 100644 index 0000000000..51d29482ab --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_3.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: Rubble_3 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300006, guid: d76850a37a3b5144093c7940ae562b4b, 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/TileMap/Rubble_3.asset.meta b/Assets/Game Assets/Art/TileMap/Rubble_3.asset.meta new file mode 100644 index 0000000000..7bac3f2384 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 493cbafd6ae4f1e4097c5b73d0e358db +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/Rubble_4.asset b/Assets/Game Assets/Art/TileMap/Rubble_4.asset new file mode 100644 index 0000000000..320e0edabe --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_4.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: Rubble_4 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300008, guid: d76850a37a3b5144093c7940ae562b4b, 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/TileMap/Rubble_4.asset.meta b/Assets/Game Assets/Art/TileMap/Rubble_4.asset.meta new file mode 100644 index 0000000000..db58b449f8 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b899a079e08dfd644ae52bbaaa3cb1f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMap/Rubble_5.asset b/Assets/Game Assets/Art/TileMap/Rubble_5.asset new file mode 100644 index 0000000000..ab77a790af --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_5.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: Rubble_5 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300010, guid: d76850a37a3b5144093c7940ae562b4b, 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/TileMap/Rubble_5.asset.meta b/Assets/Game Assets/Art/TileMap/Rubble_5.asset.meta new file mode 100644 index 0000000000..2f31539b30 --- /dev/null +++ b/Assets/Game Assets/Art/TileMap/Rubble_5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18a24f159a26ba34180e0652be10b835 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 02577adb3c..1cdfb75b1c 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -171,3 +171,6 @@ MonoBehaviour: playerAnimator: {fileID: 3637415917317152294} boxCol: {fileID: 3637415917317152298} speed: 4 + jumpForce: 0 + isGrounded: 0 + rigidbody2D: {fileID: 0} diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index bce5b11537..5f154aec3b 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -245,6 +245,7 @@ GameObject: - component: {fileID: 808561121} - component: {fileID: 808561120} - component: {fileID: 808561119} + - component: {fileID: 808561122} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -270,7 +271,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 1, g: 0.79525965, b: 0.5235849, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -310,7 +311,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 808561118} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -318,6 +319,1114 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &808561122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808561118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8236dc4102eeda147aee01f212d10746, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 1387161689} + smoothSpeed: 0.125 + offset: {x: 0, y: 0, z: -10} +--- !u!1 &1109184603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1109184605} + - component: {fileID: 1109184604} + m_Layer: 0 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!156049354 &1109184604 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109184603} + 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 &1109184605 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109184603} + 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: 1336012572} + - {fileID: 1191852074} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1191852073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1191852074} + - component: {fileID: 1191852076} + - component: {fileID: 1191852075} + m_Layer: 0 + m_Name: BackgroundRocks + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1191852074 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191852073} + 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: 1109184605} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1191852075 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191852073} + 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.28515625, y: 0.32421875, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1191852076 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1191852073} + m_Enabled: 1 + m_Tiles: + - first: {x: 6, y: -2, 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: 11, y: -1, 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: 24, y: -1, 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: 3, 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: 12, 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: -3, y: 1, 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: 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 + - first: {x: 16, 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: 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: 12, y: 4, 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: 17, y: 4, 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: 28, y: 4, 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: -5, y: 5, 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: 2 + m_Data: {fileID: 11400000, guid: 42fbf39857ea2f245be7fefff1380800, type: 2} + - m_RefCount: 4 + m_Data: {fileID: 11400000, guid: db69e7218c7c4b54fbf26e183ed96392, type: 2} + - m_RefCount: 7 + m_Data: {fileID: 11400000, guid: b899a079e08dfd644ae52bbaaa3cb1f9, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: 21300000, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 4 + m_Data: {fileID: 21300014, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + - m_RefCount: 7 + m_Data: {fileID: 21300008, guid: d76850a37a3b5144093c7940ae562b4b, type: 3} + m_TileMatrixArray: + - m_RefCount: 13 + 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: 13 + 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.69803923} + m_Origin: {x: -5, y: -2, z: 0} + m_Size: {x: 34, y: 8, 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 &1336012571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1336012572} + - component: {fileID: 1336012575} + - component: {fileID: 1336012574} + - component: {fileID: 1336012573} + m_Layer: 0 + m_Name: GroundTilemap + m_TagString: platform + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1336012572 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336012571} + 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: 1109184605} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!19719996 &1336012573 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336012571} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0 +--- !u!483693784 &1336012574 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336012571} + 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 &1336012575 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1336012571} + m_Enabled: 1 + m_Tiles: + - first: {x: 5, y: -4, 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: 6, y: -4, 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: 7, y: -4, 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: -4, 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: -4, 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: 13, y: -4, 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: 14, y: -4, 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: 15, y: -4, 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: 20, y: -4, 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: 21, y: -4, 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: 22, y: -4, 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: 23, y: -4, 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: 27, y: -4, 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: 28, y: -4, 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: 29, y: -4, 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: 30, y: -4, 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: 31, y: -4, 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: 5, 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: 15, 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: 20, 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: 31, 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: -6, y: -2, 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: -5, y: -2, 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: -4, y: -2, 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: -3, y: -2, 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: -2, y: -2, 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: -1, y: -2, 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: -2, 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: 1, y: -2, 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: 2, y: -2, 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: 3, y: -2, 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: 4, y: -2, 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: 5, y: -2, 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: 15, y: -2, 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: 16, y: -2, 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: 17, y: -2, 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: 18, y: -2, 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: 19, y: -2, 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: 20, y: -2, 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: 31, y: -2, 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: -6, 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: 31, 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: -6, 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: 31, 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: -6, 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: 31, 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: -6, y: 2, 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: 31, y: 2, 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: -6, 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: -6, y: 4, 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: 31, y: 4, 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: -6, y: 5, 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: 31, y: 5, 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: 31, y: 6, 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: 54 + m_Data: {fileID: 11400000, guid: 0ef7887db3e55a94698872efe0bd81d9, type: 2} + m_TileSpriteArray: + - m_RefCount: 54 + m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + m_TileMatrixArray: + - m_RefCount: 54 + 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: 54 + 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: -6, y: -5, z: 0} + m_Size: {x: 39, y: 12, 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!4 &1387161689 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + m_PrefabInstance: {fileID: 3637415917317152292} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2117892165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2117892167} + - component: {fileID: 2117892166} + m_Layer: 0 + m_Name: levelComplete + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &2117892166 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117892165} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + 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 &2117892167 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117892165} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 29.64, y: -1.56, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3637415917317152292 PrefabInstance: m_ObjectHideFlags: 0 @@ -345,6 +1454,11 @@ PrefabInstance: propertyPath: jump value: 100 objectReference: {fileID: 0} + - target: {fileID: 3637415917317152299, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: jumpForce + value: 150 + objectReference: {fileID: 0} - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} propertyPath: m_RootOrder @@ -400,5 +1514,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5743594417375524470, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} diff --git a/Assets/Script/FollowCamera.cs b/Assets/Script/FollowCamera.cs new file mode 100644 index 0000000000..eeb58b7bd5 --- /dev/null +++ b/Assets/Script/FollowCamera.cs @@ -0,0 +1,20 @@ +using UnityEngine; + +public class FollowCamera : MonoBehaviour +{ + public Transform target; // The target that the camera follows + public float smoothSpeed = 0.125f; // Smoothness of the camera movement + public Vector3 offset; // Offset position of the camera relative to the target + + void LateUpdate() + { + if (target != null) + { + Vector3 desiredPosition = target.position + offset; + Vector3 smoothedPosition = Vector3.Lerp(transform.position, desiredPosition, smoothSpeed); + transform.position = smoothedPosition; + + transform.LookAt(target); // Optionally, make the camera look at the target + } + } +} diff --git a/Assets/Script/FollowCamera.cs.meta b/Assets/Script/FollowCamera.cs.meta new file mode 100644 index 0000000000..658575eeb9 --- /dev/null +++ b/Assets/Script/FollowCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8236dc4102eeda147aee01f212d10746 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/LevelOverController.cs b/Assets/Script/LevelOverController.cs new file mode 100644 index 0000000000..e76d42827b --- /dev/null +++ b/Assets/Script/LevelOverController.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LevelOverController : MonoBehaviour +{ + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.gameObject.GetComponent()) + { + Debug.Log("Level Finish"); + } + } +} diff --git a/Assets/Script/LevelOverController.cs.meta b/Assets/Script/LevelOverController.cs.meta new file mode 100644 index 0000000000..645d419da4 --- /dev/null +++ b/Assets/Script/LevelOverController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c87c1a3fa2b70a64fab2a04405bb8482 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/PlayerController.cs b/Assets/Script/PlayerController.cs index 231d297462..7d0b93ef60 100644 --- a/Assets/Script/PlayerController.cs +++ b/Assets/Script/PlayerController.cs @@ -51,7 +51,7 @@ private void PlayerMovement(float horizontal, float vertical) transform.position = pos; - if (vertical > 0 && isGrounded) + if ((vertical > 0 || Input.GetKey(KeyCode.Space)) && isGrounded) { rigidbody2D.AddForce(new Vector2(0, jumpForce), ForceMode2D.Force); } From 89158a42220a00b1494e4fe9ada9e1a8a3e29bba Mon Sep 17 00:00:00 2001 From: Akash Date: Sat, 2 Nov 2024 02:40:06 +0530 Subject: [PATCH 09/11] fall down --- Assets/PlayerFallDown.cs | 15 ++++++ Assets/PlayerFallDown.cs.meta | 11 +++++ Assets/Scenes/GameScene.unity | 86 ++++++++++++++++++++++++++++++++++- 3 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 Assets/PlayerFallDown.cs create mode 100644 Assets/PlayerFallDown.cs.meta diff --git a/Assets/PlayerFallDown.cs b/Assets/PlayerFallDown.cs new file mode 100644 index 0000000000..7a96ebf65f --- /dev/null +++ b/Assets/PlayerFallDown.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class PlayerFallDown : MonoBehaviour +{ + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.gameObject.GetComponent()) + { + SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex); + } + } +} diff --git a/Assets/PlayerFallDown.cs.meta b/Assets/PlayerFallDown.cs.meta new file mode 100644 index 0000000000..417b2850fb --- /dev/null +++ b/Assets/PlayerFallDown.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 18ad3399f6dc31b4fb87dfb66fdec3f1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 5f154aec3b..8d9d2ae292 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -1369,6 +1369,77 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3637415917317152292} m_PrefabAsset: {fileID: 0} +--- !u!1 &1554532741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1554532743} + - component: {fileID: 1554532742} + - component: {fileID: 1554532744} + m_Layer: 0 + m_Name: FallDown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1554532742 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1554532741} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -3.3863354, 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: 38.95033, y: 1} + m_EdgeRadius: 0 +--- !u!4 &1554532743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1554532741} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 16.154884, y: -9.21, z: -0.089756265} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1554532744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1554532741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18ad3399f6dc31b4fb87dfb66fdec3f1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2117892165 GameObject: m_ObjectHideFlags: 0 @@ -1379,8 +1450,9 @@ GameObject: m_Component: - component: {fileID: 2117892167} - component: {fileID: 2117892166} + - component: {fileID: 2117892168} m_Layer: 0 - m_Name: levelComplete + m_Name: levelOver m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1427,6 +1499,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2117892168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2117892165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c87c1a3fa2b70a64fab2a04405bb8482, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3637415917317152292 PrefabInstance: m_ObjectHideFlags: 0 From 5abdce2eb7d73b5b4d5d9f33212e943dff96fd9a Mon Sep 17 00:00:00 2001 From: Akash Date: Sun, 3 Nov 2024 00:02:44 +0530 Subject: [PATCH 10/11] Score Update --- Assets/KeyController.cs | 15 + Assets/KeyController.cs.meta | 11 + Assets/Scenes/GameScene.unity | 702 +++++++++++++++++++++++++----- Assets/ScoreController.cs | 28 ++ Assets/ScoreController.cs.meta | 11 + Assets/Script/PlayerController.cs | 7 + 6 files changed, 655 insertions(+), 119 deletions(-) create mode 100644 Assets/KeyController.cs create mode 100644 Assets/KeyController.cs.meta create mode 100644 Assets/ScoreController.cs create mode 100644 Assets/ScoreController.cs.meta diff --git a/Assets/KeyController.cs b/Assets/KeyController.cs new file mode 100644 index 0000000000..0e491847fc --- /dev/null +++ b/Assets/KeyController.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class KeyController : MonoBehaviour +{ + private void OnCollisionEnter2D(Collision2D collision) + { + if (collision.gameObject.GetComponent()) + { + collision.gameObject.GetComponent().PickUpKey(); + Destroy(gameObject); + } + } +} diff --git a/Assets/KeyController.cs.meta b/Assets/KeyController.cs.meta new file mode 100644 index 0000000000..f608752de7 --- /dev/null +++ b/Assets/KeyController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7b6ce196411170545862a2a0b6026805 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 8d9d2ae292..a9fc66cd6d 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -123,117 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &13219308 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 13219311} - - component: {fileID: 13219310} - - component: {fileID: 13219312} - m_Layer: 0 - m_Name: Platform - m_TagString: platform - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!212 &13219310 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 13219308} - 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: 21300004, guid: 6e1db66fc7e57884380659e0a55351f0, 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!4 &13219311 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 13219308} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.05, y: -0.6, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &13219312 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 13219308} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: -0.10829738} - 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: 0.78340524} - m_EdgeRadius: 0 --- !u!1 &808561118 GameObject: m_ObjectHideFlags: 0 @@ -334,6 +223,155 @@ MonoBehaviour: target: {fileID: 1387161689} smoothSpeed: 0.125 offset: {x: 0, y: 0, z: -10} +--- !u!1 &951551842 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 951551843} + - component: {fileID: 951551845} + - component: {fileID: 951551844} + - component: {fileID: 951551846} + m_Layer: 5 + m_Name: Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &951551843 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 951551842} + 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: 2135588648} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 100, y: -25} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &951551844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 951551842} + 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: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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 &951551845 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 951551842} + m_CullTransparentMesh: 1 +--- !u!114 &951551846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 951551842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2816cfccc6f1924994ede2a1e643de5, type: 3} + m_Name: + m_EditorClassIdentifier: + scoreText: {fileID: 951551844} --- !u!1 &1109184603 GameObject: m_ObjectHideFlags: 0 @@ -345,7 +383,7 @@ GameObject: - component: {fileID: 1109184605} - component: {fileID: 1109184604} m_Layer: 0 - m_Name: Grid + m_Name: Level m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -377,8 +415,12 @@ Transform: m_Children: - {fileID: 1336012572} - {fileID: 1191852074} + - {fileID: 2117892167} + - {fileID: 1554532743} + - {fileID: 1503161307} + - {fileID: 1863201083} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1191852073 GameObject: @@ -1369,6 +1411,130 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3637415917317152292} m_PrefabAsset: {fileID: 0} +--- !u!1 &1503161306 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1503161307} + - component: {fileID: 1503161310} + - component: {fileID: 1503161309} + - component: {fileID: 1503161308} + m_Layer: 0 + m_Name: Key + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1503161307 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503161306} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.37, y: 0.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1109184605} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1503161308 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503161306} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b6ce196411170545862a2a0b6026805, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &1503161309 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503161306} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0020561218, y: -0.018506438} + 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: 0.4036827, y: 0.8807364} + m_EdgeRadius: 0 +--- !u!212 &1503161310 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503161306} + 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!1 &1554532741 GameObject: m_ObjectHideFlags: 0 @@ -1420,13 +1586,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1554532741} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 16.154884, y: -9.21, z: -0.089756265} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 1109184605} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1554532744 MonoBehaviour: @@ -1440,6 +1606,198 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 18ad3399f6dc31b4fb87dfb66fdec3f1, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1863201082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1863201083} + - component: {fileID: 1863201086} + - component: {fileID: 1863201085} + - component: {fileID: 1863201084} + m_Layer: 0 + m_Name: Key (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1863201083 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1863201082} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.72, y: -1.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1109184605} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1863201084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1863201082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b6ce196411170545862a2a0b6026805, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &1863201085 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1863201082} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.0013251305, y: -0.019874036} + 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: 0.3984766, y: 0.8860551} + m_EdgeRadius: 0 +--- !u!212 &1863201086 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1863201082} + 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!1 &1864181018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1864181021} + - component: {fileID: 1864181020} + - component: {fileID: 1864181019} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1864181019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864181018} + 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 &1864181020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864181018} + 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 &1864181021 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1864181018} + 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_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2117892165 GameObject: m_ObjectHideFlags: 0 @@ -1491,13 +1849,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2117892165} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 29.64, y: -1.56, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 1109184605} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2117892168 MonoBehaviour: @@ -1511,6 +1869,107 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c87c1a3fa2b70a64fab2a04405bb8482, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2135588644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2135588648} + - component: {fileID: 2135588647} + - component: {fileID: 2135588646} + - component: {fileID: 2135588645} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2135588645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135588644} + 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 &2135588646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135588644} + 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 &2135588647 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135588644} + 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_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2135588648 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2135588644} + 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: 951551843} + m_Father: {fileID: 0} + m_RootOrder: 3 + 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!1001 &3637415917317152292 PrefabInstance: m_ObjectHideFlags: 0 @@ -1543,6 +2002,11 @@ PrefabInstance: propertyPath: jumpForce value: 150 objectReference: {fileID: 0} + - target: {fileID: 3637415917317152299, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, + type: 3} + propertyPath: scoreController + value: + objectReference: {fileID: 951551846} - target: {fileID: 3679550784524527443, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} propertyPath: m_RootOrder diff --git a/Assets/ScoreController.cs b/Assets/ScoreController.cs new file mode 100644 index 0000000000..6b949b6f5d --- /dev/null +++ b/Assets/ScoreController.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; + +public class ScoreController : MonoBehaviour +{ + public TMP_Text scoreText; + int score; + + // Start is called before the first frame update + void Start() + { + RefreshUI(); + } + + internal void IncreaseScore(int val) + { + score += val; + RefreshUI(); + } + + void RefreshUI() + { + scoreText.text = "Score : " + score; + } +} diff --git a/Assets/ScoreController.cs.meta b/Assets/ScoreController.cs.meta new file mode 100644 index 0000000000..7c15bf3579 --- /dev/null +++ b/Assets/ScoreController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f2816cfccc6f1924994ede2a1e643de5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/PlayerController.cs b/Assets/Script/PlayerController.cs index 7d0b93ef60..616b4f77fd 100644 --- a/Assets/Script/PlayerController.cs +++ b/Assets/Script/PlayerController.cs @@ -7,12 +7,19 @@ public class PlayerController : MonoBehaviour { [SerializeField] private Animator playerAnimator; [SerializeField] private BoxCollider2D boxCol; + [SerializeField] private ScoreController scoreController; //Collider Variables private Vector2 boxColInitSize; private Vector2 boxColInitOffset; public float speed; + + public void PickUpKey() + { + scoreController.IncreaseScore(10); + } + public float jumpForce; public bool isGrounded = false; public Rigidbody2D rigidbody2D; From 3d63b7b55ae4863ed15a27a2bda742df6cee95f6 Mon Sep 17 00:00:00 2001 From: Akash Date: Sun, 3 Nov 2024 01:32:12 +0530 Subject: [PATCH 11/11] sd --- Assets/Animation/Key Animation.anim | 155 +++++++ Assets/Animation/Key Animation.anim.meta | 8 + Assets/Animation/Score.controller | 72 +++ Assets/Animation/Score.controller.meta | 8 + Assets/Prefabs/Key.prefab | 148 +++++++ Assets/Prefabs/Key.prefab.meta | 7 + Assets/Prefabs/Player.prefab | 9 +- Assets/Scenes/GameScene.unity | 465 ++++++++++---------- Assets/{ => Script}/KeyController.cs | 0 Assets/{ => Script}/KeyController.cs.meta | 0 Assets/{ => Script}/PlayerFallDown.cs | 0 Assets/{ => Script}/PlayerFallDown.cs.meta | 0 Assets/{ => Script}/ScoreController.cs | 0 Assets/{ => Script}/ScoreController.cs.meta | 0 14 files changed, 624 insertions(+), 248 deletions(-) create mode 100644 Assets/Animation/Key Animation.anim create mode 100644 Assets/Animation/Key Animation.anim.meta create mode 100644 Assets/Animation/Score.controller create mode 100644 Assets/Animation/Score.controller.meta create mode 100644 Assets/Prefabs/Key.prefab create mode 100644 Assets/Prefabs/Key.prefab.meta rename Assets/{ => Script}/KeyController.cs (100%) rename Assets/{ => Script}/KeyController.cs.meta (100%) rename Assets/{ => Script}/PlayerFallDown.cs (100%) rename Assets/{ => Script}/PlayerFallDown.cs.meta (100%) rename Assets/{ => Script}/ScoreController.cs (100%) rename Assets/{ => Script}/ScoreController.cs.meta (100%) diff --git a/Assets/Animation/Key Animation.anim b/Assets/Animation/Key Animation.anim new file mode 100644 index 0000000000..af66d4fe74 --- /dev/null +++ b/Assets/Animation/Key Animation.anim @@ -0,0 +1,155 @@ +%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 Animation + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: f16737ca9f1dc29448765a816d0a1b49, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 7a0de91dea9f59140bb693004bf0b0ad, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 7c8bdf6129a84e141a690926a43cb384, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 2a8146b76a8332e46b9c00f3cb2960e8, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 2c9d2d33aa1cb054cb019c852a64b6d4, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 6b805b3d02c25084780e70f6b6e7ab38, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: b53184e6a2932ee409a26e6838f16aae, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 44fbfa5afc056fe459c80663e42e9ae4, type: 3} + - time: 0.6166667 + value: {fileID: 21300000, guid: 862eb60c627dd534cb832145605ac12d, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: 7a85663a637e4004e92472acad01c2b8, type: 3} + - time: 0.76666665 + value: {fileID: 21300000, guid: e800ef09025e509499b2916a88d7da82, type: 3} + - time: 0.81666666 + value: {fileID: 21300000, guid: 3dbc35981e1cf7b4e8e17794cc775b4d, type: 3} + - time: 0.9 + value: {fileID: 21300000, guid: 0a3bfa4764855014695c9c734bd910a5, type: 3} + - time: 0.96666664 + value: {fileID: 21300000, guid: 2c458ee8cd0fbbf4fa714059d5f3136d, type: 3} + - time: 1.0333333 + value: {fileID: 21300000, guid: b940cb8a87dbc2b4c9924fa949455cab, type: 3} + - time: 1.1 + value: {fileID: 21300000, guid: 36d7a8d875f6bec499f358447156b5fc, type: 3} + - time: 1.1833333 + value: {fileID: 21300000, guid: 5bc4e6fd2df715c46b166367924563d2, type: 3} + - time: 1.2333333 + value: {fileID: 21300000, guid: c7e105af68f080d408ff8dcfc71d976f, type: 3} + - time: 1.3 + value: {fileID: 21300000, guid: 55b7d14da52e94f40a7977ab1fd4678e, type: 3} + - time: 1.3833333 + value: {fileID: 21300000, guid: 75c23d1c7c70bb847b9946964aaf0825, type: 3} + - time: 1.4166666 + value: {fileID: 21300000, guid: cd5d447894330194aa31e955895c2404, type: 3} + - time: 1.5333333 + value: {fileID: 21300000, guid: 854bacb421a0cf0409b811ca82dc0b72, type: 3} + - time: 1.5833334 + value: {fileID: 21300000, guid: 36cb6f5bee0e9c64b8fd1b8d8fa3a779, type: 3} + - time: 1.6666666 + value: {fileID: 21300000, guid: e2eadf32de58de044a6101c5d48fb7d5, type: 3} + - time: 1.7333333 + value: {fileID: 21300000, guid: 2e67ec8e00de06747930191c34bec57b, type: 3} + - time: 1.8 + value: {fileID: 21300000, guid: d48d2bef2814aec4db2752ccf322c364, type: 3} + - time: 1.8333334 + value: {fileID: 21300000, guid: ee67da4db316077448ea9b6e1f5429b4, type: 3} + - time: 1.9333333 + value: {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - time: 2 + value: {fileID: 21300000, guid: a74e1b80bec2c7a41b68c0a4e6a2085a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + 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: 2.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/Animation/Key Animation.anim.meta b/Assets/Animation/Key Animation.anim.meta new file mode 100644 index 0000000000..a8be6e0c6e --- /dev/null +++ b/Assets/Animation/Key Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 443e688f9327a9a4da917f177f30b335 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/Score.controller b/Assets/Animation/Score.controller new file mode 100644 index 0000000000..04ec356591 --- /dev/null +++ b/Assets/Animation/Score.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Score + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7332894622787019078} + 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 &3179603442762792744 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Key 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: 443e688f9327a9a4da917f177f30b335, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &7332894622787019078 +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: 3179603442762792744} + 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: 3179603442762792744} diff --git a/Assets/Animation/Score.controller.meta b/Assets/Animation/Score.controller.meta new file mode 100644 index 0000000000..b0a26845cd --- /dev/null +++ b/Assets/Animation/Score.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3561ce2f65d61b41aef88a11c50883d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Key.prefab b/Assets/Prefabs/Key.prefab new file mode 100644 index 0000000000..fb94392bf8 --- /dev/null +++ b/Assets/Prefabs/Key.prefab @@ -0,0 +1,148 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8525568000888995177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8525568000888995176} + - component: {fileID: 8525568000888995181} + - component: {fileID: 8525568000888995182} + - component: {fileID: 8525568000888995180} + - component: {fileID: 8525568000888995183} + m_Layer: 0 + m_Name: Key + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8525568000888995176 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8525568000888995177} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.37, y: 0.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8525568000888995181 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8525568000888995177} + 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!61 &8525568000888995182 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8525568000888995177} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0020561218, y: -0.018506438} + 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: 0.4036827, y: 0.8807364} + m_EdgeRadius: 0 +--- !u!95 &8525568000888995180 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8525568000888995177} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b3561ce2f65d61b41aef88a11c50883d, 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 +--- !u!114 &8525568000888995183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8525568000888995177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b6ce196411170545862a2a0b6026805, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Key.prefab.meta b/Assets/Prefabs/Key.prefab.meta new file mode 100644 index 0000000000..74338cca1f --- /dev/null +++ b/Assets/Prefabs/Key.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 729dddd25214a484fb66443551d66b20 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 1cdfb75b1c..a73c54ccfd 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -76,7 +76,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -100,7 +100,7 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 + m_Mass: 10 m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 1 @@ -108,7 +108,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!61 &3637415917317152298 BoxCollider2D: m_ObjectHideFlags: 0 @@ -170,7 +170,8 @@ MonoBehaviour: m_EditorClassIdentifier: playerAnimator: {fileID: 3637415917317152294} boxCol: {fileID: 3637415917317152298} + scoreController: {fileID: 0} speed: 4 - jumpForce: 0 + jumpForce: 150 isGrounded: 0 rigidbody2D: {fileID: 0} diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index a9fc66cd6d..0858372e39 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -235,6 +235,8 @@ GameObject: - component: {fileID: 951551845} - component: {fileID: 951551844} - component: {fileID: 951551846} + - component: {fileID: 951551848} + - component: {fileID: 951551847} m_Layer: 5 m_Name: Score m_TagString: Untagged @@ -372,6 +374,79 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scoreText: {fileID: 951551844} +--- !u!212 &951551847 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 951551842} + 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: 0} + 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: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &951551848 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 951551842} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b3561ce2f65d61b41aef88a11c50883d, 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 --- !u!1 &1109184603 GameObject: m_ObjectHideFlags: 0 @@ -418,7 +493,7 @@ Transform: - {fileID: 2117892167} - {fileID: 1554532743} - {fileID: 1503161307} - - {fileID: 1863201083} + - {fileID: 1711188189} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1411,130 +1486,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3637415917317152292} m_PrefabAsset: {fileID: 0} ---- !u!1 &1503161306 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1503161307} - - component: {fileID: 1503161310} - - component: {fileID: 1503161309} - - component: {fileID: 1503161308} - m_Layer: 0 - m_Name: Key - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1503161307 +--- !u!4 &1503161307 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503161306} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.37, y: 0.3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1109184605} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1503161308 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503161306} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7b6ce196411170545862a2a0b6026805, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!61 &1503161309 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503161306} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.0020561218, y: -0.018506438} - 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: 0.4036827, y: 0.8807364} - m_EdgeRadius: 0 ---- !u!212 &1503161310 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + m_PrefabInstance: {fileID: 8525568002089064115} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503161306} - 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!1 &1554532741 GameObject: m_ObjectHideFlags: 0 @@ -1606,130 +1563,81 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 18ad3399f6dc31b4fb87dfb66fdec3f1, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1863201082 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1863201083} - - component: {fileID: 1863201086} - - component: {fileID: 1863201085} - - component: {fileID: 1863201084} - m_Layer: 0 - m_Name: Key (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1863201083 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1863201082} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.72, y: -1.75, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1109184605} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1863201084 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1863201082} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7b6ce196411170545862a2a0b6026805, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!61 &1863201085 -BoxCollider2D: +--- !u!1001 &1711188188 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1863201082} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.0013251305, y: -0.019874036} - 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: 0.3984766, y: 0.8860551} - m_EdgeRadius: 0 ---- !u!212 &1863201086 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_Modification: + m_TransformParent: {fileID: 1109184605} + m_Modifications: + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalPosition.x + value: 8.46 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.78 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995177, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_Name + value: Key + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 729dddd25214a484fb66443551d66b20, type: 3} +--- !u!4 &1711188189 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + m_PrefabInstance: {fileID: 1711188188} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1863201082} - 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!1 &1864181018 GameObject: m_ObjectHideFlags: 0 @@ -2069,3 +1977,72 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9aed148f3b9abea4a8dfcaf36a1ce2e4, type: 3} +--- !u!1001 &8525568002089064115 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1109184605} + m_Modifications: + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.37 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995176, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8525568000888995177, guid: 729dddd25214a484fb66443551d66b20, + type: 3} + propertyPath: m_Name + value: Key + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 729dddd25214a484fb66443551d66b20, type: 3} diff --git a/Assets/KeyController.cs b/Assets/Script/KeyController.cs similarity index 100% rename from Assets/KeyController.cs rename to Assets/Script/KeyController.cs diff --git a/Assets/KeyController.cs.meta b/Assets/Script/KeyController.cs.meta similarity index 100% rename from Assets/KeyController.cs.meta rename to Assets/Script/KeyController.cs.meta diff --git a/Assets/PlayerFallDown.cs b/Assets/Script/PlayerFallDown.cs similarity index 100% rename from Assets/PlayerFallDown.cs rename to Assets/Script/PlayerFallDown.cs diff --git a/Assets/PlayerFallDown.cs.meta b/Assets/Script/PlayerFallDown.cs.meta similarity index 100% rename from Assets/PlayerFallDown.cs.meta rename to Assets/Script/PlayerFallDown.cs.meta diff --git a/Assets/ScoreController.cs b/Assets/Script/ScoreController.cs similarity index 100% rename from Assets/ScoreController.cs rename to Assets/Script/ScoreController.cs diff --git a/Assets/ScoreController.cs.meta b/Assets/Script/ScoreController.cs.meta similarity index 100% rename from Assets/ScoreController.cs.meta rename to Assets/Script/ScoreController.cs.meta