From ad59e0be15d9bd4055baba5c7544ac8b209073a8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-9K53R7V\\MSI" Date: Fri, 3 May 2024 12:41:36 +0530 Subject: [PATCH] commit added key and script to increment score; --- Assets/Animation/Key.controller | 72 +++ Assets/Animation/Key.controller.meta | 8 + Assets/Animation/KeyAnimation.anim | 159 ++++++ Assets/Animation/KeyAnimation.anim.meta | 8 + Assets/Prefab/Key.prefab | 167 ++++++ Assets/Prefab/Key.prefab.meta | 7 + Assets/Prefab/Player/Player.prefab | 135 ++++- Assets/Scenes/Level1.unity | 682 +++++++++++++++++++++++- Assets/Scenes/Level2.unity | 369 +++---------- Assets/Scripts/PickableItems.cs | 20 + Assets/Scripts/PickableItems.cs.meta | 11 + Assets/Scripts/PlayerDeath.cs | 24 +- Assets/Scripts/ScoreManager.cs | 30 ++ Assets/Scripts/ScoreManager.cs.meta | 11 + Assets/Scripts/playerController.cs | 11 +- UserSettings/Layouts/default-2022.dwlt | 451 +++++++++++++--- 16 files changed, 1774 insertions(+), 391 deletions(-) create mode 100644 Assets/Animation/Key.controller create mode 100644 Assets/Animation/Key.controller.meta create mode 100644 Assets/Animation/KeyAnimation.anim create mode 100644 Assets/Animation/KeyAnimation.anim.meta create mode 100644 Assets/Prefab/Key.prefab create mode 100644 Assets/Prefab/Key.prefab.meta create mode 100644 Assets/Scripts/PickableItems.cs create mode 100644 Assets/Scripts/PickableItems.cs.meta create mode 100644 Assets/Scripts/ScoreManager.cs create mode 100644 Assets/Scripts/ScoreManager.cs.meta diff --git a/Assets/Animation/Key.controller b/Assets/Animation/Key.controller new file mode 100644 index 0000000000..3ecbdd7bce --- /dev/null +++ b/Assets/Animation/Key.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: Key + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 3837865259408820129} + 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 &3837865259408820129 +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: 7726647429111237063} + 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: 7726647429111237063} +--- !u!1102 &7726647429111237063 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KeyAnimation + 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: 5f2e5b357b255c24fab1dd654942e593, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animation/Key.controller.meta b/Assets/Animation/Key.controller.meta new file mode 100644 index 0000000000..159fd2484a --- /dev/null +++ b/Assets/Animation/Key.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3b9b21c9f513324f8d1eaa87e61288d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/KeyAnimation.anim b/Assets/Animation/KeyAnimation.anim new file mode 100644 index 0000000000..b3723d3428 --- /dev/null +++ b/Assets/Animation/KeyAnimation.anim @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KeyAnimation + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: f16737ca9f1dc29448765a816d0a1b49, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 7a0de91dea9f59140bb693004bf0b0ad, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 7c8bdf6129a84e141a690926a43cb384, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 2a8146b76a8332e46b9c00f3cb2960e8, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 2c9d2d33aa1cb054cb019c852a64b6d4, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 6b805b3d02c25084780e70f6b6e7ab38, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: b53184e6a2932ee409a26e6838f16aae, type: 3} + - time: 0.55 + value: {fileID: 21300000, guid: 44fbfa5afc056fe459c80663e42e9ae4, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: 862eb60c627dd534cb832145605ac12d, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: 7a85663a637e4004e92472acad01c2b8, type: 3} + - time: 0.73333335 + value: {fileID: 21300000, guid: e800ef09025e509499b2916a88d7da82, type: 3} + - time: 0.8 + value: {fileID: 21300000, guid: 3dbc35981e1cf7b4e8e17794cc775b4d, type: 3} + - time: 0.8666667 + value: {fileID: 21300000, guid: 0a3bfa4764855014695c9c734bd910a5, type: 3} + - time: 0.93333334 + value: {fileID: 21300000, guid: 2c458ee8cd0fbbf4fa714059d5f3136d, type: 3} + - time: 0.98333335 + value: {fileID: 21300000, guid: b940cb8a87dbc2b4c9924fa949455cab, type: 3} + - time: 1.05 + value: {fileID: 21300000, guid: 36d7a8d875f6bec499f358447156b5fc, type: 3} + - time: 1.1166667 + value: {fileID: 21300000, guid: 5bc4e6fd2df715c46b166367924563d2, type: 3} + - time: 1.1833333 + value: {fileID: 21300000, guid: c7e105af68f080d408ff8dcfc71d976f, type: 3} + - time: 1.25 + value: {fileID: 21300000, guid: 55b7d14da52e94f40a7977ab1fd4678e, type: 3} + - time: 1.3166667 + value: {fileID: 21300000, guid: 75c23d1c7c70bb847b9946964aaf0825, type: 3} + - time: 1.3666667 + value: {fileID: 21300000, guid: cd5d447894330194aa31e955895c2404, type: 3} + - time: 1.4666667 + value: {fileID: 21300000, guid: 854bacb421a0cf0409b811ca82dc0b72, type: 3} + - time: 1.5333333 + value: {fileID: 21300000, guid: 36cb6f5bee0e9c64b8fd1b8d8fa3a779, type: 3} + - time: 1.6 + value: {fileID: 21300000, guid: e2eadf32de58de044a6101c5d48fb7d5, type: 3} + - time: 1.6666666 + value: {fileID: 21300000, guid: 2e67ec8e00de06747930191c34bec57b, type: 3} + - time: 1.7166667 + value: {fileID: 21300000, guid: d48d2bef2814aec4db2752ccf322c364, type: 3} + - time: 1.7833333 + value: {fileID: 21300000, guid: ee67da4db316077448ea9b6e1f5429b4, type: 3} + - time: 1.85 + value: {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - time: 1.9166666 + value: {fileID: 21300000, guid: a74e1b80bec2c7a41b68c0a4e6a2085a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + - {fileID: 21300000, guid: f16737ca9f1dc29448765a816d0a1b49, type: 3} + - {fileID: 21300000, guid: 7a0de91dea9f59140bb693004bf0b0ad, type: 3} + - {fileID: 21300000, guid: 7c8bdf6129a84e141a690926a43cb384, type: 3} + - {fileID: 21300000, guid: 2a8146b76a8332e46b9c00f3cb2960e8, type: 3} + - {fileID: 21300000, guid: 2c9d2d33aa1cb054cb019c852a64b6d4, type: 3} + - {fileID: 21300000, guid: 6b805b3d02c25084780e70f6b6e7ab38, type: 3} + - {fileID: 21300000, guid: b53184e6a2932ee409a26e6838f16aae, type: 3} + - {fileID: 21300000, guid: 44fbfa5afc056fe459c80663e42e9ae4, type: 3} + - {fileID: 21300000, guid: 862eb60c627dd534cb832145605ac12d, type: 3} + - {fileID: 21300000, guid: 7a85663a637e4004e92472acad01c2b8, type: 3} + - {fileID: 21300000, guid: e800ef09025e509499b2916a88d7da82, type: 3} + - {fileID: 21300000, guid: 3dbc35981e1cf7b4e8e17794cc775b4d, type: 3} + - {fileID: 21300000, guid: 0a3bfa4764855014695c9c734bd910a5, type: 3} + - {fileID: 21300000, guid: 2c458ee8cd0fbbf4fa714059d5f3136d, type: 3} + - {fileID: 21300000, guid: b940cb8a87dbc2b4c9924fa949455cab, type: 3} + - {fileID: 21300000, guid: 36d7a8d875f6bec499f358447156b5fc, type: 3} + - {fileID: 21300000, guid: 5bc4e6fd2df715c46b166367924563d2, type: 3} + - {fileID: 21300000, guid: c7e105af68f080d408ff8dcfc71d976f, type: 3} + - {fileID: 21300000, guid: 55b7d14da52e94f40a7977ab1fd4678e, type: 3} + - {fileID: 21300000, guid: 75c23d1c7c70bb847b9946964aaf0825, type: 3} + - {fileID: 21300000, guid: cd5d447894330194aa31e955895c2404, type: 3} + - {fileID: 21300000, guid: 854bacb421a0cf0409b811ca82dc0b72, type: 3} + - {fileID: 21300000, guid: 36cb6f5bee0e9c64b8fd1b8d8fa3a779, type: 3} + - {fileID: 21300000, guid: e2eadf32de58de044a6101c5d48fb7d5, type: 3} + - {fileID: 21300000, guid: 2e67ec8e00de06747930191c34bec57b, type: 3} + - {fileID: 21300000, guid: d48d2bef2814aec4db2752ccf322c364, type: 3} + - {fileID: 21300000, guid: ee67da4db316077448ea9b6e1f5429b4, type: 3} + - {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - {fileID: 21300000, guid: a74e1b80bec2c7a41b68c0a4e6a2085a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.9333333 + 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/KeyAnimation.anim.meta b/Assets/Animation/KeyAnimation.anim.meta new file mode 100644 index 0000000000..203852f03e --- /dev/null +++ b/Assets/Animation/KeyAnimation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f2e5b357b255c24fab1dd654942e593 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Key.prefab b/Assets/Prefab/Key.prefab new file mode 100644 index 0000000000..f7305cc25a --- /dev/null +++ b/Assets/Prefab/Key.prefab @@ -0,0 +1,167 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7699378636447890766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5308008083285229982} + - component: {fileID: 3053476859883693641} + - component: {fileID: 3186637661529211065} + - component: {fileID: 3393503114729997597} + - component: {fileID: 6433649431365245143} + m_Layer: 0 + m_Name: Key + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5308008083285229982 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7699378636447890766} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &3053476859883693641 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7699378636447890766} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b3b9b21c9f513324f8d1eaa87e61288d, 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!212 &3186637661529211065 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7699378636447890766} + 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 &3393503114729997597 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7699378636447890766} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.0016962737, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.39950934, y: 1} + m_EdgeRadius: 0 +--- !u!114 &6433649431365245143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7699378636447890766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 100924cc8e474094495b7f2f34ec9b4d, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefab/Key.prefab.meta b/Assets/Prefab/Key.prefab.meta new file mode 100644 index 0000000000..fb674895ae --- /dev/null +++ b/Assets/Prefab/Key.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5b1c780b37d517248857958d4a8f4192 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Player/Player.prefab b/Assets/Prefab/Player/Player.prefab index f7943d3e5b..98fa2d13f5 100644 --- a/Assets/Prefab/Player/Player.prefab +++ b/Assets/Prefab/Player/Player.prefab @@ -36,6 +36,8 @@ Transform: m_Children: - {fileID: 474282926914731978} - {fileID: 828141145361657329} + - {fileID: 7401506869314552714} + - {fileID: 1464395516521301285} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7894923954649684004 @@ -143,7 +145,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.016489327, y: 1.02658} + m_Offset: {x: 0.016489327, y: 1.0004308} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.42, y: 0.1} @@ -154,7 +156,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.74590385, y: 2.0776994} + m_Size: {x: 0.74590385, y: 2.1299977} m_EdgeRadius: 0 --- !u!50 &753209669686786339 Rigidbody2D: @@ -198,12 +200,104 @@ MonoBehaviour: animator: {fileID: 6900886237888737789} boxCollider2D: {fileID: 3545855248091886352} speedi: 5 - jumpvalue: 1 - groundcheck: {fileID: 474282926914731978} + jumpvalue: 2 + groundcheck: {fileID: 7401506869314552714} layers: serializedVersion: 2 m_Bits: 64 - groundcheckradius: 0.3 + groundcheckradius: 0.2 +--- !u!1 &5286168059629955257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1464395516521301285} + - component: {fileID: 357868953846595693} + - component: {fileID: 6802464575710402553} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1464395516521301285 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5286168059629955257} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.76, y: 1.49, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1201430245866775938} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &357868953846595693 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5286168059629955257} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &6802464575710402553 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5286168059629955257} + m_Enabled: 1 --- !u!1 &7014143512232771365 GameObject: m_ObjectHideFlags: 0 @@ -235,6 +329,37 @@ Transform: m_Children: [] m_Father: {fileID: 1201430245866775938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8803103537728518791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7401506869314552714} + m_Layer: 0 + m_Name: groundcheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7401506869314552714 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8803103537728518791} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.018, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1201430245866775938} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9022259201797644261 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index a44e56fdb7..3b2abd49dc 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -123,6 +123,301 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &116917548 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2088637208} + m_Modifications: + - target: {fileID: 3393503114729997597, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.x + value: 9.08 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.86 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7699378636447890766, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_Name + value: Key (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5b1c780b37d517248857958d4a8f4192, type: 3} +--- !u!1 &249054268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 249054269} + - component: {fileID: 249054271} + - component: {fileID: 249054270} + - component: {fileID: 249054272} + m_Layer: 5 + m_Name: Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &249054269 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249054268} + 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: 2093550094} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -36} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &249054270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249054268} + 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: f3796d9a9d76b5545be8f4d3e74ffd60, type: 2} + m_sharedMaterial: {fileID: 21519397309644374, guid: f3796d9a9d76b5545be8f4d3e74ffd60, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 38.34 + m_fontSizeBase: 38.34 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + 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 &249054271 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249054268} + m_CullTransparentMesh: 1 +--- !u!114 &249054272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 249054268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec69fc428782c95428b0945e9b355095, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &257868336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 257868339} + - component: {fileID: 257868338} + - component: {fileID: 257868337} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &257868337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257868336} + 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 &257868338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257868336} + 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 &257868339 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257868336} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &294290897 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + m_PrefabInstance: {fileID: 1331814711} + m_PrefabAsset: {fileID: 0} --- !u!1 &553817775 GameObject: m_ObjectHideFlags: 0 @@ -243,12 +538,79 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!95 &870678929 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 6900886237888737789, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - m_PrefabInstance: {fileID: 1311293295106438672} - m_PrefabAsset: {fileID: 0} +--- !u!1001 &1158881547 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2088637208} + m_Modifications: + - target: {fileID: 3393503114729997597, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.69 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.86 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7699378636447890766, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_Name + value: Key (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5b1c780b37d517248857958d4a8f4192, type: 3} --- !u!1 &1164299226 GameObject: m_ObjectHideFlags: 0 @@ -393,7 +755,91 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 911ccbb7c9315de468df6bde7e498f8c, type: 3} m_Name: m_EditorClassIdentifier: - animator: {fileID: 870678929} +--- !u!1001 &1331814711 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2088637208} + m_Modifications: + - target: {fileID: 3393503114729997597, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.38 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.86 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7699378636447890766, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_Name + value: Key (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5b1c780b37d517248857958d4a8f4192, type: 3} +--- !u!4 &1369613978 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + m_PrefabInstance: {fileID: 1158881547} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1461529447 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + m_PrefabInstance: {fileID: 116917548} + m_PrefabAsset: {fileID: 0} --- !u!1 &1473997436 GameObject: m_ObjectHideFlags: 0 @@ -618,6 +1064,12 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!4 &1519942489 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + m_PrefabInstance: {fileID: 1260462962104079999} + m_PrefabAsset: {fileID: 0} --- !u!1 &1545390959 GameObject: m_ObjectHideFlags: 0 @@ -1724,6 +2176,211 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &2088637207 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2088637208} + m_Layer: 0 + m_Name: IntrctableObjects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2088637208 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088637207} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1519942489} + - {fileID: 1369613978} + - {fileID: 294290897} + - {fileID: 1461529447} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2093550090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2093550094} + - component: {fileID: 2093550093} + - component: {fileID: 2093550092} + - component: {fileID: 2093550091} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2093550091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093550090} + 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 &2093550092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093550090} + 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 &2093550093 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093550090} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2093550094 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093550090} + 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: 249054269} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1001 &1260462962104079999 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2088637208} + m_Modifications: + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.86 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5308008083285229982, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7699378636447890766, guid: 5b1c780b37d517248857958d4a8f4192, + type: 3} + propertyPath: m_Name + value: Key + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5b1c780b37d517248857958d4a8f4192, type: 3} --- !u!1001 &1311293295106438672 PrefabInstance: m_ObjectHideFlags: 0 @@ -1787,8 +2444,14 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: scoreManager + value: + objectReference: {fileID: 249054272} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 5286168059629955257, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} @@ -1883,3 +2546,6 @@ SceneRoots: - {fileID: 1545390961} - {fileID: 3543758064826356729} - {fileID: 1164299229} + - {fileID: 2088637208} + - {fileID: 2093550094} + - {fileID: 257868339} diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity index c029cafd33..ecdbc89ac5 100644 --- a/Assets/Scenes/Level2.unity +++ b/Assets/Scenes/Level2.unity @@ -123,37 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &454495634 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 454495635} - m_Layer: 0 - m_Name: groundcheck - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &454495635 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 454495634} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.018, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1532369090} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &553817775 GameObject: m_ObjectHideFlags: 0 @@ -274,98 +243,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &592884322 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 592884325} - - component: {fileID: 592884324} - - component: {fileID: 592884323} - 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 &592884323 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 592884322} - m_Enabled: 1 ---- !u!20 &592884324 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 592884322} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &592884325 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 592884322} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.76, y: 1.49, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1532369090} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1473997436 GameObject: m_ObjectHideFlags: 0 @@ -393,7 +270,7 @@ Transform: m_GameObject: {fileID: 1473997436} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.25, z: 0} + m_LocalPosition: {x: 0, y: 0.38, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] @@ -441,7 +318,7 @@ TilemapRenderer: m_SortingLayer: 0 m_SortingOrder: -1 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 1.5, y: 0.36523438, z: 0} + m_ChunkCullingBounds: {x: 3.3808596, y: 0.7890625, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 @@ -457,7 +334,7 @@ Tilemap: m_GameObject: {fileID: 1473997436} m_Enabled: 1 m_Tiles: - - first: {x: -2, y: 0, z: 0} + - first: {x: 1, y: 0, z: 0} second: serializedVersion: 2 m_TileIndex: 3 @@ -467,17 +344,17 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: 0, z: 0} + - first: {x: 7, y: 0, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 7, y: 0, z: 0} + - first: {x: 8, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -487,16 +364,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 10, 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: 9, y: 3, z: 0} second: serializedVersion: 2 @@ -519,33 +386,33 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: daf1be82c8558b54ba36f611e84245c4, type: 2} + m_Data: {fileID: 11400000, guid: 91e2f2aed567e9b458c947f291f467fe, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 75471c43fe2981749ac06b34000807c4, type: 2} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 0792764565a9dce43b3878b68c0b8dcd, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 2b2ded4701f13914d8f0cf388a79bcb8, type: 2} + m_Data: {fileID: 11400000, guid: 2c00a260cda8e1248aec9ca5c5bf33e8, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 168a31318dbad59418e716b2e5aba54e, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 0642f5d200403044f9d6e60a0f4a9f40, type: 2} m_TileSpriteArray: + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 - m_Data: {fileID: 21300014, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} + m_Data: {fileID: 21300002, guid: cbf958bb9960a5d4cb587a17cedbfeac, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300010, guid: d76850a37a3b5144093c7940ae562b4b, type: 3} - m_RefCount: 1 - m_Data: {fileID: 21300004, guid: d76850a37a3b5144093c7940ae562b4b, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300002, guid: 06555221cbcfd224692fc060ab31f685, type: 3} + m_Data: {fileID: 21300000, guid: 06555221cbcfd224692fc060ab31f685, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300004, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300012, guid: e49210b2eba9a5442b6fe40c91776cd2, type: 3} m_TileMatrixArray: - - m_RefCount: 6 + - m_RefCount: 5 m_Data: e00: 1 e01: 0 @@ -564,7 +431,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 6 + - m_RefCount: 5 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -590,12 +457,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!4 &1532369090 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - m_PrefabInstance: {fileID: 1311293295106438672} - m_PrefabAsset: {fileID: 0} --- !u!1 &1545390959 GameObject: m_ObjectHideFlags: 0 @@ -1364,6 +1225,74 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &1740102994 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690047765547104160, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} --- !u!1 &1831244548 GameObject: m_ObjectHideFlags: 0 @@ -1702,132 +1631,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1001 &1311293295106438672 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 753209669686786339, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_Constraints - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.76 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.08 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3545855248091886352, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_Size.x - value: 0.74590385 - objectReference: {fileID: 0} - - target: {fileID: 3545855248091886352, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_Size.y - value: 2.0776994 - objectReference: {fileID: 0} - - target: {fileID: 3545855248091886352, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_Offset.x - value: 0.016489327 - objectReference: {fileID: 0} - - target: {fileID: 3545855248091886352, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_Offset.y - value: 1.02658 - objectReference: {fileID: 0} - - target: {fileID: 3690047765547104160, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: speedi - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: jumpvalue - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: groundcheck - value: - objectReference: {fileID: 454495635} - - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: layers.m_Bits - value: 64 - objectReference: {fileID: 0} - - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - propertyPath: groundcheckradius - value: 0.2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - insertIndex: -1 - addedObject: {fileID: 454495635} - - targetCorrespondingSourceObject: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - insertIndex: -1 - addedObject: {fileID: 592884325} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} --- !u!1001 &3543758064826356729 PrefabInstance: m_ObjectHideFlags: 0 @@ -1915,6 +1718,6 @@ PrefabInstance: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1311293295106438672} - {fileID: 1545390961} - {fileID: 3543758064826356729} + - {fileID: 1740102994} diff --git a/Assets/Scripts/PickableItems.cs b/Assets/Scripts/PickableItems.cs new file mode 100644 index 0000000000..4f8068e88c --- /dev/null +++ b/Assets/Scripts/PickableItems.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + + +public class PickableItems : MonoBehaviour +{ + private void OnCollisionEnter2D(Collision2D other) + { + + if(other.gameObject.GetComponent() != null){ + PlayerController pc = other.gameObject.GetComponent(); + pc.scoreUpdate(); + + Destroy(gameObject); +} + + } +} diff --git a/Assets/Scripts/PickableItems.cs.meta b/Assets/Scripts/PickableItems.cs.meta new file mode 100644 index 0000000000..d6521feba4 --- /dev/null +++ b/Assets/Scripts/PickableItems.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 100924cc8e474094495b7f2f34ec9b4d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerDeath.cs b/Assets/Scripts/PlayerDeath.cs index 32f42a9082..f2288ddfae 100644 --- a/Assets/Scripts/PlayerDeath.cs +++ b/Assets/Scripts/PlayerDeath.cs @@ -2,25 +2,21 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Purchasing; +using UnityEngine.SceneManagement; public class PlayerDeath : MonoBehaviour { - [SerializeField] Animator animator; + + -private void OnCollisionEnter2D(Collision2D other) { + private void OnCollisionEnter2D(Collision2D other) { if(other.gameObject.GetComponent() != null){ - playdeathanimation(); - Debug.Log("player died"); + + // PlayerController playerController =other.gameObject.GetComponent(); + // playerController.PlaydieAnimation(); + int sceneno = SceneManager.GetActiveScene().buildIndex; + SceneManager.LoadScene(sceneno); } } - private void playdeathanimation(){ - if (animator != null) - { - animator.SetTrigger("isDied"); // Trigger the "Death" animation - } - else - { - Debug.LogError("Animator component not found on player!"); - } - } + } diff --git a/Assets/Scripts/ScoreManager.cs b/Assets/Scripts/ScoreManager.cs new file mode 100644 index 0000000000..844a762010 --- /dev/null +++ b/Assets/Scripts/ScoreManager.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; +using System; + +public class ScoreManager : MonoBehaviour +{ + + private TextMeshProUGUI textUGI; + + private void Awake() { + textUGI = GetComponent(); + } + private void Start() { + updadescorevalue(); + } + + int score = 0; + + public void incrementvalue(int increment){ + score = score+increment; + updadescorevalue(); + } + + private void updadescorevalue() + { + textUGI.text = "Score " + score; + } +} diff --git a/Assets/Scripts/ScoreManager.cs.meta b/Assets/Scripts/ScoreManager.cs.meta new file mode 100644 index 0000000000..3065bec0c1 --- /dev/null +++ b/Assets/Scripts/ScoreManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ec69fc428782c95428b0945e9b355095 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/playerController.cs b/Assets/Scripts/playerController.cs index 16f6221b19..37387f4e8d 100644 --- a/Assets/Scripts/playerController.cs +++ b/Assets/Scripts/playerController.cs @@ -4,6 +4,7 @@ public class PlayerController : MonoBehaviour { + public ScoreManager scoreManager; [SerializeField] private Animator animator; [SerializeField] private BoxCollider2D boxCollider2D; @@ -16,8 +17,9 @@ public class PlayerController : MonoBehaviour public Transform groundcheck; public LayerMask layers; public float groundcheckradius; + internal object playdeathanimation; - void Start() + void Start() { initialBoxSize = boxCollider2D.size; initialBoxOffset = boxCollider2D.offset; @@ -104,6 +106,13 @@ public void Crouch(bool crouch) } } + public void scoreUpdate() + { + Debug.Log("bhk burbag"); + scoreManager.incrementvalue(10); + } + + } diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index a1597fbe38..4d3afde977 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,9 +19,9 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Scene + m_Title: Project m_RootView: {fileID: 8} - m_MinSize: {x: 875, y: 371} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -39,16 +39,17 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 850 + x: 823 y: 0 - width: 616 - height: 545 + width: 643 + height: 454 m_MinSize: {x: 242, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} m_Panes: + - {fileID: 15} - {fileID: 14} - m_Selected: 0 + m_Selected: 1 m_LastSelected: 0 --- !u!114 &3 MonoBehaviour: @@ -68,13 +69,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 402 + y: 493 width: 1466 - height: 545 + height: 454 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 1097 + controlID: 153 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -99,7 +100,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 302 + controlID: 144 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -119,11 +120,11 @@ MonoBehaviour: y: 0 width: 454 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 16} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 --- !u!114 &6 @@ -144,12 +145,12 @@ MonoBehaviour: x: 0 y: 0 width: 363 - height: 402 + height: 493 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 17} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 --- !u!114 &7 @@ -169,15 +170,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 850 - height: 545 + width: 823 + height: 454 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 15} - - {fileID: 20} - m_Selected: 0 + - {fileID: 23} + - {fileID: 17} + - {fileID: 18} + m_Selected: 2 m_LastSelected: 1 --- !u!114 &8 MonoBehaviour: @@ -274,7 +276,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 303 + controlID: 43 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -295,11 +297,11 @@ MonoBehaviour: x: 0 y: 0 width: 1466 - height: 402 + height: 493 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 40 + controlID: 44 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -318,13 +320,14 @@ MonoBehaviour: x: 363 y: 0 width: 1103 - height: 402 + height: 493 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 18} - - {fileID: 19} + - {fileID: 21} + - {fileID: 22} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 --- !u!114 &14 @@ -347,10 +350,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 850 - y: 475 - width: 614 - height: 524 + x: 823 + y: 566 + width: 641 + height: 433 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -369,7 +372,7 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -382,10 +385,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 475 - width: 849 - height: 524 + x: 904 + y: 698 + width: 560 + height: 301 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -407,24 +410,24 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Prefab/Player m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 m_FilterByTypeIntersection: 0 m_ViewMode: 1 - m_StartGridSize: 64 + m_StartGridSize: 16 m_LastFolders: - - Assets + - Assets/Prefab/Player m_LastFoldersGridSize: -1 m_LastProjectPath: D:\OutscalUnityProjects\2D-Platformer-Game\2D-Platformer-Game m_LockTracker: - m_IsLocked: 0 + m_IsLocked: 1 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: c45c0000 - m_LastClickedID: 23748 - m_ExpandedIDs: 00000000c45c0000ea5c0000005f00000c5f00000e5f0000125f0000e05f000000ca9a3bffffff7f + m_SelectedIDs: 12600000 + m_LastClickedID: 24594 + m_ExpandedIDs: 00000000b85f0000e25f000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -452,7 +455,282 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c45c0000 + m_ExpandedIDs: 00000000b85f0000 + 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: 82670000 + m_LastClickedInstanceID: 26498 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: + 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: 2} + 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: 16 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 200 +--- !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: 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: 363 + y: 73 + width: 1101 + height: 574 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 6429399273792195453, guid: 437277285a02f484eb5b8128da830b9b, type: 2} + - {fileID: -4677576514286111006, guid: ba660518f86117f47845c7863f594f11, type: 2} + m_ValueSerializationHelper: + - e00: 0.7339917 + e01: 0 + e02: 0 + e03: 126.0968 + e10: 0 + e11: 0.7339917 + e12: 0 + e13: 49.07748 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: ba660518f86117f47845c7863f594f11, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -4677576514286111006, guid: ba660518f86117f47845c7863f594f11, + 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 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 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: 566 + width: 822 + height: 433 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 24136 +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 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: 566 + width: 822 + height: 433 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Prefab/Player + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 16 + m_LastFolders: + - Assets/Prefab/Player + m_LastFoldersGridSize: 16 + m_LastProjectPath: D:\OutscalUnityProjects\2D-Platformer-Game\2D-Platformer-Game + m_LockTracker: + m_IsLocked: 1 + m_FolderTreeState: + scrollPos: {x: 0, y: 79} + m_SelectedIDs: 12600000 + m_LastClickedID: 24594 + m_ExpandedIDs: 00000000b85f0000e25f000000ca9a3bffffff7f + 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: 00000000b85f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -496,7 +774,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 13} + m_ClientGUIView: {fileID: 7} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -505,10 +783,10 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 + m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &16 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -546,7 +824,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 511 + m_CachedPref: 310 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 @@ -556,7 +834,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &17 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -580,7 +858,7 @@ MonoBehaviour: x: 0 y: 73 width: 362 - height: 381 + height: 472 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -594,9 +872,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e6f8ffff - m_LastClickedID: -1818 - m_ExpandedIDs: 2692fffff4f8ffff28fbffff + m_SelectedIDs: 485e0000 + m_LastClickedID: 0 + m_ExpandedIDs: b8ccffffb2d4ffff38dbffffdaf5ffff28fbffff74670000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -620,7 +898,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &18 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -644,7 +922,7 @@ MonoBehaviour: x: 363 y: 73 width: 1101 - height: 381 + height: 472 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -931,7 +1209,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -966,6 +1244,19 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 @@ -977,9 +1268,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 34.806767, y: 8.826429, z: -0.8555271} + m_Target: {x: 1.3604292, y: 3.3540754, z: -0.08072603} speed: 2 - m_Value: {x: 34.806767, y: 8.826429, z: -0.8555271} + m_Value: {x: 1.3604292, y: 3.3540754, z: -0.08072603} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1027,11 +1318,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: -1} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 37.07825 + m_Target: 11.157931 speed: 2 - m_Value: 37.07825 + m_Value: 11.157931 m_Ortho: m_Target: 1 speed: 2 @@ -1049,14 +1340,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.13996997, y: 0.22714622, z: -0.033009138, w: -0.96318644} + 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 &19 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1080,7 +1371,7 @@ MonoBehaviour: x: 363 y: 73 width: 1101 - height: 381 + height: 472 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1097,7 +1388,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1101, y: 360} + m_TargetSize: {x: 1101, y: 451} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -1114,8 +1405,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -550.5 m_HBaseRangeMax: 550.5 - m_VBaseRangeMin: -180 - m_VBaseRangeMax: 180 + m_VBaseRangeMin: -225.5 + m_VBaseRangeMax: 225.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1124,7 +1415,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1134,9 +1425,9 @@ MonoBehaviour: x: 0 y: 21 width: 1101 - height: 360 + height: 451 m_Scale: {x: 1, y: 1} - m_Translation: {x: 550.5, y: 180} + m_Translation: {x: 550.5, y: 225.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -1144,18 +1435,18 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -550.5 - y: -180 + y: -225.5 width: 1101 - height: 360 + height: 451 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1101, y: 381} + m_LastWindowPixelSize: {x: 1101, y: 472} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &20 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1177,9 +1468,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 634 - width: 1465 - height: 365 + y: 566 + width: 822 + height: 433 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0