diff --git a/Assets/Prefab/Player.prefab b/Assets/Prefab/Player.prefab index c054121..5dc3ae0 100644 --- a/Assets/Prefab/Player.prefab +++ b/Assets/Prefab/Player.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 1401925064809260275} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -73,7 +73,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: ebfe1595074284e4ba3c93b799b775cd, type: 3} + m_Sprite: {fileID: 21300000, guid: b17eeea0b0d0d489c96df6c0c83c26a6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -122,7 +122,7 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 5.86, y: 4.46} + oldSize: {x: 8.98, y: 8.98} newSize: {x: 17.7, y: 17.7} adaptiveTilingThreshold: 0.5 drawMode: 0 diff --git a/Assets/Scenes/Levels/Level0.unity b/Assets/Scenes/Levels/Level0.unity index f3ddcbd..8f3fde1 100644 --- a/Assets/Scenes/Levels/Level0.unity +++ b/Assets/Scenes/Levels/Level0.unity @@ -2109,13 +2109,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4392037887545814066, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4392037887545814066, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} diff --git a/Assets/Scenes/Levels/Level1.unity b/Assets/Scenes/Levels/Level1.unity index 4da34d0..533a40f 100644 --- a/Assets/Scenes/Levels/Level1.unity +++ b/Assets/Scenes/Levels/Level1.unity @@ -528,8 +528,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101161151} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.05, y: -3.45, z: 0} - m_LocalScale: {x: 7.789429, y: 3.8211892, z: 1} + m_LocalPosition: {x: -0.0373, y: -3.45, z: 0} + m_LocalScale: {x: 2.201288, y: 3.8211892, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 16 @@ -621,6 +621,8 @@ GameObject: m_Component: - component: {fileID: 360428659} - component: {fileID: 360428658} + - component: {fileID: 360428661} + - component: {fileID: 360428660} m_Layer: 0 m_Name: Water (1) m_TagString: Untagged @@ -687,121 +689,50 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 360428657} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.21, y: -3.87, z: 0} - m_LocalScale: {x: 0.86199623, y: 2.2912023, z: 1.3011264} + m_LocalPosition: {x: 5.6525, y: -3.87, z: 0} + m_LocalScale: {x: 0.9738842, y: 2.2912023, z: 1.3011264} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &385738288 -GameObject: +--- !u!114 &360428660 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 385738291} - - component: {fileID: 385738290} - - component: {fileID: 385738289} - m_Layer: 6 - m_Name: Square (2) - m_TagString: Obstacle - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &385738289 + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &360428661 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385738288} + m_GameObject: {fileID: 360428657} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} + border: {x: 0, y: 0, z: 0.06, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} + m_Size: {x: 9.97, y: 1.29} m_EdgeRadius: 0 ---- !u!212 &385738290 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385738288} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 0.61960787, g: 0.7843138, b: 0.45098042, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &385738291 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 385738288} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.68, y: -1.95, z: 0} - m_LocalScale: {x: 2.332517, y: 2.1375, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 18 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &445321478 GameObject: m_ObjectHideFlags: 0 @@ -922,115 +853,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &485807946 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 485807949} - - component: {fileID: 485807948} - - component: {fileID: 485807947} - m_Layer: 6 - m_Name: Square (1) - m_TagString: Obstacle - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &485807947 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485807946} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &485807948 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485807946} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 0.61960787, g: 0.7843138, b: 0.45098042, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &485807949 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485807946} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.7846, y: -1.95, z: 0} - m_LocalScale: {x: 2.332517, y: 2.1375, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -1882,6 +1704,8 @@ GameObject: m_Component: - component: {fileID: 2005321465} - component: {fileID: 2005321464} + - component: {fileID: 2005321466} + - component: {fileID: 2005321467} m_Layer: 0 m_Name: Water m_TagString: Untagged @@ -1954,6 +1778,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2005321466 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 +--- !u!114 &2005321467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &2045120143 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4392037887426014566, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} @@ -1993,7 +1855,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.x - value: -0.04 + value: -0.03 objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.y @@ -2031,10 +1893,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1401925065402265157, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: b17eeea0b0d0d489c96df6c0c83c26a6, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} --- !u!1001 &4392037887054685161 diff --git a/Assets/Scenes/Levels/Level10.unity b/Assets/Scenes/Levels/Level10.unity index 5bc4d12..740296d 100644 --- a/Assets/Scenes/Levels/Level10.unity +++ b/Assets/Scenes/Levels/Level10.unity @@ -730,6 +730,8 @@ GameObject: m_Component: - component: {fileID: 360428659} - component: {fileID: 360428658} + - component: {fileID: 360428661} + - component: {fileID: 360428660} m_Layer: 0 m_Name: Water (1) m_TagString: Untagged @@ -802,6 +804,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &360428660 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 +--- !u!114 &360428661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &445321478 GameObject: m_ObjectHideFlags: 0 @@ -2092,6 +2132,8 @@ GameObject: m_Component: - component: {fileID: 2005321465} - component: {fileID: 2005321464} + - component: {fileID: 2005321467} + - component: {fileID: 2005321466} m_Layer: 0 m_Name: Water m_TagString: Untagged @@ -2164,6 +2206,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2005321466 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 +--- !u!114 &2005321467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &2045120143 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4392037887426014566, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} diff --git a/Assets/Scenes/Levels/Level2.unity b/Assets/Scenes/Levels/Level2.unity index bb766bb..a7e05f5 100644 --- a/Assets/Scenes/Levels/Level2.unity +++ b/Assets/Scenes/Levels/Level2.unity @@ -621,6 +621,8 @@ GameObject: m_Component: - component: {fileID: 360428659} - component: {fileID: 360428658} + - component: {fileID: 360428661} + - component: {fileID: 360428660} m_Layer: 0 m_Name: Water (1) m_TagString: Untagged @@ -693,6 +695,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &360428660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &360428661 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 --- !u!1 &385738288 GameObject: m_ObjectHideFlags: 0 @@ -1882,6 +1922,8 @@ GameObject: m_Component: - component: {fileID: 2005321465} - component: {fileID: 2005321464} + - component: {fileID: 2005321467} + - component: {fileID: 2005321466} m_Layer: 0 m_Name: Water m_TagString: Untagged @@ -1954,6 +1996,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2005321466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &2005321467 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 --- !u!114 &2045120143 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4392037887426014566, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} diff --git a/Assets/Scenes/Levels/Level3.unity b/Assets/Scenes/Levels/Level3.unity index ad0b5d8..b43bc3e 100644 --- a/Assets/Scenes/Levels/Level3.unity +++ b/Assets/Scenes/Levels/Level3.unity @@ -418,12 +418,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59069998} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.14, y: 1.49, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.25, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 + m_Father: {fileID: 1621146284} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &213086155 GameObject: @@ -615,12 +615,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 445321478} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.39, y: 1.59, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.05000019, y: -0.23000002, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 15 + m_Father: {fileID: 559894757} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: @@ -781,9 +781,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 559894755} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.59, y: 3.24, z: 0} + m_LocalPosition: {x: -0.4, y: 3.24, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 947231830} + - {fileID: 445321482} + - {fileID: 900161864} m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1009,12 +1012,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 900161860} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.39, y: 1.59, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.05000019, y: -0.23000002, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 16 + m_Father: {fileID: 559894757} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &947231827 GameObject: @@ -1113,12 +1116,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947231827} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.39, y: 1.59, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.20000029, y: -0.16000009, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 12 + m_Father: {fileID: 559894757} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &947231831 CircleCollider2D: @@ -1326,12 +1329,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1094132247} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.14, y: 1.49, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.25, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 14 + m_Father: {fileID: 1621146284} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1177459657 stripped GameObject: @@ -1594,7 +1597,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!212 &1621146283 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1656,7 +1659,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6.11, y: 3.22, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1919562621} + - {fileID: 1094132251} + - {fileID: 59070002} m_Father: {fileID: 0} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1767,12 +1773,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1919562618} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.16, y: 1.49, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.01999998, y: -0.25, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 13 + m_Father: {fileID: 1621146284} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &1919562622 CircleCollider2D: diff --git a/Assets/Scenes/Levels/Level4.unity b/Assets/Scenes/Levels/Level4.unity index d0ed5b5..b347cde 100644 --- a/Assets/Scenes/Levels/Level4.unity +++ b/Assets/Scenes/Levels/Level4.unity @@ -730,6 +730,8 @@ GameObject: m_Component: - component: {fileID: 360428659} - component: {fileID: 360428658} + - component: {fileID: 360428661} + - component: {fileID: 360428660} m_Layer: 0 m_Name: Water (1) m_TagString: Untagged @@ -802,6 +804,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &360428660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &360428661 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 --- !u!1 &445321478 GameObject: m_ObjectHideFlags: 0 @@ -1401,9 +1441,6 @@ MonoBehaviour: - {fileID: 947231827} - {fileID: 1919562618} - {fileID: 1094132247} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} --- !u!1 &1094132247 GameObject: m_ObjectHideFlags: 0 @@ -1773,6 +1810,8 @@ GameObject: m_Component: - component: {fileID: 2005321465} - component: {fileID: 2005321464} + - component: {fileID: 2005321467} + - component: {fileID: 2005321466} m_Layer: 0 m_Name: Water m_TagString: Untagged @@ -1845,6 +1884,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2005321466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &2005321467 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 --- !u!114 &2045120143 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4392037887426014566, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} diff --git a/Assets/Scenes/Levels/Level5.unity b/Assets/Scenes/Levels/Level5.unity index 0870868..4186e36 100644 --- a/Assets/Scenes/Levels/Level5.unity +++ b/Assets/Scenes/Levels/Level5.unity @@ -730,6 +730,8 @@ GameObject: m_Component: - component: {fileID: 360428659} - component: {fileID: 360428658} + - component: {fileID: 360428661} + - component: {fileID: 360428660} m_Layer: 0 m_Name: Water (1) m_TagString: Untagged @@ -796,12 +798,50 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 360428657} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.25, y: -3.77, z: 0} - m_LocalScale: {x: 0.86199623, y: 2.2783716, z: 1.3011264} + m_LocalPosition: {x: 4.6715, y: -3.8826, z: 0} + m_LocalScale: {x: 0.9723279, y: 2.1065824, z: 1.3011264} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &360428660 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 +--- !u!114 &360428661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &445321478 GameObject: m_ObjectHideFlags: 0 @@ -1570,19 +1610,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!65 &1557706155 -BoxCollider: +--- !u!61 &1557706155 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1557706154} + m_Enabled: 1 + m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1.0000004, y: 0.99999994} + m_EdgeRadius: 0 --- !u!23 &1557706156 MeshRenderer: m_ObjectHideFlags: 0 @@ -1868,6 +1921,8 @@ GameObject: m_Component: - component: {fileID: 2005321465} - component: {fileID: 2005321464} + - component: {fileID: 2005321467} + - component: {fileID: 2005321466} m_Layer: 0 m_Name: Water m_TagString: Untagged @@ -1934,12 +1989,50 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005321463} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.88, y: -3.7865, z: 0} - m_LocalScale: {x: 0.86199623, y: 2.2912023, z: 1.3011264} + m_LocalPosition: {x: -4.4994, y: -3.8979, z: 0} + m_LocalScale: {x: 0.9723279, y: 2.1184456, z: 1.3011264} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2005321466 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 +--- !u!114 &2005321467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &2045120143 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4392037887426014566, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} diff --git a/Assets/Scenes/Levels/Level6.unity b/Assets/Scenes/Levels/Level6.unity index 26e3948..ad8f550 100644 --- a/Assets/Scenes/Levels/Level6.unity +++ b/Assets/Scenes/Levels/Level6.unity @@ -423,7 +423,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &101161151 GameObject: @@ -532,7 +532,7 @@ Transform: m_LocalScale: {x: 5.087161, y: 0.8553778, z: 0.7335626} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &194431123 GameObject: @@ -627,7 +627,7 @@ Transform: m_LocalScale: {x: 0.4294703, y: 0.8180388, z: 0.7049569} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: -89.26, z: 0} --- !u!1 &213086155 GameObject: @@ -786,7 +786,7 @@ Transform: m_LocalScale: {x: 0.86199623, y: 2.2783716, z: 1.3011264} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &445321478 GameObject: @@ -906,7 +906,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: @@ -1098,7 +1098,7 @@ Transform: m_LocalScale: {x: 5.945442, y: 2.8548365, z: 2.306631} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -27.3} --- !u!1 &559894755 GameObject: @@ -1180,7 +1180,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &900161860 GameObject: @@ -1300,7 +1300,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &925599098 GameObject: @@ -1409,128 +1409,8 @@ Transform: m_LocalScale: {x: 5.945442, y: 2.8548365, z: 2.306631} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &947231827 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 947231830} - - component: {fileID: 947231829} - - component: {fileID: 947231828} - - component: {fileID: 947231831} - m_Layer: 0 - m_Name: enemy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &947231828 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 947231827} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a515e7c6c1edfdd44a449609cf5191e2, type: 3} - m_Name: - m_EditorClassIdentifier: - moveSpeed: 0.1 - canSeePlayer: 1 - distanceThreshold: 0.4 - playerDistanceThreshold: 1 - dodgeTime: 0.25 - linecastLayer: - serializedVersion: 2 - m_Bits: 64 ---- !u!212 &947231829 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 947231827} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 348ec1c916227cf4eaaa3252b191c07a, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &947231830 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 947231827} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.46, y: -1.18, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &947231831 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 947231827} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 3.71 --- !u!1 &1011955017 GameObject: m_ObjectHideFlags: 0 @@ -1602,132 +1482,9 @@ MonoBehaviour: - {fileID: 332760482} - {fileID: 2094619830} bees: - - {fileID: 947231827} - - {fileID: 1919562618} - - {fileID: 1094132247} - {fileID: 445321478} - {fileID: 900161860} - {fileID: 59069998} ---- !u!1 &1094132247 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1094132251} - - component: {fileID: 1094132250} - - component: {fileID: 1094132249} - - component: {fileID: 1094132248} - m_Layer: 0 - m_Name: enemy (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!58 &1094132248 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094132247} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 3.71 ---- !u!114 &1094132249 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094132247} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a515e7c6c1edfdd44a449609cf5191e2, type: 3} - m_Name: - m_EditorClassIdentifier: - moveSpeed: 0.1 - canSeePlayer: 1 - distanceThreshold: 0.4 - playerDistanceThreshold: 1 - dodgeTime: 0.25 - linecastLayer: - serializedVersion: 2 - m_Bits: 64 ---- !u!212 &1094132250 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094132247} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 348ec1c916227cf4eaaa3252b191c07a, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1094132251 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1094132247} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.7, y: -1.2800001, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1177459657 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4392037888227620896, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} @@ -1840,7 +1597,7 @@ Transform: m_LocalScale: {x: 0.7105375, y: 0.6815078, z: 0.55064} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1334512717 stripped MonoBehaviour: @@ -1883,19 +1640,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!65 &1557706155 -BoxCollider: +--- !u!61 &1557706155 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1557706154} + m_Enabled: 1 + m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1.0000004, y: 0.99999994} + m_EdgeRadius: 0 --- !u!23 &1557706156 MeshRenderer: m_ObjectHideFlags: 0 @@ -1957,7 +1727,7 @@ Transform: m_LocalScale: {x: 2.5212865, y: 4.802451, z: 4.228484} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: -89.26, z: 0} --- !u!1 &1621146282 GameObject: @@ -2039,7 +1809,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1688767157 stripped Transform: @@ -2051,207 +1821,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4392037887790457043, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} m_PrefabInstance: {fileID: 4392037887054685161} m_PrefabAsset: {fileID: 0} ---- !u!1 &1919562618 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1919562621} - - component: {fileID: 1919562620} - - component: {fileID: 1919562619} - - component: {fileID: 1919562622} - m_Layer: 0 - m_Name: enemy (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1919562619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919562618} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a515e7c6c1edfdd44a449609cf5191e2, type: 3} - m_Name: - m_EditorClassIdentifier: - moveSpeed: 0.1 - canSeePlayer: 1 - distanceThreshold: 0.4 - playerDistanceThreshold: 1 - dodgeTime: 0.25 - linecastLayer: - serializedVersion: 2 - m_Bits: 64 ---- !u!212 &1919562620 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919562618} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 348ec1c916227cf4eaaa3252b191c07a, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1919562621 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919562618} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.72, y: -1.2800001, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!58 &1919562622 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919562618} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 3.71 ---- !u!1001 &1989380501 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1401925064809260275, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 8.98 - objectReference: {fileID: 0} - - target: {fileID: 1401925064809260275, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 8.98 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265152, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_Name - value: Player (1) - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalScale.x - value: 0.23494548 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalScale.y - value: 0.23507255 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalScale.z - value: 0.10724 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalPosition.x - value: -0.04 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalPosition.y - value: -2.01 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265157, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: b17eeea0b0d0d489c96df6c0c83c26a6, type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} --- !u!1 &2005321463 GameObject: m_ObjectHideFlags: 0 @@ -2332,7 +1901,7 @@ Transform: m_LocalScale: {x: 0.86199623, y: 2.2912023, z: 1.3011264} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2045120143 stripped MonoBehaviour: @@ -2397,7 +1966,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.y - value: -0.02 + value: -0.29 objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scenes/Levels/Level7.unity b/Assets/Scenes/Levels/Level7.unity index 5778124..86ed7ad 100644 --- a/Assets/Scenes/Levels/Level7.unity +++ b/Assets/Scenes/Levels/Level7.unity @@ -423,7 +423,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &101161151 GameObject: @@ -532,7 +532,7 @@ Transform: m_LocalScale: {x: 6.434419, y: 7.3908944, z: 1.6869739} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} --- !u!1 &194431123 GameObject: @@ -553,19 +553,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!65 &194431124 -BoxCollider: +--- !u!61 &194431124 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 194431123} + m_Enabled: 1 + m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1.0000004, y: 0.99999994} + m_EdgeRadius: 0 --- !u!23 &194431125 MeshRenderer: m_ObjectHideFlags: 0 @@ -627,7 +640,7 @@ Transform: m_LocalScale: {x: 0.76913834, y: 2.252477, z: 2.808684} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: -89.26, z: 0} --- !u!1 &206396386 GameObject: @@ -648,19 +661,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!65 &206396387 -BoxCollider: +--- !u!61 &206396387 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 206396386} + m_Enabled: 1 + m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1.0000004, y: 1} + m_EdgeRadius: 0 --- !u!23 &206396388 MeshRenderer: m_ObjectHideFlags: 0 @@ -722,7 +748,7 @@ Transform: m_LocalScale: {x: 2.5212865, y: 1.5757062, z: 2.6392355} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: -89.26, z: 0} --- !u!1 &213086155 GameObject: @@ -881,7 +907,7 @@ Transform: m_LocalScale: {x: 0.86199623, y: 2.2783716, z: 1.3011264} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &445321478 GameObject: @@ -1001,7 +1027,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: @@ -1166,7 +1192,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &900161860 GameObject: @@ -1286,7 +1312,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &925599098 GameObject: @@ -1395,7 +1421,7 @@ Transform: m_LocalScale: {x: 10.344747, y: 2.8548365, z: 2.306631} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &947231827 GameObject: @@ -1499,7 +1525,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &947231831 CircleCollider2D: @@ -1712,7 +1738,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1177459657 stripped GameObject: @@ -1826,7 +1852,7 @@ Transform: m_LocalScale: {x: 0.7105375, y: 0.6815078, z: 0.55064} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1334512717 stripped MonoBehaviour: @@ -1957,7 +1983,7 @@ Transform: m_LocalScale: {x: 6.434419, y: 7.3908944, z: 1.6869739} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} --- !u!1 &1557706154 GameObject: @@ -1978,19 +2004,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!65 &1557706155 -BoxCollider: +--- !u!61 &1557706155 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1557706154} + m_Enabled: 1 + m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1.0000004, y: 1} + m_EdgeRadius: 0 --- !u!23 &1557706156 MeshRenderer: m_ObjectHideFlags: 0 @@ -2052,7 +2091,7 @@ Transform: m_LocalScale: {x: 2.5212865, y: 1.5757062, z: 2.6392355} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: -89.26, z: 0} --- !u!1 &1621146282 GameObject: @@ -2134,7 +2173,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1688767157 stripped Transform: @@ -2248,7 +2287,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!58 &1919562622 CircleCollider2D: @@ -2266,87 +2305,6 @@ CircleCollider2D: m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 3.71 ---- !u!1001 &1989380501 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1401925064809260275, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 8.98 - objectReference: {fileID: 0} - - target: {fileID: 1401925064809260275, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 8.98 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265152, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_Name - value: Player (1) - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalScale.x - value: 0.23494548 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalScale.y - value: 0.23507255 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalScale.z - value: 0.10724 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalPosition.x - value: -1.52 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalPosition.y - value: -2.4 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265157, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: b17eeea0b0d0d489c96df6c0c83c26a6, type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} --- !u!1 &2005321463 GameObject: m_ObjectHideFlags: 0 @@ -2427,7 +2385,7 @@ Transform: m_LocalScale: {x: 0.86199623, y: 2.2912023, z: 1.3011264} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2045120143 stripped MonoBehaviour: @@ -2689,7 +2647,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4392037888338472869, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} propertyPath: m_AnchoredPosition.y - value: -15.699997 + value: -15.700012 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} diff --git a/Assets/Scenes/Levels/Level8.unity b/Assets/Scenes/Levels/Level8.unity index d84ea71..fb538fb 100644 --- a/Assets/Scenes/Levels/Level8.unity +++ b/Assets/Scenes/Levels/Level8.unity @@ -730,6 +730,8 @@ GameObject: m_Component: - component: {fileID: 360428659} - component: {fileID: 360428658} + - component: {fileID: 360428661} + - component: {fileID: 360428660} m_Layer: 0 m_Name: Water (1) m_TagString: Untagged @@ -802,6 +804,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &360428660 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 +--- !u!114 &360428661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &445321478 GameObject: m_ObjectHideFlags: 0 @@ -1679,19 +1719,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!65 &1557706155 -BoxCollider: +--- !u!61 &1557706155 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1557706154} + m_Enabled: 1 + m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1.0000004, y: 1} + m_EdgeRadius: 0 --- !u!23 &1557706156 MeshRenderer: m_ObjectHideFlags: 0 @@ -1977,6 +2030,8 @@ GameObject: m_Component: - component: {fileID: 2005321465} - component: {fileID: 2005321464} + - component: {fileID: 2005321467} + - component: {fileID: 2005321466} m_Layer: 0 m_Name: Water m_TagString: Untagged @@ -2049,6 +2104,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &2005321466 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 +--- !u!114 &2005321467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &2045120143 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4392037887426014566, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} diff --git a/Assets/Scenes/Levels/Level9.unity b/Assets/Scenes/Levels/Level9.unity index 7f3e345..0a534eb 100644 --- a/Assets/Scenes/Levels/Level9.unity +++ b/Assets/Scenes/Levels/Level9.unity @@ -730,6 +730,8 @@ GameObject: m_Component: - component: {fileID: 360428659} - component: {fileID: 360428658} + - component: {fileID: 360428661} + - component: {fileID: 360428660} m_Layer: 0 m_Name: Water (1) m_TagString: Untagged @@ -802,6 +804,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &360428660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &360428661 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360428657} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 --- !u!1 &445321478 GameObject: m_ObjectHideFlags: 0 @@ -1983,6 +2023,8 @@ GameObject: m_Component: - component: {fileID: 2005321465} - component: {fileID: 2005321464} + - component: {fileID: 2005321467} + - component: {fileID: 2005321466} m_Layer: 0 m_Name: Water m_TagString: Untagged @@ -2055,6 +2097,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2005321466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62a860876ed5bff4c8bd406d15191ab7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &2005321467 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005321463} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0.06, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 9.97, y: 1.29} + newSize: {x: 10, y: 2.6} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 9.97, y: 1.29} + m_EdgeRadius: 0 --- !u!114 &2045120143 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4392037887426014566, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Enemy.cs index 58153da..4e0ea31 100644 --- a/Assets/Scripts/Enemy.cs +++ b/Assets/Scripts/Enemy.cs @@ -11,9 +11,11 @@ public class Enemy : MonoBehaviour public float dodgeTime = 0.2f; float dodgeTimer = 0; public LayerMask linecastLayer; + float offset; private void Awake() { dodgeTimer = dodgeTime; + offset = Random.Range(-0.5f,0.5f); } @@ -53,7 +55,7 @@ public class Enemy : MonoBehaviour } } - Vector3 direction = (GameManager.Player.position - new Vector3(0,0.5f,0) - transform.position).normalized; + Vector3 direction = (GameManager.Player.position - new Vector3(-offset/2f,offset,0) - transform.position).normalized; float rot_z = Mathf.Atan2(direction.y,direction.x) * Mathf.Rad2Deg; transform.rotation = Quaternion.Euler(0,0,rot_z+180); if (dodgeTimer < dodgeTime) @@ -63,7 +65,8 @@ public class Enemy : MonoBehaviour if (dodgeTimer > dodgeTime/100f || true) { debugColor = Color.red; - transform.Translate(new Vector3(-direction.x, direction.y) * moveSpeed * 1.2f, Space.World); + Vector3 new_direction = (hit.point - (Vector2)transform.position).normalized; + transform.Translate(-new_direction * moveSpeed * 1.2f, Space.World); return; } } diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 9689789..c9b07ad 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -116,6 +116,10 @@ public class GameManager : MonoBehaviour public void Restart() { + SceneManager.LoadScene(SceneManager.GetActiveScene().name); + } + + public void BackToMenu(){ SceneManager.LoadScene(0); } } diff --git a/Assets/Scripts/LevelSelect.cs b/Assets/Scripts/LevelSelect.cs index f8a31d2..5ef3b73 100644 --- a/Assets/Scripts/LevelSelect.cs +++ b/Assets/Scripts/LevelSelect.cs @@ -97,6 +97,7 @@ public class LevelSelect : MonoBehaviour } }else{ newLevel.transform.GetChild(1).GetComponent().sprite = locked; + newLevel.GetComponent