From: KG0104 <76601263+KG0104@users.noreply.github.com> Date: Tue, 10 Aug 2021 10:45:14 +0000 (+0200) Subject: Checkpoint-System v0.1 X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=99f4a6178fc436203d530c21fd3c7a604fa1f6d7;p=SuperMouseAdventure.git Checkpoint-System v0.1 --- diff --git a/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity b/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity index 002c03b..47bc4ab 100644 --- a/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity +++ b/2DGame/Assets/Scenes/Green_Idyll/green_idyll_1.unity @@ -304,7 +304,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 98 + m_RootOrder: 93 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &63049578 GameObject: @@ -416,7 +416,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 68 + m_RootOrder: 64 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &63049582 BoxCollider2D: @@ -675,7 +675,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &115516884 MonoBehaviour: @@ -811,7 +811,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 52 + m_RootOrder: 49 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &169132381 GameObject: @@ -934,7 +934,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &169271316 GameObject: @@ -1034,7 +1034,7 @@ Transform: m_LocalScale: {x: 0.3, y: 0.3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &194630534 GameObject: @@ -1232,7 +1232,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &211959827 GameObject: @@ -1355,7 +1355,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 41 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &212641687 GameObject: @@ -1478,37 +1478,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &221031149 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 221031150} - m_Layer: 0 - m_Name: Ceckpoint (4) - m_TagString: Checkpoint - m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &221031150 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221031149} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 459, y: 17.7, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &242491967 GameObject: @@ -1631,7 +1601,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 44 + m_RootOrder: 41 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &243225404 GameObject: @@ -1647,8 +1617,9 @@ GameObject: - component: {fileID: 243225405} - component: {fileID: 243225411} - component: {fileID: 243225410} - - component: {fileID: 243225412} - component: {fileID: 243225409} + - component: {fileID: 243225414} + - component: {fileID: 243225413} m_Layer: 8 m_Name: schnecke m_TagString: Boss @@ -2178,7 +2149,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 85 + m_RootOrder: 80 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &243225409 MonoBehaviour: @@ -2247,7 +2218,21 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &243225412 +--- !u!114 &243225413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243225404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} + m_Name: + m_EditorClassIdentifier: + enemyHealth: 12 + enemyDamage: 3 +--- !u!114 &243225414 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2256,11 +2241,11 @@ MonoBehaviour: m_GameObject: {fileID: 243225404} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 48f8c2f84b67e714d9f48b4206f041d9, type: 3} + m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} m_Name: m_EditorClassIdentifier: - mouse: {fileID: 936765971} - isFlipped: 0 + mouse: {fileID: 936765968} + flashingTime: 0.3 --- !u!1 &244140546 GameObject: m_ObjectHideFlags: 0 @@ -2344,7 +2329,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 60 + m_RootOrder: 56 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -19.612} --- !u!61 &244140549 BoxCollider2D: @@ -2542,7 +2527,7 @@ MonoBehaviour: source: {fileID: 0} - name: drsh clip: {fileID: 8300000, guid: d835c3fc4bcfcbe43b0e1545a9b07fac, type: 3} - volume: 0.6 + volume: 1 pitch: 1 source: {fileID: 0} --- !u!4 &292106544 @@ -2557,7 +2542,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 54 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &311476188 GameObject: @@ -2800,7 +2785,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 73 + m_RootOrder: 69 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &380106862 MonoBehaviour: @@ -3026,7 +3011,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &405401497 GameObject: @@ -3106,12 +3091,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 405401497} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 106.7, y: 16.4, z: 0} + m_LocalPosition: {x: 115.8, y: 18.4, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: - {fileID: 1236178935} m_Father: {fileID: 0} - m_RootOrder: 87 + m_RootOrder: 82 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &405401500 BoxCollider2D: @@ -3340,7 +3325,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 101 + m_RootOrder: 96 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &431977558 GameObject: @@ -3463,7 +3448,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &435101779 GameObject: @@ -3568,11 +3553,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 435101779} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1029.4, y: -20.7, z: 0} + m_LocalPosition: {x: 1126.2, y: -1.7, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 66 + m_RootOrder: 62 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &453025213 GameObject: @@ -3683,7 +3668,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 79 + m_RootOrder: 75 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &453025217 MonoBehaviour: @@ -3849,7 +3834,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 72 + m_RootOrder: 68 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &461211823 MonoBehaviour: @@ -4015,7 +4000,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 74 + m_RootOrder: 70 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &464558393 MonoBehaviour: @@ -4120,66 +4105,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 471674077} m_CullTransparentMesh: 1 ---- !u!1 &484281656 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 484281657} - m_Layer: 0 - m_Name: Ceckpoint (1) - m_TagString: Checkpoint - m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &484281657 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 484281656} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -36.23, y: 7.9, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &485156844 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 485156845} - m_Layer: 0 - m_Name: Ceckpoint (3) - m_TagString: Checkpoint - m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &485156845 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485156844} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 272.1, y: 9.72, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &506468294 GameObject: m_ObjectHideFlags: 0 @@ -4306,11 +4231,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 515202606} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1053, y: -37.4, z: 0} + m_LocalPosition: {x: 1046.1, y: -35.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 99 + m_RootOrder: 94 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &518388256 GameObject: @@ -4433,7 +4358,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 31 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: @@ -4645,68 +4570,7 @@ Transform: m_Children: - {fileID: 66658441} m_Father: {fileID: 0} - m_RootOrder: 89 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &526840483 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 526840484} - m_Layer: 7 - m_Name: bone_3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &526840484 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526840483} - m_LocalRotation: {x: 0, y: 0, z: -0.7000017, w: 0.7141412} - m_LocalPosition: {x: 0.74142575, y: -1.3682208, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 540586021} - m_Father: {fileID: 1089946331} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &540586020 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 540586021} - m_Layer: 7 - m_Name: bone_4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &540586021 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 540586020} - m_LocalRotation: {x: 0, y: 0, z: -0.02182749, w: 0.9997618} - m_LocalPosition: {x: 0.9704618, y: -0.000000050509513, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 526840484} - m_RootOrder: 0 + m_RootOrder: 84 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &576194712 GameObject: @@ -4817,7 +4681,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 76 + m_RootOrder: 72 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &576194716 MonoBehaviour: @@ -4998,7 +4862,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &668399697 GameObject: @@ -5141,7 +5005,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 70 + m_RootOrder: 66 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &694029834 BoxCollider2D: @@ -5318,7 +5182,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &701358923 GameObject: @@ -5455,7 +5319,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 62 + m_RootOrder: 58 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.388} --- !u!114 &701358928 MonoBehaviour: @@ -5590,7 +5454,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &717537039 GameObject: @@ -5969,37 +5833,7 @@ Transform: - {fileID: 1518807717} - {fileID: 668399698} m_Father: {fileID: 0} - m_RootOrder: 83 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &718850486 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 718850487} - m_Layer: 0 - m_Name: Ceckpoint (5) - m_TagString: Checkpoint - m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &718850487 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 718850486} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 853.6, y: -11.3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 78 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &722593447 GameObject: @@ -10833,7 +10667,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 55 + m_RootOrder: 51 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &726379605 GameObject: @@ -11020,7 +10854,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 69 + m_RootOrder: 65 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &736738616 BoxCollider2D: @@ -11197,7 +11031,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &772116903 GameObject: @@ -11334,7 +11168,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 63 + m_RootOrder: 59 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.974} --- !u!114 &772116908 MonoBehaviour: @@ -11469,7 +11303,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &799096931 GameObject: @@ -11749,7 +11583,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &834198266 GameObject: @@ -11833,7 +11667,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 67 + m_RootOrder: 63 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &834198269 PolygonCollider2D: @@ -12136,7 +11970,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &896600231 GameObject: @@ -12334,7 +12168,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &923355514 GameObject: @@ -12457,7 +12291,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 37 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &936765968 GameObject: @@ -12475,12 +12309,12 @@ GameObject: - component: {fileID: 936765983} - component: {fileID: 936765973} - component: {fileID: 936765976} - - component: {fileID: 936765977} - component: {fileID: 936765978} - component: {fileID: 936765975} - component: {fileID: 936765979} - component: {fileID: 936765980} - component: {fileID: 936765981} + - component: {fileID: 936765977} m_Layer: 0 m_Name: maus m_TagString: Player @@ -12925,17 +12759,9 @@ MonoBehaviour: m_GameObject: {fileID: 936765968} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 735e97089dfbe134483f6327a5a31fc9, type: 3} + m_Script: {fileID: 11500000, guid: e51156189eaae2245924b136bb893dfb, type: 3} m_Name: m_EditorClassIdentifier: - CheckPoints: - - {fileID: 484281656} - - {fileID: 1847378559} - - {fileID: 485156844} - - {fileID: 221031149} - - {fileID: 718850486} - Mouse: {fileID: 936765968} - reset: 0 --- !u!114 &936765978 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13026,7 +12852,7 @@ GameObject: - component: {fileID: 972365582} m_Layer: 0 m_Name: GroundCheck - m_TagString: Mouse + m_TagString: Untagged m_Icon: {fileID: 7250588514170254948, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -13159,7 +12985,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 58 + m_RootOrder: 54 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 13.974} --- !u!61 &974830249 BoxCollider2D: @@ -13382,7 +13208,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 90 + m_RootOrder: 85 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &995274835 GameObject: @@ -13836,7 +13662,7 @@ Transform: - {fileID: 1452174929} - {fileID: 1237924240} m_Father: {fileID: 0} - m_RootOrder: 84 + m_RootOrder: 79 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1016078926 GameObject: @@ -13893,7 +13719,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 92 + m_RootOrder: 87 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1019550504 GameObject: @@ -13937,7 +13763,7 @@ Transform: m_Children: - {fileID: 1146337035} m_Father: {fileID: 0} - m_RootOrder: 100 + m_RootOrder: 95 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1024711147 GameObject: @@ -14060,7 +13886,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1029742217 GameObject: @@ -14086,498 +13912,88 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1029742217} - 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_Children: [] - m_Father: {fileID: 1107270362} - m_RootOrder: 17 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 623.8507, y: 388.60803} - m_SizeDelta: {x: 51.542, y: 51.542} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1029742219 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1029742217} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 46a74d1428d29c342a3d11cb96df7622, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1029742220 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1029742217} - m_CullTransparentMesh: 1 ---- !u!1 &1048943422 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1048943423} - m_Layer: 7 - m_Name: bone_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1048943423 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1048943422} - m_LocalRotation: {x: 0, y: 0, z: -0.72474045, w: 0.68902206} - m_LocalPosition: {x: -0.6557605, y: -1.4798017, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1747707648} - m_Father: {fileID: 1089946331} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1083000045 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1083000046} - m_Layer: 7 - m_Name: bone_3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1083000046 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1083000045} - m_LocalRotation: {x: 0, y: 0, z: -0.7000017, w: 0.7141412} - m_LocalPosition: {x: 0.74142575, y: -1.3682208, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 363924768} - m_Father: {fileID: 1554536754} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1089946327 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1089946331} - - component: {fileID: 1089946330} - - component: {fileID: 1089946329} - - component: {fileID: 1089946328} - - component: {fileID: 1089946332} - - component: {fileID: 1089946334} - - component: {fileID: 1089946336} - - component: {fileID: 1089946335} - - component: {fileID: 1089946333} - m_Layer: 7 - m_Name: eule - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!60 &1089946328 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089946327} - 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: 6.55, y: 7.23} - newSize: {x: 6.55, y: 7.23} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: 0.935, y: -3.615} - - {x: 0.885, y: -3.405} - - {x: 1.0749999, y: -3.5749998} - - {x: 1.115, y: -3.615} - - {x: 1.3149999, y: -3.615} - - {x: 1.415, y: -3.595} - - {x: 1.4549999, y: -3.5649998} - - {x: 1.4549999, y: -3.5149999} - - {x: 1.405, y: -3.435} - - {x: 1.155, y: -3.2649999} - - {x: 0.97499996, y: -3.185} - - {x: 0.905, y: -3.165} - - {x: 0.905, y: -2.225} - - {x: 0.935, y: -2.215} - - {x: 1.1949999, y: -2.095} - - {x: 1.375, y: -1.985} - - {x: 1.505, y: -1.895} - - {x: 1.555, y: -1.9749999} - - {x: 1.6949999, y: -2.225} - - {x: 1.935, y: -2.475} - - {x: 2.0449998, y: -2.5449998} - - {x: 2.235, y: -2.615} - - {x: 2.435, y: -2.605} - - {x: 2.625, y: -2.5249999} - - {x: 2.845, y: -2.325} - - {x: 2.945, y: -2.175} - - {x: 2.975, y: -2.125} - - {x: 3.135, y: -1.795} - - {x: 3.215, y: -1.525} - - {x: 3.2649999, y: -1.1949999} - - {x: 3.2749999, y: -1.115} - - {x: 3.2749999, y: -0.225} - - {x: 3.225, y: 0.044999998} - - {x: 3.175, y: 0.235} - - {x: 3.0549998, y: 0.555} - - {x: 2.915, y: 0.78499997} - - {x: 2.855, y: 0.865} - - {x: 2.745, y: 0.98499995} - - {x: 2.615, y: 1.0849999} - - {x: 2.5049999, y: 1.135} - - {x: 2.395, y: 1.165} - - {x: 2.185, y: 1.365} - - {x: 2.125, y: 1.4649999} - - {x: 2.0449998, y: 1.5849999} - - {x: 1.995, y: 1.635} - - {x: 2.055, y: 1.745} - - {x: 2.095, y: 1.8349999} - - {x: 2.145, y: 2.105} - - {x: 2.155, y: 2.315} - - {x: 2.155, y: 2.875} - - {x: 2.145, y: 3.0049999} - - {x: 2.115, y: 3.225} - - {x: 2.065, y: 3.465} - - {x: 1.9649999, y: 3.615} - - {x: 1.665, y: 3.615} - - {x: 1.5749999, y: 3.595} - - {x: 1.395, y: 3.5149999} - - {x: 0.91499996, y: 3.2749999} - - {x: 0.72499996, y: 3.155} - - {x: 0.525, y: 3.0249999} - - {x: 0.265, y: 2.7849998} - - {x: 0.185, y: 2.645} - - {x: -0.33499998, y: 2.635} - - {x: -0.385, y: 2.685} - - {x: -0.575, y: 2.865} - - {x: -0.745, y: 2.995} - - {x: -0.97499996, y: 3.145} - - {x: -1.165, y: 3.2549999} - - {x: -1.625, y: 3.475} - - {x: -1.915, y: 3.5449998} - - {x: -2.0349998, y: 3.5349998} - - {x: -2.075, y: 3.5149999} - - {x: -2.175, y: 3.365} - - {x: -2.225, y: 3.135} - - {x: -2.245, y: 3.0049999} - - {x: -2.2849998, y: 2.5349998} - - {x: -2.2749999, y: 2.195} - - {x: -2.245, y: 1.995} - - {x: -2.195, y: 1.6949999} - - {x: -2.115, y: 1.525} - - {x: -2.155, y: 1.4649999} - - {x: -2.2549999, y: 1.295} - - {x: -2.375, y: 1.0649999} - - {x: -2.5249999, y: 1.035} - - {x: -2.665, y: 0.945} - - {x: -2.705, y: 0.91499996} - - {x: -2.885, y: 0.73499995} - - {x: -2.955, y: 0.615} - - {x: -3.075, y: 0.405} - - {x: -3.195, y: 0.065} - - {x: -3.2549999, y: -0.21499999} - - {x: -3.2649999, y: -0.345} - - {x: -3.2749999, y: -0.405} - - {x: -3.2749999, y: -1.235} - - {x: -3.2649999, y: -1.305} - - {x: -3.205, y: -1.625} - - {x: -3.155, y: -1.8349999} - - {x: -3.115, y: -1.9549999} - - {x: -2.945, y: -2.2949998} - - {x: -2.735, y: -2.5449998} - - {x: -2.675, y: -2.585} - - {x: -2.5049999, y: -2.685} - - {x: -2.405, y: -2.705} - - {x: -2.215, y: -2.705} - - {x: -2.075, y: -2.675} - - {x: -1.9549999, y: -2.595} - - {x: -1.7049999, y: -2.345} - - {x: -1.535, y: -2.0349998} - - {x: -1.505, y: -1.915} - - {x: -1.425, y: -1.985} - - {x: -1.245, y: -2.095} - - {x: -0.97499996, y: -2.225} - - {x: -0.825, y: -2.2649999} - - {x: -0.825, y: -3.235} - - {x: -0.85499996, y: -3.225} - - {x: -1.035, y: -3.2949998} - - {x: -1.265, y: -3.405} - - {x: -1.375, y: -3.485} - - {x: -1.395, y: -3.5549998} - - {x: -1.305, y: -3.595} - - {x: -1.095, y: -3.595} - - {x: -0.885, y: -3.425} - - {x: -0.91499996, y: -3.585} - - {x: -0.895, y: -3.605} - - {x: -0.555, y: -3.605} - - {x: -0.53499997, y: -3.585} - - {x: -0.585, y: -3.415} - - {x: -0.345, y: -3.595} - - {x: -0.205, y: -3.595} - - {x: -0.035, y: -3.5749998} - - {x: -0.005, y: -3.5349998} - - {x: -0.015, y: -3.495} - - {x: -0.114999995, y: -3.405} - - {x: -0.375, y: -3.2949998} - - {x: -0.45499998, y: -3.2649999} - - {x: -0.555, y: -3.235} - - {x: -0.555, y: -2.335} - - {x: -0.53499997, y: -2.345} - - {x: -0.435, y: -2.365} - - {x: -0.16499999, y: -2.395} - - {x: 0.265, y: -2.395} - - {x: 0.565, y: -2.345} - - {x: 0.625, y: -2.315} - - {x: 0.625, y: -3.175} - - {x: 0.555, y: -3.185} - - {x: 0.315, y: -3.3149998} - - {x: 0.13499999, y: -3.445} - - {x: 0.074999996, y: -3.5049999} - - {x: 0.085, y: -3.5649998} - - {x: 0.114999995, y: -3.605} - - {x: 0.195, y: -3.615} - - {x: 0.385, y: -3.615} - - {x: 0.39499998, y: -3.605} - - {x: 0.585, y: -3.405} - - {x: 0.555, y: -3.605} - - {x: 0.565, y: -3.615} ---- !u!50 &1089946329 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089946327} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 4 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 4 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!212 &1089946330 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089946327} - 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: 0 - m_Sprite: {fileID: 21300000, guid: 44e98b00b9e17954ea3a484958918a5f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 6.55, y: 7.23} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1089946331 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089946327} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 87.7, y: 17.9, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1048943423} - - {fileID: 526840484} - m_Father: {fileID: 0} - m_RootOrder: 80 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1089946332 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089946327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3} - m_Name: - m_EditorClassIdentifier: - player: {fileID: 936765971} - agroRange: 20 - MoveSpeed: 5 - distToPlayer: 0 ---- !u!95 &1089946333 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089946327} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 0b0abcd0a9d5d244da681f8ffeca88e6, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &1089946334 + m_GameObject: {fileID: 1029742217} + 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_Children: [] + m_Father: {fileID: 1107270362} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 623.8507, y: 388.60803} + m_SizeDelta: {x: 51.542, y: 51.542} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1029742219 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089946327} + m_GameObject: {fileID: 1029742217} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - enemyHealth: 1 - enemyDamage: 1 ---- !u!114 &1089946335 -MonoBehaviour: + m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 46a74d1428d29c342a3d11cb96df7622, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1029742220 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089946327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RootBone: {fileID: 1048943423} - m_BoneTransforms: - - {fileID: 1048943423} - - {fileID: 1747707648} - - {fileID: 526840484} - - {fileID: 540586021} - m_Bounds: - m_Center: {x: -0.00000023841858, y: -0.00000023841858, z: 0} - m_Extent: {x: 3.2750006, y: 3.6150007, z: 0} - m_UseBatching: 1 - m_AlwaysUpdate: 1 ---- !u!114 &1089946336 -MonoBehaviour: + m_GameObject: {fileID: 1029742217} + m_CullTransparentMesh: 1 +--- !u!1 &1083000045 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089946327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: - mouse: {fileID: 936765968} - flashingTime: 0.3 + serializedVersion: 6 + m_Component: + - component: {fileID: 1083000046} + m_Layer: 7 + m_Name: bone_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1083000046 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1083000045} + m_LocalRotation: {x: 0, y: 0, z: -0.7000017, w: 0.7141412} + m_LocalPosition: {x: 0.74142575, y: -1.3682208, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 363924768} + m_Father: {fileID: 1554536754} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1107270358 GameObject: m_ObjectHideFlags: 0 @@ -14820,7 +14236,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 51 + m_RootOrder: 48 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1120992166 GameObject: @@ -24688,7 +24104,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 64 + m_RootOrder: 60 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.881} --- !u!114 &1160071118 MonoBehaviour: @@ -24833,7 +24249,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 97 + m_RootOrder: 92 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1236178932 GameObject: @@ -25112,7 +24528,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 38 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1283337206 GameObject: @@ -25221,7 +24637,7 @@ Transform: m_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1332937275 GameObject: @@ -25344,7 +24760,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 47 + m_RootOrder: 44 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1349961926 GameObject: @@ -25467,7 +24883,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1350018456 GameObject: @@ -25603,7 +25019,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 94 + m_RootOrder: 89 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1375631335 GameObject: @@ -25832,8 +25248,52 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 45 + m_RootOrder: 42 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1422846021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1422846022} + - component: {fileID: 1422846023} + m_Layer: 0 + m_Name: CheckpointManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1422846022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422846021} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 961.2174, y: -25.16236, z: -252.36703} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1422846023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422846021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 735e97089dfbe134483f6327a5a31fc9, type: 3} + m_Name: + m_EditorClassIdentifier: + lastCheckpointPos: {x: 0, y: 0} --- !u!1 &1423339812 GameObject: m_ObjectHideFlags: 0 @@ -26211,7 +25671,7 @@ Transform: - {fileID: 1889886567} - {fileID: 973671303} m_Father: {fileID: 0} - m_RootOrder: 82 + m_RootOrder: 77 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1435492665 GameObject: @@ -26348,7 +25808,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 65 + m_RootOrder: 61 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -19.612} --- !u!114 &1435492670 MonoBehaviour: @@ -26445,7 +25905,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 59 + m_RootOrder: 55 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.881} --- !u!61 &1437144609 BoxCollider2D: @@ -26620,7 +26080,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 77 + m_RootOrder: 73 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1445916136 MonoBehaviour: @@ -26794,7 +26254,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 57 + m_RootOrder: 53 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.388} --- !u!61 &1463220795 BoxCollider2D: @@ -27056,7 +26516,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 42 + m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1518807716 GameObject: @@ -27144,7 +26604,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 91 + m_RootOrder: 86 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1540963744 GameObject: @@ -27267,7 +26727,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 36 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1554536745 GameObject: @@ -27646,7 +27106,7 @@ Transform: - {fileID: 1375631336} - {fileID: 1083000046} m_Father: {fileID: 0} - m_RootOrder: 81 + m_RootOrder: 76 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1563690196 GameObject: @@ -27769,7 +27229,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1574157851 GameObject: @@ -27892,7 +27352,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 48 + m_RootOrder: 45 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1605026743 GameObject: @@ -28165,7 +27625,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 46 + m_RootOrder: 43 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1692771180 GameObject: @@ -28288,7 +27748,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 39 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1716698603 GameObject: @@ -28425,7 +27885,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 61 + m_RootOrder: 57 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1716698608 MonoBehaviour: @@ -28560,7 +28020,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 35 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1728737725 GameObject: @@ -28635,7 +28095,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 86 + m_RootOrder: 81 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1735132470 BoxCollider2D: @@ -28663,36 +28123,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 80.43343} m_EdgeRadius: 0 ---- !u!1 &1747707647 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1747707648} - m_Layer: 7 - m_Name: bone_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1747707648 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747707647} - m_LocalRotation: {x: 0, y: 0, z: 0.022525866, w: 0.99974626} - m_LocalPosition: {x: 0.8646418, y: 0.00000015680747, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1048943423} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1767765324 GameObject: m_ObjectHideFlags: 0 @@ -28814,7 +28244,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1788344536 GameObject: @@ -28952,7 +28382,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 71 + m_RootOrder: 67 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1788344541 MonoBehaviour: @@ -29121,7 +28551,7 @@ Transform: m_Children: - {fileID: 61094371} m_Father: {fileID: 0} - m_RootOrder: 88 + m_RootOrder: 83 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1805770084 GameObject: @@ -29259,7 +28689,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 75 + m_RootOrder: 71 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1805770089 MonoBehaviour: @@ -29410,7 +28840,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 49 + m_RootOrder: 46 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1817527321 GameObject: @@ -29533,37 +28963,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1847378559 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1847378560} - m_Layer: 0 - m_Name: Ceckpoint (2) - m_TagString: Checkpoint - m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1847378560 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847378559} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 61.979996, y: 27.349998, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1856208817 GameObject: @@ -29674,7 +29074,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 78 + m_RootOrder: 74 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1856208821 MonoBehaviour: @@ -29825,7 +29225,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1864406218 GameObject: @@ -30054,7 +29454,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1914942130 GameObject: @@ -30177,7 +29577,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 53 + m_RootOrder: 50 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1938402222 GameObject: @@ -30300,7 +29700,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 50 + m_RootOrder: 47 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1949337871 GameObject: @@ -30423,7 +29823,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1950952708 GameObject: @@ -30546,7 +29946,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1954471026 GameObject: @@ -30699,7 +30099,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 43 + m_RootOrder: 40 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1981289146 GameObject: @@ -30822,7 +30222,7 @@ Transform: m_LocalScale: {x: 0.37720466, y: 0.37720466, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 40 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1991681834 GameObject: @@ -30879,7 +30279,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 96 + m_RootOrder: 91 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2023394537 GameObject: @@ -30936,7 +30336,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 95 + m_RootOrder: 90 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2028387665 GameObject: @@ -30993,7 +30393,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 93 + m_RootOrder: 88 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2135147442 GameObject: @@ -31078,7 +30478,7 @@ Transform: m_LocalScale: {x: 3.0586, y: 3.0586, z: 3.0586} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 56 + m_RootOrder: 52 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &2135147445 BoxCollider2D: diff --git a/2DGame/Assets/Scripts/Gegner/Boss/Boss.cs b/2DGame/Assets/Scripts/Gegner/Boss/Boss.cs index 3ed2134..31641dc 100644 --- a/2DGame/Assets/Scripts/Gegner/Boss/Boss.cs +++ b/2DGame/Assets/Scripts/Gegner/Boss/Boss.cs @@ -94,10 +94,6 @@ public class Boss : MonoBehaviour bossHealth--; Destroy(collision.gameObject); } - else if (collision.gameObject.CompareTag("Player")) - { - bossHealth--; - } } } } diff --git a/2DGame/Assets/Scripts/Gegner/Boss/BossDirection.cs b/2DGame/Assets/Scripts/Gegner/Boss/BossDirection.cs deleted file mode 100644 index dd22feb..0000000 --- a/2DGame/Assets/Scripts/Gegner/Boss/BossDirection.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class BossDirection : MonoBehaviour -{ - [SerializeField] - Transform mouse; - - public bool isFlipped; - - public void LookAtPlayer() - { - Vector3 flipped = transform.localScale; - flipped.z *= -1f; - - if(transform.position.x > mouse.position.x && isFlipped) - { - transform.localScale = flipped; - transform.Rotate(0f, 180f, 0f); - isFlipped = false; - } - else if(transform.position.x < mouse.position.x && !isFlipped) - { - transform.localScale = flipped; - transform.Rotate(0f, 180f, 0f); - isFlipped = true; - } - } -} diff --git a/2DGame/Assets/Scripts/Gegner/Boss/BossDirection.cs.meta b/2DGame/Assets/Scripts/Gegner/Boss/BossDirection.cs.meta deleted file mode 100644 index a48fbe8..0000000 --- a/2DGame/Assets/Scripts/Gegner/Boss/BossDirection.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 48f8c2f84b67e714d9f48b4206f041d9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Scripts/Maus/Abyss.cs b/2DGame/Assets/Scripts/Maus/Abyss.cs index c9c8f3e..43ad107 100644 --- a/2DGame/Assets/Scripts/Maus/Abyss.cs +++ b/2DGame/Assets/Scripts/Maus/Abyss.cs @@ -6,18 +6,6 @@ public class Abyss : MonoBehaviour { public bool fallenDown; - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } - private void OnTriggerEnter2D(Collider2D collision) { if(collision.CompareTag("Abyss")) diff --git a/2DGame/Assets/Scripts/Maus/Checkpoint.cs b/2DGame/Assets/Scripts/Maus/Checkpoint.cs index 1fe96ed..b11f7a9 100644 --- a/2DGame/Assets/Scripts/Maus/Checkpoint.cs +++ b/2DGame/Assets/Scripts/Maus/Checkpoint.cs @@ -4,58 +4,18 @@ using UnityEngine; public class Checkpoint : MonoBehaviour { - public GameObject[] CheckPoints; + private CheckpointManager cm; - public GameObject Mouse; - - private Abyss abyss; - private Health health; - - [HideInInspector] - public bool reset; - - // Start is called before the first frame update void Start() { - abyss = GetComponent(); - health = GetComponent(); + cm = GameObject.FindGameObjectWithTag("CheckpointManager").GetComponent(); } - // Update is called once per frame - void Update() + void OnTriggerEnter2D(Collider2D collision) { - if (abyss.fallenDown == true || health.mouseHealth == 0) + if(collision.CompareTag("Player")) { - reset = true; - } - - if (reset == true) - { - for (int i = 0; i < CheckPoints.Length; i++) - { - if (CheckPoints[i].transform.position.x <= Mouse.transform.position.x && CheckPoints[i + 1].transform.position.x >= Mouse.transform.position.x && CheckPoints[CheckPoints.Length-1].transform.position.x > Mouse.transform.position.x) - { - Mouse.transform.position = CheckPoints[i].transform.position; - } - else if (CheckPoints[0].transform.position.x >= Mouse.transform.position.x) - { - Mouse.transform.position = CheckPoints[0].transform.position; - } - else if (CheckPoints[CheckPoints.Length - 1].transform.position.x <= Mouse.transform.position.x) - { - Mouse.transform.position = CheckPoints[CheckPoints.Length - 1].transform.position; - } - - if (Mouse.transform.position == CheckPoints[i].transform.position || Mouse.transform.position == CheckPoints[CheckPoints.Length - 1].transform.position) - { - reset = false; - abyss.fallenDown = false; - if(health.mouseHealth == 0) - { - health.mouseHealth = 5; - } - } - } + cm.lastCheckpointPos = transform.position; } } } diff --git a/2DGame/Assets/Scripts/Maus/Checkpoint.cs.meta b/2DGame/Assets/Scripts/Maus/Checkpoint.cs.meta index 17f5af2..8792b30 100644 --- a/2DGame/Assets/Scripts/Maus/Checkpoint.cs.meta +++ b/2DGame/Assets/Scripts/Maus/Checkpoint.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 735e97089dfbe134483f6327a5a31fc9 +guid: f037a06d9083052489faa3a9c37bb063 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/2DGame/Assets/Scripts/Maus/CheckpointManager.cs b/2DGame/Assets/Scripts/Maus/CheckpointManager.cs new file mode 100644 index 0000000..671d147 --- /dev/null +++ b/2DGame/Assets/Scripts/Maus/CheckpointManager.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CheckpointManager : MonoBehaviour +{ + private static CheckpointManager instance; + public Vector2 lastCheckpointPos; + + void Awake() + { + if (instance == null) + { + instance = this; + DontDestroyOnLoad(instance); + } + else + { + Destroy(gameObject); + } + } +} diff --git a/2DGame/Assets/Scripts/Maus/CheckpointManager.cs.meta b/2DGame/Assets/Scripts/Maus/CheckpointManager.cs.meta new file mode 100644 index 0000000..17f5af2 --- /dev/null +++ b/2DGame/Assets/Scripts/Maus/CheckpointManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 735e97089dfbe134483f6327a5a31fc9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Scripts/Maus/MouseController.cs b/2DGame/Assets/Scripts/Maus/MouseController.cs index 86f54df..1d95c40 100644 --- a/2DGame/Assets/Scripts/Maus/MouseController.cs +++ b/2DGame/Assets/Scripts/Maus/MouseController.cs @@ -30,8 +30,6 @@ public class MouseController : MonoBehaviour [SerializeField] private float shootDelay = 0.5f; - Checkpoint checkpoint; - // Start is called before the first frame update void Start() { @@ -39,10 +37,6 @@ public class MouseController : MonoBehaviour rb = GetComponent(); powerUps = GetComponent(); - - checkpoint = GetComponent(); - - transform.position = checkpoint.CheckPoints[0].transform.position; } // Update is called once per frame @@ -98,11 +92,6 @@ public class MouseController : MonoBehaviour } moveInput = Input.GetAxisRaw("Horizontal"); - - if(moveInput == 0) - { - - } } void FixedUpdate() diff --git a/2DGame/Assets/Scripts/Maus/MousePos.cs b/2DGame/Assets/Scripts/Maus/MousePos.cs new file mode 100644 index 0000000..1c32cc6 --- /dev/null +++ b/2DGame/Assets/Scripts/Maus/MousePos.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class MousePos : MonoBehaviour +{ + private CheckpointManager checkpointManager; + + // Start is called before the first frame update + void Start() + { + checkpointManager = GameObject.FindGameObjectWithTag("Checkpointmanager").GetComponent(); + transform.position = checkpointManager.lastCheckpointPos; + } + + void Update() + { + /**if() + { + SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex); + }*/ + } +} diff --git a/2DGame/Assets/Scripts/Maus/MousePos.cs.meta b/2DGame/Assets/Scripts/Maus/MousePos.cs.meta new file mode 100644 index 0000000..bbf5c2a --- /dev/null +++ b/2DGame/Assets/Scripts/Maus/MousePos.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e51156189eaae2245924b136bb893dfb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/ProjectSettings/TagManager.asset b/2DGame/ProjectSettings/TagManager.asset index 7f30c66..da8ff0f 100644 --- a/2DGame/ProjectSettings/TagManager.asset +++ b/2DGame/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - Heart - Bullet - Boss - - Mouse + - CheckpointManager layers: - Default - TransparentFX