diff --git a/.idea/.idea.SpringJam2026/.idea/workspace.xml b/.idea/.idea.SpringJam2026/.idea/workspace.xml index 975ab76..0a6a2e9 100644 --- a/.idea/.idea.SpringJam2026/.idea/workspace.xml +++ b/.idea/.idea.SpringJam2026/.idea/workspace.xml @@ -6,22 +6,20 @@ - - + - - + - - - - - - - - + + + + + + + + + + diff --git a/Assets/Prefabs/Catepillar/Player.controller b/Assets/Prefabs/Catepillar/Player.controller index bc572a8..8c34216 100644 --- a/Assets/Prefabs/Catepillar/Player.controller +++ b/Assets/Prefabs/Catepillar/Player.controller @@ -70,7 +70,7 @@ AnimatorStateMachine: m_Position: {x: 290, y: 10, z: 0} - serializedVersion: 1 m_State: {fileID: 705262314255223608} - m_Position: {x: 50, y: -70, z: 0} + m_Position: {x: 70, y: -50, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 2479910129929821769} diff --git a/Assets/Prefabs/Catepillar/Player.prefab b/Assets/Prefabs/Catepillar/Player.prefab index 434e4ee..de8886a 100644 --- a/Assets/Prefabs/Catepillar/Player.prefab +++ b/Assets/Prefabs/Catepillar/Player.prefab @@ -129,6 +129,75 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &6273068575883000904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8103630482236428761} + - component: {fileID: 4318867988752660676} + m_Layer: 6 + m_Name: Pickup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8103630482236428761 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6273068575883000904} + 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: 6196444245332325679} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!70 &4318867988752660676 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6273068575883000904} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0.23, y: 0.06} + m_Size: {x: 1.04, y: 0.62} + m_Direction: 1 --- !u!1 &7621021177568661959 GameObject: m_ObjectHideFlags: 0 @@ -164,6 +233,7 @@ Transform: m_Children: - {fileID: 7502548564051151498} - {fileID: 7851886427722646009} + - {fileID: 8103630482236428761} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2598533458249844269 @@ -222,8 +292,8 @@ CapsuleCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0.23512886, y: 0.114549875} - m_Size: {x: 1, y: 0.75} + m_Offset: {x: 0.17, y: -0.02} + m_Size: {x: 0.83, y: 0.38} m_Direction: 1 --- !u!50 &4169369283586250626 Rigidbody2D: @@ -266,7 +336,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::Player.Movement runSpeed: 4 springPower: 12 - jumpForce: 5 + jumpForce: 8 airJumpForce: 10 spriteRenderer: {fileID: 342790821639359709} turnDelay: 0.08 diff --git a/Assets/Prefabs/Fruits.prefab b/Assets/Prefabs/Fruits.prefab index 07a8e3c..56bf9de 100644 --- a/Assets/Prefabs/Fruits.prefab +++ b/Assets/Prefabs/Fruits.prefab @@ -69,6 +69,75 @@ CircleCollider2D: m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_Radius: 0.5 +--- !u!1 &570866338223848240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2357748693730873160} + - component: {fileID: 579871506282652378} + m_Layer: 6 + m_Name: Fruit (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2357748693730873160 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570866338223848240} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.57, y: 36.96, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3280346501851351387} + m_Father: {fileID: 8964614072675907068} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &579871506282652378 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570866338223848240} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.5 --- !u!1 &1054146797587491373 GameObject: m_ObjectHideFlags: 0 @@ -138,6 +207,188 @@ CircleCollider2D: m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_Radius: 0.5 +--- !u!1 &1276879239298999925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8673172367472309338} + - component: {fileID: 330551930614536851} + m_Layer: 6 + m_Name: fruit_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8673172367472309338 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276879239298999925} + 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: 3630503104322272465} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &330551930614536851 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1276879239298999925} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -5321949957799140045, guid: 8832522912916174da6762a3f507e424, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.11, y: 0.13} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!1 &1469979049539617394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7625565364518031453} + - component: {fileID: 3210657709084334877} + m_Layer: 6 + m_Name: fruit_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7625565364518031453 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1469979049539617394} + 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: 427537766845577438} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3210657709084334877 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1469979049539617394} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -5321949957799140045, guid: 8832522912916174da6762a3f507e424, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.11, y: 0.13} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 --- !u!1 &2171102414955224967 GameObject: m_ObjectHideFlags: 0 @@ -276,6 +527,213 @@ CircleCollider2D: m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_Radius: 0.5 +--- !u!1 &2767323928976524981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3630503104322272465} + - component: {fileID: 863143678361964414} + m_Layer: 6 + m_Name: Fruit (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3630503104322272465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2767323928976524981} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.54, y: 39.77, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8673172367472309338} + m_Father: {fileID: 8964614072675907068} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &863143678361964414 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2767323928976524981} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.5 +--- !u!1 &3168432614778170965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 427537766845577438} + - component: {fileID: 2285202493327577578} + m_Layer: 6 + m_Name: Fruit (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &427537766845577438 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3168432614778170965} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.54, y: 33.56, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7625565364518031453} + m_Father: {fileID: 8964614072675907068} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &2285202493327577578 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3168432614778170965} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.5 +--- !u!1 &3372699098800210374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1165211411203108075} + - component: {fileID: 265902634997548744} + m_Layer: 6 + m_Name: Fruit (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1165211411203108075 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372699098800210374} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.45, y: 30.75, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4692285808808656696} + m_Father: {fileID: 8964614072675907068} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &265902634997548744 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3372699098800210374} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.5 --- !u!1 &3648719755775049102 GameObject: m_ObjectHideFlags: 0 @@ -309,6 +767,11 @@ Transform: - {fileID: 6465293702084625332} - {fileID: 1742777940869627503} - {fileID: 7699430765027214211} + - {fileID: 1165211411203108075} + - {fileID: 427537766845577438} + - {fileID: 2357748693730873160} + - {fileID: 3630503104322272465} + - {fileID: 7714465483194129227} - {fileID: 5719302248048427379} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -403,6 +866,75 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!1 &6211785002480731764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7714465483194129227} + - component: {fileID: 1587288724959125309} + m_Layer: 6 + m_Name: Fruit (9) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7714465483194129227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6211785002480731764} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.48, y: 37.32, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5094174200139209133} + m_Father: {fileID: 8964614072675907068} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &1587288724959125309 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6211785002480731764} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.5 --- !u!1 &7343383109831373340 GameObject: m_ObjectHideFlags: 0 @@ -494,6 +1026,188 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!1 &7547271766701394943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3280346501851351387} + - component: {fileID: 7883928444389766343} + m_Layer: 6 + m_Name: fruit_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3280346501851351387 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7547271766701394943} + 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: 2357748693730873160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7883928444389766343 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7547271766701394943} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -5321949957799140045, guid: 8832522912916174da6762a3f507e424, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.11, y: 0.13} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!1 &7670910891503676417 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4692285808808656696} + - component: {fileID: 6663466733797227610} + m_Layer: 6 + m_Name: fruit_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4692285808808656696 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7670910891503676417} + 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: 1165211411203108075} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6663466733797227610 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7670910891503676417} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -5321949957799140045, guid: 8832522912916174da6762a3f507e424, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.11, y: 0.13} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 --- !u!1 &7688187765123647794 GameObject: m_ObjectHideFlags: 0 @@ -585,6 +1299,97 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +--- !u!1 &7997835702331968933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5094174200139209133} + - component: {fileID: 8757398884056809299} + m_Layer: 6 + m_Name: fruit_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5094174200139209133 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7997835702331968933} + 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: 7714465483194129227} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8757398884056809299 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7997835702331968933} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -5321949957799140045, guid: 8832522912916174da6762a3f507e424, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.11, y: 0.13} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 --- !u!1 &8313017316234316981 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 0ede7bd..c73e1cb 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -299,6 +299,97 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &320210439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320210440} + - component: {fileID: 320210441} + m_Layer: 3 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &320210440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320210439} + 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: 1519105351} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &320210441 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320210439} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -6156498168698554787, guid: fe9451f7d72f25c46b358dea2652b0b4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.32, y: 0.08} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 --- !u!1 &1102711991 GameObject: m_ObjectHideFlags: 0 @@ -356,9 +447,9 @@ Camera: m_NormalizedViewPortRect: serializedVersion: 2 x: 0 - y: 0 + y: 0.0009259259 width: 1 - height: 1 + height: 0.99814814 near clip plane: 0.3 far clip plane: 1000 field of view: 60 @@ -554,6 +645,168 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1519105347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1519105351} + - component: {fileID: 1519105350} + - component: {fileID: 1519105349} + - component: {fileID: 1519105348} + m_Layer: 3 + m_Name: Spring (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1519105348 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519105347} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0.0053329766, y: 0.19199395} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.4973335, y: 0.11601212} + oldSize: {x: 2, y: 0.5} + newSize: {x: 2, y: 0.5} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 2, y: 0.5} + m_EdgeRadius: 0 +--- !u!212 &1519105349 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519105347} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -6156498168698554787, guid: fe9451f7d72f25c46b358dea2652b0b4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2, y: 0.5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 +--- !u!95 &1519105350 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519105347} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f2a68cf0a5dfbe44b8ece6a0155d7dd8, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!4 &1519105351 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519105347} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.34, y: 25.07, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 320210440} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1601201176 GameObject: m_ObjectHideFlags: 0 @@ -3903,6 +4156,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 + - first: {x: -11, y: 37, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 18 + m_TileSpriteIndex: 18 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 - first: {x: 16, y: 37, z: 0} second: serializedVersion: 2 @@ -3923,6 +4186,66 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 + - first: {x: -16, y: 38, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -15, y: 38, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -14, y: 38, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 16 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -13, y: 38, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -12, y: 38, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 15 + m_TileSpriteIndex: 15 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -11, y: 38, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 - first: {x: 16, y: 38, z: 0} second: serializedVersion: 2 @@ -3983,6 +4306,96 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 + - first: {x: -7, y: 41, 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: -6, y: 41, 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: -5, y: 41, 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: -4, y: 41, 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: -3, y: 41, 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: -2, y: 41, 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: 41, 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: 0, y: 41, 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: 41, 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: 16, y: 41, z: 0} second: serializedVersion: 2 @@ -4003,6 +4416,96 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 + - first: {x: -7, y: 42, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -6, y: 42, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -5, y: 42, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -4, y: 42, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -3, y: 42, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -2, y: 42, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -1, y: 42, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 0, y: 42, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 1, y: 42, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 - first: {x: 16, y: 42, z: 0} second: serializedVersion: 2 @@ -4033,11 +4536,1081 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 + - first: {x: -17, y: 44, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 3, y: 44, 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: 4, y: 44, 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: 5, y: 44, 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: 6, y: 44, 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: 7, y: 44, 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: 8, y: 44, 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: 9, y: 44, 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: 10, y: 44, 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: 11, y: 44, 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: 16, y: 44, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 3, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 4, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 5, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 6, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 7, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 8, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 9, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 10, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 11, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 45, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 46, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 11, y: 46, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 46, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 47, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 11, y: 47, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 47, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 48, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -7, y: 48, 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: -6, y: 48, 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: -5, y: 48, 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: -4, y: 48, 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: -3, y: 48, 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: -2, y: 48, 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: 48, 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: 0, y: 48, 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: 48, 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: 11, y: 48, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 48, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -7, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -6, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -5, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -4, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -3, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -2, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -1, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 0, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 1, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 11, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 49, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 50, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 50, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 51, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 51, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 52, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 52, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 53, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 53, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 54, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 54, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 55, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 55, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 56, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 56, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 57, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 57, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 58, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 58, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 59, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 59, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 60, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 60, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 61, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 61, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 62, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 62, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 63, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 63, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: 64, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 64, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 65, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 66, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 67, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 68, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 69, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 70, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 9, y: 71, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 20 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 71, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 9, y: 72, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 20 + m_TileSpriteIndex: 20 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 10, y: 72, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 11, y: 72, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 12, y: 72, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 13, y: 72, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 14, y: 72, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 15, y: 72, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 72, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 10, y: 73, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 73, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 74, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 75, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 76, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 77, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 78, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 79, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: 80, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 38 + - m_RefCount: 65 m_Data: {fileID: 11400000, guid: 134f5f7acd979c145a58235ea1b40f5e, type: 2} - - m_RefCount: 152 + - m_RefCount: 156 m_Data: {fileID: 11400000, guid: a2293e4285fc73e4e9e857ac597aeafe, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 60cea1cb8ed42f641a053ca1f26f0444, type: 2} @@ -4051,24 +5624,36 @@ Tilemap: m_Data: {fileID: 11400000, guid: 76a0f730eabbf32428bacb468f188607, type: 2} - m_RefCount: 28 m_Data: {fileID: 11400000, guid: c83d9693c5d895a44823a5e2c20786b8, type: 2} - - m_RefCount: 35 + - m_RefCount: 72 m_Data: {fileID: 11400000, guid: 9afc5c7d903804548b379d9868d420db, type: 2} - m_RefCount: 17 m_Data: {fileID: 11400000, guid: 653bed1caa1cec7409e2218a015e35ca, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 7299263ba5b7fa347b89fd1f83d8fb56, type: 2} - - m_RefCount: 24 + - m_RefCount: 38 m_Data: {fileID: 11400000, guid: e97d0bfcd2d059442b9233645f05c774, type: 2} - - m_RefCount: 10 + - m_RefCount: 17 m_Data: {fileID: 11400000, guid: 33d34bd226eff624c89231f02f170384, type: 2} - m_RefCount: 12 m_Data: {fileID: 11400000, guid: 779afcdf2ac7d8a4a9f86f49336120e3, type: 2} - - m_RefCount: 7 + - m_RefCount: 8 m_Data: {fileID: 11400000, guid: 09f04746decc69747af5de209f5af61b, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: bd577f0b0ff284445b29aecf84626b4b, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 1d5b15715d21a964cada298dc7fefb17, type: 2} + - m_RefCount: 10 + m_Data: {fileID: 11400000, guid: 79658d08f0cc20242980b0ed645de8b5, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: bdd97f5a2dcbb4e47a0084db2d949bbf, type: 2} + - m_RefCount: 27 + m_Data: {fileID: 11400000, guid: 19f66220c354f4a46918885f07bf7695, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: bb11cd0e45269a6469ff153dba77e0a3, type: 2} m_TileSpriteArray: - - m_RefCount: 38 + - m_RefCount: 65 m_Data: {fileID: 9085546173938197295, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - - m_RefCount: 152 + - m_RefCount: 156 m_Data: {fileID: -1930571348, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - m_RefCount: 28 m_Data: {fileID: -1756127752, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} @@ -4080,7 +5665,7 @@ Tilemap: m_Data: {fileID: -1344842703, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - m_RefCount: 4 m_Data: {fileID: 934348549, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - - m_RefCount: 35 + - m_RefCount: 72 m_Data: {fileID: 856717892, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - m_RefCount: 1 m_Data: {fileID: 315442859, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} @@ -4088,16 +5673,28 @@ Tilemap: m_Data: {fileID: 849119907, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - m_RefCount: 1 m_Data: {fileID: 1224811296, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - - m_RefCount: 24 + - m_RefCount: 38 m_Data: {fileID: 1113913433, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - - m_RefCount: 10 + - m_RefCount: 17 m_Data: {fileID: 304323244, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - m_RefCount: 12 m_Data: {fileID: -555949730, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - - m_RefCount: 7 + - m_RefCount: 8 m_Data: {fileID: 6197192568713671372, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -1245410657, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -779581496, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} + - m_RefCount: 10 + m_Data: {fileID: -3755448495774436313, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -5622494010663576134, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} + - m_RefCount: 27 + m_Data: {fileID: 485721445, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 1101770504183819589, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} m_TileMatrixArray: - - m_RefCount: 334 + - m_RefCount: 466 m_Data: e00: 1 e01: 0 @@ -4116,13 +5713,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 334 + - m_RefCount: 466 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: -19, y: -8, z: 0} - m_Size: {x: 39, y: 52, z: 1} + m_Size: {x: 39, y: 89, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -4192,9 +5789,29 @@ CompositeCollider2D: - X: 85000000 Y: 65000000 - X: 85000000 - Y: 220000000 + Y: 405000000 - X: 80000000 - Y: 220000000 + Y: 405000000 + - X: 80000000 + Y: 365000000 + - X: 55000000 + Y: 365000000 + - X: 55000000 + Y: 370000000 + - X: 50000000 + Y: 370000000 + - X: 50000000 + Y: 365000000 + - X: 45000000 + Y: 365000000 + - X: 45000000 + Y: 355000000 + - X: 50000000 + Y: 355000000 + - X: 50000000 + Y: 360000000 + - X: 80000000 + Y: 360000000 - X: 80000000 Y: -10000000 - X: 75000000 @@ -4208,9 +5825,21 @@ CompositeCollider2D: - X: -80000000 Y: -10000000 - X: -80000000 - Y: 220000000 + Y: 190000000 + - X: -55000000 + Y: 190000000 + - X: -55000000 + Y: 185000000 + - X: -50000000 + Y: 185000000 + - X: -50000000 + Y: 195000000 + - X: -80000000 + Y: 195000000 + - X: -80000000 + Y: 325000000 - X: -85000000 - Y: 220000000 + Y: 325000000 - X: -85000000 Y: -15000000 - X: -95000000 @@ -4219,6 +5848,190 @@ CompositeCollider2D: Y: -40000000 - X: 95000000 Y: -40000000 + - - X: 20000000 + Y: 221875008 + - X: 20625000 + Y: 221250000 + - X: 24375000 + Y: 221250000 + - X: 25000000 + Y: 221875008 + - X: 25625000 + Y: 221250000 + - X: 29375000 + Y: 221250000 + - X: 30000000 + Y: 221875008 + - X: 30625000 + Y: 221250000 + - X: 34375000 + Y: 221250000 + - X: 35000000 + Y: 221875008 + - X: 35625000 + Y: 221250000 + - X: 39375000 + Y: 221250000 + - X: 40000000 + Y: 221875008 + - X: 40625000 + Y: 221250000 + - X: 44375000 + Y: 221250000 + - X: 45000000 + Y: 221875008 + - X: 45625000 + Y: 221250000 + - X: 49375000 + Y: 221250000 + - X: 50000000 + Y: 221875008 + - X: 50625000 + Y: 221250000 + - X: 54375000 + Y: 221250000 + - X: 55000000 + Y: 221875008 + - X: 55625000 + Y: 221250000 + - X: 59375000 + Y: 221250000 + - X: 60000000 + Y: 221875008 + - X: 60000000 + Y: 250000000 + - X: 55000000 + Y: 250000000 + - X: 55000000 + Y: 230000000 + - X: 15000000 + Y: 230000000 + - X: 15000000 + Y: 221875008 + - X: 15625000 + Y: 221250000 + - X: 19375000 + Y: 221250000 + - - X: -30000000 + Y: 241875008 + - X: -29375000 + Y: 241250000 + - X: -25625000 + Y: 241250000 + - X: -25000000 + Y: 241875008 + - X: -24375000 + Y: 241250000 + - X: -20625000 + Y: 241250000 + - X: -20000000 + Y: 241875008 + - X: -19375000 + Y: 241250000 + - X: -15625000 + Y: 241250000 + - X: -15000000 + Y: 241875008 + - X: -14375000 + Y: 241250000 + - X: -10625000 + Y: 241250000 + - X: -10000000 + Y: 241875008 + - X: -9375000 + Y: 241250000 + - X: -5625000 + Y: 241250000 + - X: -5000000 + Y: 241875008 + - X: -4375000 + Y: 241250000 + - X: -625000 + Y: 241250000 + - X: 0 + Y: 241875008 + - X: 625000 + Y: 241250000 + - X: 4375000 + Y: 241250000 + - X: 5000000 + Y: 241875008 + - X: 5625000 + Y: 241250000 + - X: 9375000 + Y: 241250000 + - X: 10000000 + Y: 241875008 + - X: 10000000 + Y: 250000000 + - X: -35000000 + Y: 250000000 + - X: -35000000 + Y: 241875008 + - X: -34375000 + Y: 241250000 + - X: -30625000 + Y: 241250000 + - - X: -30000000 + Y: 206875008 + - X: -29375000 + Y: 206250000 + - X: -25625000 + Y: 206250000 + - X: -25000000 + Y: 206875008 + - X: -24375000 + Y: 206250000 + - X: -20625000 + Y: 206250000 + - X: -20000000 + Y: 206875008 + - X: -19375000 + Y: 206250000 + - X: -15625000 + Y: 206250000 + - X: -15000000 + Y: 206875008 + - X: -14375000 + Y: 206250000 + - X: -10625000 + Y: 206250000 + - X: -10000000 + Y: 206875008 + - X: -9375000 + Y: 206250000 + - X: -5625000 + Y: 206250000 + - X: -5000000 + Y: 206875008 + - X: -4375000 + Y: 206250000 + - X: -625000 + Y: 206250000 + - X: 0 + Y: 206875008 + - X: 625000 + Y: 206250000 + - X: 4375000 + Y: 206250000 + - X: 5000000 + Y: 206875008 + - X: 5625000 + Y: 206250000 + - X: 9375000 + Y: 206250000 + - X: 10000000 + Y: 206875008 + - X: 10000000 + Y: 215000000 + - X: -35000000 + Y: 215000000 + - X: -35000000 + Y: 206875008 + - X: -34375000 + Y: 206250000 + - X: -30625000 + Y: 206250000 m_CompositePaths: m_Paths: - - {x: 9.49997, y: -4} @@ -4226,19 +6039,127 @@ CompositeCollider2D: - {x: 10, y: -1.4999707} - {x: 9.99997, y: 6.5} - {x: 8.5, y: 6.5000296} - - {x: 8.49997, y: 22} - - {x: 8, y: 21.999971} + - {x: 8.49997, y: 40.5} + - {x: 8, y: 40.499973} + - {x: 7.9999704, y: 36.5} + - {x: 5.5, y: 36.50003} + - {x: 5.499971, y: 37} + - {x: 5, y: 36.999973} + - {x: 4.9999704, y: 36.5} + - {x: 4.5, y: 36.499973} + - {x: 4.500029, y: 35.5} + - {x: 5, y: 35.50003} + - {x: 5.0000296, y: 36} + - {x: 8, y: 35.999973} - {x: 7.9999704, y: -1} - {x: 7.5, y: -1.0000293} - {x: 7.4999704, y: -1.5} - {x: -7.5, y: -1.4999707} - {x: -7.5000296, y: -1} - {x: -8, y: -0.9999706} - - {x: -8.00003, y: 22} - - {x: -8.5, y: 21.999971} + - {x: -7.9999704, y: 19} + - {x: -5.5, y: 18.999971} + - {x: -5.499971, y: 18.5} + - {x: -5, y: 18.500029} + - {x: -5.000029, y: 19.5} + - {x: -8, y: 19.500029} + - {x: -8.00003, y: 32.5} + - {x: -8.5, y: 32.499973} - {x: -8.50003, y: -1.5} - {x: -9.5, y: -1.5000293} - {x: -9.49997, y: -4} + - - {x: -3.0625107, y: 24.125} + - {x: -2.9999795, y: 24.18748} + - {x: -2.9374893, y: 24.125} + - {x: -2.5624924, y: 24.125008} + - {x: -2.4999795, y: 24.18748} + - {x: -2.4374893, y: 24.125} + - {x: -2.0624924, y: 24.125008} + - {x: -1.9999794, y: 24.18748} + - {x: -1.9374893, y: 24.125} + - {x: -1.5624924, y: 24.125008} + - {x: -1.4999794, y: 24.18748} + - {x: -1.4374893, y: 24.125} + - {x: -1.0624924, y: 24.125008} + - {x: -0.99997944, y: 24.18748} + - {x: -0.9374892, y: 24.125} + - {x: -0.56249243, y: 24.125008} + - {x: -0.4999794, y: 24.18748} + - {x: -0.4374892, y: 24.125} + - {x: -0.0624924, y: 24.125008} + - {x: 0.0000206, y: 24.18748} + - {x: 0.0625108, y: 24.125} + - {x: 0.4375076, y: 24.125008} + - {x: 0.5000206, y: 24.18748} + - {x: 0.5625108, y: 24.125} + - {x: 0.9375076, y: 24.125008} + - {x: 1, y: 24.187511} + - {x: 0.99997073, y: 25} + - {x: -3.5, y: 24.999971} + - {x: -3.4999924, y: 24.187492} + - {x: -3.4374893, y: 24.125} + - - {x: 1.9374893, y: 22.125} + - {x: 2.0000207, y: 22.18748} + - {x: 2.0625107, y: 22.125} + - {x: 2.4375076, y: 22.125008} + - {x: 2.5000207, y: 22.18748} + - {x: 2.5625107, y: 22.125} + - {x: 2.9375076, y: 22.125008} + - {x: 3.0000207, y: 22.18748} + - {x: 3.0625107, y: 22.125} + - {x: 3.4375076, y: 22.125008} + - {x: 3.5000207, y: 22.18748} + - {x: 3.5625107, y: 22.125} + - {x: 3.9375076, y: 22.125008} + - {x: 4.000021, y: 22.18748} + - {x: 4.062511, y: 22.125} + - {x: 4.4375076, y: 22.125008} + - {x: 4.500021, y: 22.18748} + - {x: 4.562511, y: 22.125} + - {x: 4.9375076, y: 22.125008} + - {x: 5.000021, y: 22.18748} + - {x: 5.062511, y: 22.125} + - {x: 5.4375076, y: 22.125008} + - {x: 5.500021, y: 22.18748} + - {x: 5.562511, y: 22.125} + - {x: 5.9375076, y: 22.125008} + - {x: 6, y: 22.187511} + - {x: 5.999971, y: 25} + - {x: 5.5, y: 24.999971} + - {x: 5.4999704, y: 23} + - {x: 1.5, y: 22.999971} + - {x: 1.5000076, y: 22.187492} + - {x: 1.5625108, y: 22.125} + - - {x: -3.0625107, y: 20.625} + - {x: -2.9999795, y: 20.68748} + - {x: -2.9374893, y: 20.625} + - {x: -2.5624924, y: 20.625008} + - {x: -2.4999795, y: 20.68748} + - {x: -2.4374893, y: 20.625} + - {x: -2.0624924, y: 20.625008} + - {x: -1.9999794, y: 20.68748} + - {x: -1.9374893, y: 20.625} + - {x: -1.5624924, y: 20.625008} + - {x: -1.4999794, y: 20.68748} + - {x: -1.4374893, y: 20.625} + - {x: -1.0624924, y: 20.625008} + - {x: -0.99997944, y: 20.68748} + - {x: -0.9374892, y: 20.625} + - {x: -0.56249243, y: 20.625008} + - {x: -0.4999794, y: 20.68748} + - {x: -0.4374892, y: 20.625} + - {x: -0.0624924, y: 20.625008} + - {x: 0.0000206, y: 20.68748} + - {x: 0.0625108, y: 20.625} + - {x: 0.4375076, y: 20.625008} + - {x: 0.5000206, y: 20.68748} + - {x: 0.5625108, y: 20.625} + - {x: 0.9375076, y: 20.625008} + - {x: 1, y: 20.687511} + - {x: 0.99997073, y: 21.5} + - {x: -3.5, y: 21.499971} + - {x: -3.4999924, y: 20.687492} + - {x: -3.4374893, y: 20.625} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 m_UseDelaunayMesh: 0 @@ -4523,6 +6444,67 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 2, y: 0.5} m_EdgeRadius: 0 +--- !u!1001 &1814193807 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3648719755775049102, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_Name + value: Fruits + objectReference: {fileID: 0} + - target: {fileID: 3648719755775049102, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8964614072675907068, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 067c711b87e00ef4d9158c92377f44a6, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -4531,5 +6513,7 @@ SceneRoots: - {fileID: 135794690} - {fileID: 118420888} - {fileID: 1755712273} + - {fileID: 1519105351} - {fileID: 1454353602} - {fileID: 219800105} + - {fileID: 1814193807} diff --git a/Assets/Scripts/Player/Movement.cs b/Assets/Scripts/Player/Movement.cs index fb4adb6..eb1d3e8 100644 --- a/Assets/Scripts/Player/Movement.cs +++ b/Assets/Scripts/Player/Movement.cs @@ -100,6 +100,7 @@ namespace Player _grounded = false; _fireSpring = true; _autoDrive = false; + _deathArmed = true; } if (_grounded && _jumpPressedThisFrame) @@ -151,6 +152,18 @@ namespace Player { _rb.linearVelocityX = _facingLeft ? -runSpeed : runSpeed; } + else + { + if (_rb.linearVelocityX < 0) + { + _facingLeft = true; + } + + if (_rb.linearVelocityX > 0) + { + _facingLeft = false; + } + } animator.SetBool(Grounded, _grounded); animator.SetFloat(Speed, Mathf.Abs(_rb.linearVelocity.x)); @@ -189,12 +202,6 @@ namespace Player private void OnTriggerExit2D(Collider2D other) { - if (other.gameObject.layer == LayerMask.NameToLayer("DeathBox")) - { - _deathArmed = true; - return; - } - if (other.gameObject.layer == LayerMask.NameToLayer("Spring")) { _springAnimator = null; @@ -224,10 +231,17 @@ namespace Player var x = c.normal.x; if (Mathf.Abs(x) > 0.1f) { - _facingLeft = !_facingLeft; _turnDelayTimer = 0f; if (!_autoDrive) + { _rb.AddForce(new Vector2(x, 0f) * bouncePower, ForceMode2D.Impulse); + } + else + { + _rb.linearVelocityX = -_rb.linearVelocityX; + _facingLeft = !_facingLeft; + } + Services.Instance.SFX.PlayOneShot(bumpSound); break; } diff --git a/Assets/Scripts/State/Game/MainMenuState.cs b/Assets/Scripts/State/Game/MainMenuState.cs index cf0f6b8..a8c91a2 100644 --- a/Assets/Scripts/State/Game/MainMenuState.cs +++ b/Assets/Scripts/State/Game/MainMenuState.cs @@ -49,6 +49,8 @@ namespace State.Game private void HandleStartGame() { _mainMenuInstance.OnStartGame -= HandleStartGame; + StateMachine.ChangeState(new StartGameState()); } + } } \ No newline at end of file diff --git a/Assets/Scripts/State/Game/StartGameState.cs b/Assets/Scripts/State/Game/StartGameState.cs index 66f0a17..fdc5bda 100644 --- a/Assets/Scripts/State/Game/StartGameState.cs +++ b/Assets/Scripts/State/Game/StartGameState.cs @@ -9,7 +9,7 @@ namespace State.Game public override void OnEnter(Machine machine) { base.OnEnter(machine); - + StateMachine.StartCoroutine(LoadGame()); } private IEnumerator LoadGame() diff --git a/Assets/Settings/UniversalRP.asset b/Assets/Settings/UniversalRP.asset index d9771fc..9333679 100644 --- a/Assets/Settings/UniversalRP.asset +++ b/Assets/Settings/UniversalRP.asset @@ -100,42 +100,42 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeMainLightShadows: 4 m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterAlphaOutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterScreenSpaceIrradiance: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterScreenSpaceIrradiance: 1 + m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 - m_PrefilterBicubicLightmapSampling: 0 - m_PrefilterReflectionProbeRotation: 0 - m_PrefilterReflectionProbeBlending: 0 - m_PrefilterReflectionProbeBoxProjection: 0 - m_PrefilterReflectionProbeAtlas: 0 + m_PrefilterBicubicLightmapSampling: 1 + m_PrefilterReflectionProbeRotation: 1 + m_PrefilterReflectionProbeBlending: 1 + m_PrefilterReflectionProbeBoxProjection: 1 + m_PrefilterReflectionProbeAtlas: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/Tilemaps/Button.png b/Assets/Tilemaps/Button.png new file mode 100644 index 0000000..f02f240 --- /dev/null +++ b/Assets/Tilemaps/Button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4681968bc23d4399e5b09b8157c80a1d547929205c24e6fe4bfefcb4138115e0 +size 233 diff --git a/Assets/Tilemaps/Button.png.meta b/Assets/Tilemaps/Button.png.meta new file mode 100644 index 0000000..e49bc1e --- /dev/null +++ b/Assets/Tilemaps/Button.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 1f130562140931a40ab99026d30c2e2e +TextureImporter: + internalIDToNameTable: + - first: + 213: 649223268058989734 + second: Button_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Button_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 64 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6a403906f11820900800000000000000 + internalID: 649223268058989734 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Button_0: 649223268058989734 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tilemaps/Forest/Forest_20.asset b/Assets/Tilemaps/Forest/Forest_20.asset index 65e7636..8919b01 100644 --- a/Assets/Tilemaps/Forest/Forest_20.asset +++ b/Assets/Tilemaps/Forest/Forest_20.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 2 + m_ColliderType: 1 diff --git a/Assets/Tilemaps/MainMenubackground.png b/Assets/Tilemaps/MainMenubackground.png new file mode 100644 index 0000000..7d87b8e --- /dev/null +++ b/Assets/Tilemaps/MainMenubackground.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbafe30c3db6f512d918c95a99c616b9c3cd440b3c38636f2f7b161b645f4c59 +size 8827 diff --git a/Assets/Tilemaps/MainMenubackground.png.meta b/Assets/Tilemaps/MainMenubackground.png.meta new file mode 100644 index 0000000..c1d2ced --- /dev/null +++ b/Assets/Tilemaps/MainMenubackground.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: dd9d5042efe7dcc438a9cd7425e1aa60 +TextureImporter: + internalIDToNameTable: + - first: + 213: 7543811174218464340 + second: MainMenubackground_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: MainMenubackground_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1280 + height: 720 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 45cf9eb4b4001b860800000000000000 + internalID: 7543811174218464340 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + MainMenubackground_0: 7543811174218464340 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI/MainMenu.uxml b/Assets/UI/MainMenu.uxml index 100c018..822d221 100644 --- a/Assets/UI/MainMenu.uxml +++ b/Assets/UI/MainMenu.uxml @@ -1,8 +1,8 @@