From b7fb5e48815fe32f89f9aac6dc76d1df7972b5f7 Mon Sep 17 00:00:00 2001 From: KG0104 <76601263+KG0104@users.noreply.github.com> Date: Sat, 11 Sep 2021 13:02:18 +0200 Subject: [PATCH] Dialogue-System v0.6.2 --- .../(1) Green_Idyll/green_idyll_1.unity | 1041 +++++++++-------- .../(1) Green_Idyll/green_idyll_10.unity | 2 +- 2DGame/Assets/Scripts/Dialogue/Dialogue.cs | 32 +- .../Scripts/Dialogue/DialogueTrigger.cs | 10 - .../Assets/Scripts/Mouse/CheckpointManager.cs | 1 - 2DGame/Assets/Scripts/Mouse/Cheese.cs | 15 +- 2DGame/Assets/Scripts/Mouse/MousePos.cs | 2 +- 7 files changed, 547 insertions(+), 556 deletions(-) diff --git a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity index 6b36fac..0ae4b97 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity @@ -182,7 +182,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 116 + m_RootOrder: 114 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &26713742 GameObject: @@ -457,7 +457,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 58 + m_RootOrder: 56 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &54829512 GameObject: @@ -566,7 +566,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 56 + m_RootOrder: 54 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &56472776 GameObject: @@ -675,7 +675,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 89 + m_RootOrder: 87 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &61187373 GameObject: @@ -841,7 +841,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 73 + m_RootOrder: 71 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &66658440 GameObject: @@ -885,8 +885,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1ef543ae79779264dad553f77239ae34, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!212 &66658443 SpriteRenderer: m_ObjectHideFlags: 0 @@ -971,7 +971,7 @@ RectTransform: - {fileID: 1887736391} - {fileID: 1307921123} m_Father: {fileID: 1107270362} - m_RootOrder: 7 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -988,8 +988,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.8784314} m_RaycastTarget: 1 @@ -1232,7 +1232,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 86 + m_RootOrder: 84 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &141614171 GameObject: @@ -1343,6 +1343,85 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 47 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &152328528 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 152328529} + - component: {fileID: 152328531} + - component: {fileID: 152328530} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &152328529 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152328528} + 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: 1544514251} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &152328530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152328528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0.18039216, b: 0.9960785, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\xDCberspringen" +--- !u!222 &152328531 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 152328528} + m_CullTransparentMesh: 1 --- !u!1 &152546817 GameObject: m_ObjectHideFlags: 0 @@ -1450,7 +1529,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 93 + m_RootOrder: 91 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &169271316 GameObject: @@ -1659,7 +1738,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 74 + m_RootOrder: 72 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &180334512 GameObject: @@ -1716,8 +1795,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: bumperForce: 100 mouse: {fileID: 936765968} --- !u!212 &180334515 @@ -1783,7 +1862,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 121 + m_RootOrder: 119 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &186249469 GameObject: @@ -1892,7 +1971,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 78 + m_RootOrder: 76 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &191038584 GameObject: @@ -1949,8 +2028,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: bumperForce: 100 mouse: {fileID: 936765968} --- !u!212 &191038587 @@ -2016,7 +2095,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 122 + m_RootOrder: 120 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &214740913 GameObject: @@ -2047,8 +2126,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3} --- !u!61 &214740915 BoxCollider2D: @@ -2188,8 +2267,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -2263,8 +2342,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_TrackedObjectOffset: {x: 0, y: 0, z: 0} m_LookaheadTime: 0 m_LookaheadSmoothing: 0 @@ -2306,8 +2385,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_TrackedObjectOffset: {x: 0, y: 0, z: 0} m_LookaheadTime: 0 m_LookaheadSmoothing: 0 @@ -2333,8 +2412,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1 &292106542 GameObject: m_ObjectHideFlags: 0 @@ -2362,8 +2441,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 877fd518f8e969e4993b4f52073a9bca, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: sounds: - name: sprung clip: {fileID: 8300000, guid: d3531d40a8de83b43a9a75af09138830, type: 3} @@ -2526,7 +2605,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 64 + m_RootOrder: 62 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &311476188 GameObject: @@ -2557,12 +2636,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1107270362} + m_Father: {fileID: 471674078} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 293.83997, y: -56.724976} + m_AnchoredPosition: {x: 321.65997, y: -57.40004} m_SizeDelta: {x: 51.541992, y: 51.541992} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &311476190 @@ -2575,8 +2654,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -2652,8 +2731,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_WrapAround: 0 @@ -2695,7 +2774,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 0 m_CallState: 1 --- !u!114 &336217344 @@ -2708,8 +2787,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -2767,8 +2846,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -2782,8 +2861,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &345396788 BoxCollider2D: @@ -2900,7 +2979,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 112 + m_RootOrder: 110 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &363924767 GameObject: @@ -3148,7 +3227,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 68 + m_RootOrder: 66 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &397286148 GameObject: @@ -3179,12 +3258,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1107270362} + m_Father: {fileID: 471674078} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 345.38, y: -56.724976} + m_AnchoredPosition: {x: 373.2, y: -57.4} m_SizeDelta: {x: 51.541992, y: 51.541992} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &397286150 @@ -3197,8 +3276,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -3391,8 +3470,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: bumperForce: 160 mouse: {fileID: 936765968} --- !u!212 &429880756 @@ -3676,7 +3755,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 75 + m_RootOrder: 73 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &445692660 GameObject: @@ -3727,8 +3806,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_WrapAround: 0 @@ -3770,7 +3849,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 0 m_CallState: 1 --- !u!114 &445692664 @@ -3783,8 +3862,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -3898,13 +3977,17 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1283337207} - - {fileID: 1206416086} + - {fileID: 1488509465} + - {fileID: 896600232} + - {fileID: 995274836} + - {fileID: 311476189} + - {fileID: 397286149} m_Father: {fileID: 1107270362} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 56.724976, y: -56.724976} + m_AnchoredPosition: {x: 118, y: -86} m_SizeDelta: {x: 113.449005, y: 113.449005} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &471674079 @@ -3917,8 +4000,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -4048,7 +4131,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 477455562} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 203.3, y: 25.3, z: 0} + m_LocalPosition: {x: 203.48, y: 27.24, z: 0} m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} @@ -4150,8 +4233,8 @@ MonoBehaviour: m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0d8051f3ea1f9294c890e6d3a53d6837, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: begrenzer: {fileID: 1284463699} mouse: {fileID: 936765968} cameraLock: {fileID: 1790915304} @@ -4224,8 +4307,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_RenderShadows: 1 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 @@ -4256,8 +4339,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_ShowDebugText: 0 m_ShowCameraFrustum: 1 m_IgnoreTimeScale: 0 @@ -4498,7 +4581,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 63 + m_RootOrder: 61 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &581721062 GameObject: @@ -4607,7 +4690,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 97 + m_RootOrder: 95 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &583615246 GameObject: @@ -4670,8 +4753,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -4685,8 +4768,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &631259027 BoxCollider2D: @@ -4803,7 +4886,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 134 + m_RootOrder: 132 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &631343912 GameObject: @@ -4887,7 +4970,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 132 + m_RootOrder: 130 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &631343915 Animator: @@ -4904,7 +4987,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_WarningMessage: + m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 @@ -4918,8 +5001,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5c29d09f2b5174b07812a2ca95ed3316, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: dialogueManager: {fileID: 2036393123} speakers: - {fileID: 1423490228} @@ -5034,7 +5117,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 95 + m_RootOrder: 93 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &668399697 GameObject: @@ -5095,7 +5178,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 117 + m_RootOrder: 115 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &694882655 GameObject: @@ -5204,7 +5287,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 90 + m_RootOrder: 88 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &714152977 GameObject: @@ -5313,7 +5396,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 72 + m_RootOrder: 70 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &717537039 GameObject: @@ -5354,7 +5437,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_WarningMessage: + m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 @@ -5368,8 +5451,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_RootBone: {fileID: 1518807717} m_BoneTransforms: - {fileID: 1518807717} @@ -5391,8 +5474,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!114 &717537043 MonoBehaviour: @@ -5404,8 +5487,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 0 @@ -5419,8 +5502,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: player: {fileID: 936765971} agroRange: 20 MoveSpeed: 5 @@ -10471,7 +10554,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 69 + m_RootOrder: 67 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &746902506 GameObject: @@ -10503,7 +10586,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1304108837} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10520,8 +10603,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 200465f962603d7488fd52abd3da2c88, type: 3} m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 0 @@ -10532,7 +10615,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 4acdced5932672c45ad19dbb82cf77f0, type: 3} - m_FontSize: 20 + m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -10543,7 +10626,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: + m_Text: --- !u!222 &746902509 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10659,7 +10742,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 51 + m_RootOrder: 50 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &791090329 GameObject: @@ -10798,90 +10881,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 102 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &795583261 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 795583265} - - component: {fileID: 795583264} - - component: {fileID: 795583263} - m_Layer: 0 - m_Name: cheese (11) - m_TagString: Cheese - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &795583263 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795583261} - 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: af57138088e06384f8509dd0f35ced49, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.86, y: 7.85} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &795583265 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795583261} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 203.3, y: 37.6, z: 0} - m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 49 + m_RootOrder: 100 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &799096931 GameObject: @@ -11072,7 +11072,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 60 + m_RootOrder: 58 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &834198266 GameObject: @@ -11229,8 +11229,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5964ae9a0d2d6c849bce0d023f7c45b8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: isGolden: 0 mouse: {fileID: 936765968} --- !u!1 &876283298 @@ -11401,12 +11401,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1107270362} + m_Father: {fileID: 471674078} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 190.76001, y: -56.724976} + m_AnchoredPosition: {x: 218.58, y: -56.725} m_SizeDelta: {x: 51.541992, y: 51.541992} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &896600233 @@ -11419,8 +11419,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -11554,7 +11554,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 82 + m_RootOrder: 80 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &936765968 GameObject: @@ -11859,8 +11859,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09ce03f84d2a0384eaeb226cb6fbdf5b, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: speed: 36 jumpForce: 54 jumptime: 0.4 @@ -11991,8 +11991,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d449e328434351d4d90e70cf9fb6df9f, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: countText: {fileID: 1283337208} cheesecount: 0 collected: 0 @@ -12006,8 +12006,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e8701f94365053a46bc5e370013d2409, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: mouseHealth: 5 numberOfHearts: 5 hearts: @@ -12028,8 +12028,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e51156189eaae2245924b136bb893dfb, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &936765978 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12040,8 +12040,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 71be00732d00ec748ac1dd603acbe7da, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: fallenDown: 0 --- !u!114 &936765979 MonoBehaviour: @@ -12053,8 +12053,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d51b0901a7480d44791bc856ca71009c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: cheeseCoinCollected: 0 cheeseCoin: {fileID: 169271316} cheeseCoinImage: {fileID: 1206416087} @@ -12072,8 +12072,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 86228eec2ce28124cae697faf008036d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: gardenCheese: {fileID: 405401497} mouseRenderer: {fileID: 936765970} mouseIsGardener: 0 @@ -12087,8 +12087,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8ac99ea6be6a20540aa6abf5606d2875, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &936765982 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12099,8 +12099,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5573110b00c79574da30b77e3fc52360, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: stampingSpeed: 100 --- !u!95 &936765983 Animator: @@ -12117,7 +12117,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_WarningMessage: + m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 @@ -12228,7 +12228,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 104 + m_RootOrder: 102 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &972365581 GameObject: @@ -12288,8 +12288,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7de0136e8f7b5d943beace14be2d4deb, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: mouse: {fileID: 936765968} knockBackValue: 30 --- !u!1 &973671302 @@ -12323,89 +12323,6 @@ Transform: m_Father: {fileID: 1423339821} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &974511289 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 974511293} - - component: {fileID: 974511292} - - component: {fileID: 974511291} - m_Layer: 0 - m_Name: cheese (14) - m_TagString: Cheese - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &974511291 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 974511289} - 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: af57138088e06384f8509dd0f35ced49, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.86, y: 7.85} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &974511293 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 974511289} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 206.4, y: 74.6, z: 0} - m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 52 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &985281166 GameObject: m_ObjectHideFlags: 0 @@ -12513,7 +12430,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 71 + m_RootOrder: 69 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &995274835 GameObject: @@ -12544,12 +12461,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1107270362} + m_Father: {fileID: 471674078} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 242.30005, y: -56.724976} + m_AnchoredPosition: {x: 270.12, y: -57.40004} m_SizeDelta: {x: 51.541992, y: 51.541992} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &995274837 @@ -12562,8 +12479,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -12619,8 +12536,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3} --- !u!61 &1002661581 BoxCollider2D: @@ -12752,7 +12669,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_WarningMessage: + m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 @@ -12766,8 +12683,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_RootBone: {fileID: 1452174929} m_BoneTransforms: - {fileID: 1452174929} @@ -12789,8 +12706,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!114 &1006420615 MonoBehaviour: @@ -12802,8 +12719,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 0 @@ -12817,8 +12734,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: player: {fileID: 936765971} agroRange: 20 MoveSpeed: 5 @@ -13136,7 +13053,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 83 + m_RootOrder: 81 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1052557857 GameObject: @@ -13245,7 +13162,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 81 + m_RootOrder: 79 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1057218423 GameObject: @@ -13354,7 +13271,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 67 + m_RootOrder: 65 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1081637519 GameObject: @@ -13385,8 +13302,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3} --- !u!61 &1081637521 BoxCollider2D: @@ -13617,7 +13534,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 59 + m_RootOrder: 57 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1103973579 GameObject: @@ -13646,11 +13563,11 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_ExcludedPropertiesInInspector: - m_Script - m_LockStageInInspector: + m_LockStageInInspector: m_StreamingVersion: 20170927 m_Priority: 10 m_StandbyUpdate: 2 @@ -13793,7 +13710,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 85 + m_RootOrder: 83 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1106877271 GameObject: @@ -13844,8 +13761,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 0 @@ -13859,8 +13776,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!212 &1106877275 SpriteRenderer: @@ -13925,7 +13842,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 127 + m_RootOrder: 125 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1106877277 Animator: @@ -13942,7 +13859,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_WarningMessage: + m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 @@ -13977,8 +13894,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: player: {fileID: 936765971} agroRange: 0 MoveSpeed: 0 @@ -14015,8 +13932,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: @@ -14032,8 +13949,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_UiScaleMode: 0 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 @@ -14078,11 +13995,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 471674078} - - {fileID: 1488509465} - - {fileID: 896600232} - - {fileID: 995274836} - - {fileID: 311476189} - - {fileID: 397286149} + - {fileID: 1206416086} - {fileID: 1304108837} - {fileID: 87876804} - {fileID: 1222121126} @@ -14112,8 +14025,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 819a2e792ae3efb44a738d759f050b68, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: pauseMenuUI: {fileID: 87876803} --- !u!1 &1112764634 GameObject: @@ -14170,8 +14083,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: bumperForce: 100 mouse: {fileID: 936765968} --- !u!212 &1112764637 @@ -14237,7 +14150,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 123 + m_RootOrder: 121 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1146337034 GameObject: @@ -22423,13 +22336,13 @@ Tilemap: - first: {x: 68, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 22 - m_TileSpriteIndex: 17 + m_TileIndex: 18 + m_TileSpriteIndex: 24 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 69, y: 2, z: 0} second: serializedVersion: 2 @@ -27018,7 +26931,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 571 m_Data: {fileID: 11400000, guid: 5d9981c3a7aa9ab458bd7f74335fb22f, type: 2} - - m_RefCount: 100 + - m_RefCount: 101 m_Data: {fileID: 11400000, guid: 98be08eb8396a1449918c456ac8885a2, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -27026,7 +26939,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 27 + - m_RefCount: 26 m_Data: {fileID: 11400000, guid: c26291a8c2f123a47a3ae3080e989a5b, type: 2} - m_RefCount: 16 m_Data: {fileID: 11400000, guid: 3ec95f4a24f59674c99c1afc6a38b27e, type: 2} @@ -27067,7 +26980,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 27 + - m_RefCount: 26 m_Data: {fileID: 21300000, guid: a7b9c407c421e2b4ea83338b34872b16, type: 3} - m_RefCount: 72 m_Data: {fileID: 21300000, guid: 1ae35ac76a816f04b94077ba6e24f643, type: 3} @@ -27081,7 +26994,7 @@ Tilemap: m_Data: {fileID: 21300000, guid: 7cb5fd0de9fa05e4198e38e5c37b4c28, type: 3} - m_RefCount: 571 m_Data: {fileID: 21300000, guid: 4fe3c54ee0ed656479fc9211d82c3d1b, type: 3} - - m_RefCount: 100 + - m_RefCount: 101 m_Data: {fileID: 21300000, guid: af326c0d8233f204f8d69acea50eca64, type: 3} - m_RefCount: 16 m_Data: {fileID: 21300000, guid: d7b29bc35d26f514bb0d2da96ae5641b, type: 3} @@ -27201,8 +27114,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: bc2cf8de166e6c04fba789ac331ec852, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: groundCheck: {fileID: 972365581} dustEffect: {fileID: 723835315} --- !u!1 &1152173203 @@ -27286,7 +27199,7 @@ Transform: m_LocalScale: {x: 4.1058, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 135 + m_RootOrder: 133 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1152173206 BoxCollider2D: @@ -27421,7 +27334,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 100 + m_RootOrder: 98 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1184577823 GameObject: @@ -27819,7 +27732,7 @@ Transform: m_LocalScale: {x: 1, y: -1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 129 + m_RootOrder: 127 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1206416085 GameObject: @@ -27850,12 +27763,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_Children: [] - m_Father: {fileID: 471674078} + m_Father: {fileID: 1107270362} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 436.85046, y: -56.724483} + m_AnchoredPosition: {x: 530, y: -86} m_SizeDelta: {x: 51.541992, y: 51.541992} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1206416087 @@ -27868,8 +27781,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -27984,7 +27897,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1107270362} - m_RootOrder: 8 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1222121127 MonoBehaviour: @@ -27996,8 +27909,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit @@ -28015,8 +27928,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 @@ -28127,7 +28040,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 80 + m_RootOrder: 78 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1230926686 GameObject: @@ -28158,8 +28071,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3} --- !u!61 &1230926688 BoxCollider2D: @@ -28280,8 +28193,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1ef543ae79779264dad553f77239ae34, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!212 &1236178934 SpriteRenderer: m_ObjectHideFlags: 0 @@ -28439,8 +28352,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -28454,8 +28367,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &1261625990 BoxCollider2D: @@ -28572,7 +28485,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 113 + m_RootOrder: 111 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1262360371 GameObject: @@ -28970,7 +28883,7 @@ Transform: m_LocalScale: {x: 1, y: 1.4, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 128 + m_RootOrder: 126 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1263841766 GameObject: @@ -29003,8 +28916,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -29018,8 +28931,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &1263841769 BoxCollider2D: @@ -29136,7 +29049,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 133 + m_RootOrder: 131 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1283337206 GameObject: @@ -29170,10 +29083,10 @@ RectTransform: m_Father: {fileID: 471674078} m_RootOrder: 0 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: 0.0049438477, y: -0.0049819946} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 56.724, y: -56.724} + m_SizeDelta: {x: 169.091, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1283337208 MonoBehaviour: @@ -29185,8 +29098,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 @@ -29208,7 +29121,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 1 + m_Text: --- !u!222 &1283337209 CanvasRenderer: m_ObjectHideFlags: 0 @@ -29277,9 +29190,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 445692661} + - {fileID: 1544514251} - {fileID: 746902507} m_Father: {fileID: 1107270362} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -29296,8 +29210,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -29371,8 +29285,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -29430,8 +29344,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -29445,8 +29359,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &1340959646 BoxCollider2D: @@ -29563,7 +29477,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 108 + m_RootOrder: 106 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1343376132 GameObject: @@ -29648,7 +29562,7 @@ Transform: m_Children: - {fileID: 1423490228} m_Father: {fileID: 0} - m_RootOrder: 131 + m_RootOrder: 129 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1343376135 BoxCollider2D: @@ -29686,8 +29600,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 04fb4457cc4eca346ae4b0599f20569e, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: DialogueManager: {fileID: 2036393123} --- !u!1 &1356534580 GameObject: @@ -29796,7 +29710,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 70 + m_RootOrder: 68 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1359769958 GameObject: @@ -29962,7 +29876,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 66 + m_RootOrder: 64 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1365159613 GameObject: @@ -30071,7 +29985,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 94 + m_RootOrder: 92 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1375631335 GameObject: @@ -30211,7 +30125,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 103 + m_RootOrder: 101 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1421652117 GameObject: @@ -30363,8 +30277,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 735e97089dfbe134483f6327a5a31fc9, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: lastCheckpointPos: {x: 0, y: 0, z: 0} firstCheckpoint: {fileID: 936765971} mouse: {fileID: 1649732366} @@ -30409,7 +30323,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_WarningMessage: + m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 @@ -30423,8 +30337,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_RootBone: {fileID: 1889886567} m_BoneTransforms: - {fileID: 1889886567} @@ -30446,8 +30360,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!114 &1423339816 MonoBehaviour: @@ -30459,8 +30373,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 0 @@ -30474,8 +30388,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: player: {fileID: 936765971} agroRange: 20 MoveSpeed: 5 @@ -30753,7 +30667,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 105 + m_RootOrder: 103 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1460989978 GameObject: @@ -30814,12 +30728,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1107270362} + m_Father: {fileID: 471674078} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 139.21997, y: -56.724976} + m_AnchoredPosition: {x: 167.04, y: -56.724} m_SizeDelta: {x: 51.541992, y: 51.541992} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1488509466 @@ -30832,8 +30746,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -30891,8 +30805,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -30906,8 +30820,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &1510844751 BoxCollider2D: @@ -31024,7 +30938,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 107 + m_RootOrder: 105 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1518807716 GameObject: @@ -31114,6 +31028,108 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1544514250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1544514251} + - component: {fileID: 1544514254} + - component: {fileID: 1544514252} + m_Layer: 5 + m_Name: skipButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1544514251 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544514250} + 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: + - {fileID: 152328529} + m_Father: {fileID: 1304108837} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -157, y: -174.9} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1544514252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544514250} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2036393124} + m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp + m_MethodName: Skip + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!222 &1544514254 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1544514250} + m_CullTransparentMesh: 1 --- !u!1 &1554536745 GameObject: m_ObjectHideFlags: 0 @@ -31153,7 +31169,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_WarningMessage: + m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 @@ -31167,8 +31183,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_RootBone: {fileID: 1375631336} m_BoneTransforms: - {fileID: 1375631336} @@ -31190,8 +31206,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!114 &1554536749 MonoBehaviour: @@ -31203,8 +31219,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 0 @@ -31218,8 +31234,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 323ad84dcc1a6e74fbdb2341e42e09c7, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: player: {fileID: 936765971} agroRange: 20 MoveSpeed: 5 @@ -31359,8 +31375,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a1366c1812a392446877373e9e4583b1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: speed: 14 rightTurningPoint: {fileID: 19821604} leftTurningPoint: {fileID: 680485543} @@ -31453,7 +31469,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 115 + m_RootOrder: 113 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1560879860 MonoBehaviour: @@ -31465,8 +31481,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4a0dc3a9183ba740a3206b453791f11, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1 &1575923596 GameObject: m_ObjectHideFlags: 0 @@ -31574,7 +31590,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 96 + m_RootOrder: 94 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1576216812 GameObject: @@ -31683,7 +31699,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 62 + m_RootOrder: 60 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1581008558 GameObject: @@ -31792,7 +31808,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 65 + m_RootOrder: 63 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1612255660 GameObject: @@ -31874,7 +31890,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 125 + m_RootOrder: 123 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1620211024 GameObject: @@ -31956,7 +31972,7 @@ Transform: m_LocalScale: {x: -0.75, y: 0.75, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 130 + m_RootOrder: 128 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1620409434 GameObject: @@ -32065,7 +32081,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 88 + m_RootOrder: 86 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1633153118 GameObject: @@ -32095,7 +32111,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 120 + m_RootOrder: 118 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1648284916 GameObject: @@ -32204,7 +32220,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 99 + m_RootOrder: 97 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1649732364 GameObject: @@ -32326,8 +32342,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f037a06d9083052489faa3a9c37bb063, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3} --- !u!1 &1723894137 GameObject: @@ -32360,8 +32376,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -32375,8 +32391,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &1723894140 BoxCollider2D: @@ -32493,7 +32509,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 109 + m_RootOrder: 107 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1728737725 GameObject: @@ -32632,7 +32648,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 55 + m_RootOrder: 53 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1749582164 GameObject: @@ -32850,7 +32866,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 98 + m_RootOrder: 96 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1790915303 GameObject: @@ -32989,7 +33005,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 101 + m_RootOrder: 99 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1803555590 GameObject: @@ -33207,7 +33223,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 79 + m_RootOrder: 77 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1818015058 GameObject: @@ -33316,7 +33332,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 84 + m_RootOrder: 82 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1820232473 GameObject: @@ -33349,8 +33365,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -33364,8 +33380,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &1820232476 BoxCollider2D: @@ -33482,7 +33498,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 110 + m_RootOrder: 108 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1826873324 GameObject: @@ -33733,8 +33749,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -33748,8 +33764,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &1864677726 BoxCollider2D: @@ -33866,7 +33882,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 106 + m_RootOrder: 104 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1865508559 GameObject: @@ -33975,7 +33991,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 61 + m_RootOrder: 59 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1887736390 GameObject: @@ -34026,8 +34042,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_WrapAround: 0 @@ -34069,7 +34085,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 0 m_CallState: 1 --- !u!114 &1887736393 @@ -34082,8 +34098,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -34221,7 +34237,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 114 + m_RootOrder: 112 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1901651470 GameObject: @@ -34254,8 +34270,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7cf7d6f1f321d7049a0dd3df40cb6d60, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: enemyHealth: 1 enemyDamage: 1 spiky: 1 @@ -34269,8 +34285,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1922e4053ff0276488130e6d18937957, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: flashingTime: 0.3 --- !u!61 &1901651473 BoxCollider2D: @@ -34387,7 +34403,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 111 + m_RootOrder: 109 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1909309303 GameObject: @@ -34419,8 +34435,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4a0dc3a9183ba740a3206b453791f11, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!114 &1909309305 MonoBehaviour: m_ObjectHideFlags: 0 @@ -34431,8 +34447,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a1366c1812a392446877373e9e4583b1, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: speed: 14 rightTurningPoint: {fileID: 2030985964} leftTurningPoint: {fileID: 1633153119} @@ -34525,7 +34541,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 118 + m_RootOrder: 116 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1925059289 GameObject: @@ -34634,7 +34650,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 54 + m_RootOrder: 52 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1933878927 GameObject: @@ -34743,7 +34759,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 92 + m_RootOrder: 90 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1954471026 GameObject: @@ -34822,8 +34838,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -34961,7 +34977,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 87 + m_RootOrder: 85 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1988317187 GameObject: @@ -35070,7 +35086,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 91 + m_RootOrder: 89 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1991681834 GameObject: @@ -35236,7 +35252,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 77 + m_RootOrder: 75 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2023385359 GameObject: @@ -35341,11 +35357,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023385359} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 203.3, y: 49.9, z: 0} + m_LocalPosition: {x: 203.38, y: 43.69, z: 0} m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 50 + m_RootOrder: 49 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2023394537 GameObject: @@ -35541,7 +35557,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 126 + m_RootOrder: 124 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2030985963 GameObject: @@ -35571,7 +35587,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 119 + m_RootOrder: 117 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2033687554 GameObject: @@ -35680,7 +35696,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 53 + m_RootOrder: 51 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2036393123 GameObject: @@ -35709,9 +35725,10 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 84f62f9206a55914bb1e69401b9a1b82, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: continueButton: {fileID: 445692660} + skipButton: {fileID: 1544514250} dialogueBox: {fileID: 1304108836} SpeechBubble: {fileID: 631343912} mouse: {fileID: 936765968} @@ -35723,7 +35740,7 @@ MonoBehaviour: - "Dr\xFCcke die Leertaste zum Springen." - "Wenn man links klickt oder Strg dr\xFCckt soll angeblich auch etwas passieren." index: 0 - typingSpeed: 0.04 + typingSpeed: 0.03 --- !u!4 &2036393125 Transform: m_ObjectHideFlags: 0 @@ -35845,7 +35862,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 76 + m_RootOrder: 74 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2105819224 GameObject: @@ -35951,8 +35968,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -36090,7 +36107,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 57 + m_RootOrder: 55 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2142996814 GameObject: @@ -36147,8 +36164,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9f9f24ed35530f341bcc1f0f30535544, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: bumperForce: 100 mouse: {fileID: 936765968} --- !u!212 &2142996817 @@ -36214,5 +36231,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 124 + m_RootOrder: 122 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity index 32dc616..ee269b4 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity @@ -27469,7 +27469,7 @@ MonoBehaviour: m_EditorClassIdentifier: lastCheckpointPos: {x: 0, y: 0, z: 0} firstCheckpoint: {fileID: 936765971} - mouse: {fileID: 214740917} + mouse: {fileID: 1649732366} lastCheeseCount: 0 isCheeseCoinCollected: 0 --- !u!1 &1423339812 diff --git a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs index f398658..3ec6dff 100644 --- a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs +++ b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs @@ -7,6 +7,7 @@ using UnityEngine.UI; public class Dialogue : MonoBehaviour { public GameObject continueButton; + public GameObject skipButton; public GameObject dialogueBox; public GameObject SpeechBubble; public GameObject mouse; @@ -22,12 +23,11 @@ public class Dialogue : MonoBehaviour public float typingSpeed; - public bool skip; - void Start() { dialogueBox.SetActive(false); continueButton.SetActive(false); + skipButton.SetActive(false); SpeechBubble.SetActive(false); speechBubble = SpeechBubble.GetComponent(); } @@ -37,23 +37,14 @@ public class Dialogue : MonoBehaviour if (dialogueText.text == sentences[index]) { continueButton.SetActive(true); - } - - if (dialogueText.text != sentences[index]) - { - if (Input.GetKeyDown(KeyCode.Return) || Input.GetMouseButtonDown(0)) - { - skip = true; - } - } else - { - skip = false; + skipButton.SetActive(true); } } public IEnumerator Type() { dialogueBox.SetActive(true); + skipButton.SetActive(true); speechBubble.NextSpeaker(); SpeechBubble.SetActive(true); foreach (char letter in sentences[index].ToCharArray()) @@ -63,16 +54,10 @@ public class Dialogue : MonoBehaviour } } - public void Skip() - { - dialogueText.text = sentences[index]; - } - public void NextSentence() { FindObjectOfType().Play("click"); continueButton.SetActive(false); - skip= false; if (index < sentences.Length - 1) { @@ -90,4 +75,13 @@ public class Dialogue : MonoBehaviour mouse.GetComponent().enabled = true; } } + + public void Skip() + { + dialogueText.text = ""; + dialogueBox.SetActive(false); + SpeechBubble.SetActive(false); + mouse.GetComponent().constraints = RigidbodyConstraints2D.FreezeRotation; + mouse.GetComponent().enabled = true; + } } diff --git a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs index 78b12cc..f86a55f 100644 --- a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs +++ b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs @@ -24,14 +24,4 @@ public class DialogueTrigger : MonoBehaviour GetComponent().enabled = false; } } - - void Update() - { - if (dialogue.skip) - { - StopCoroutine(dialogue.Type()); - dialogue.Skip(); - dialogue.skip = false; - } - } } \ No newline at end of file diff --git a/2DGame/Assets/Scripts/Mouse/CheckpointManager.cs b/2DGame/Assets/Scripts/Mouse/CheckpointManager.cs index b705df9..ba44f7b 100644 --- a/2DGame/Assets/Scripts/Mouse/CheckpointManager.cs +++ b/2DGame/Assets/Scripts/Mouse/CheckpointManager.cs @@ -50,7 +50,6 @@ public class CheckpointManager : MonoBehaviour { PlayerData data = SaveSystem.LoadPlayer(); - cheese.SetCheeseCount(data.collectedCheese); cheeseCoin.cheeseCoinCollected = data.isCheeseCoinCollected; Vector3 position; diff --git a/2DGame/Assets/Scripts/Mouse/Cheese.cs b/2DGame/Assets/Scripts/Mouse/Cheese.cs index 6cf4723..3fe106f 100644 --- a/2DGame/Assets/Scripts/Mouse/Cheese.cs +++ b/2DGame/Assets/Scripts/Mouse/Cheese.cs @@ -12,26 +12,17 @@ public class Cheese : MonoBehaviour public bool collected; - void Start() - { - SetCheeseCount(0); - } - private void OnTriggerEnter2D(Collider2D collision) { if (collision.gameObject.CompareTag("Cheese")) { - SetCheeseCount(cheesecount + 1); + cheesecount++; + + countText.text = cheesecount.ToString(); FindObjectOfType().Play("cheese_plop"); collision.gameObject.SetActive(false); } } - - public void SetCheeseCount(int count) - { - cheesecount = count; - countText.text = cheesecount.ToString(); - } } diff --git a/2DGame/Assets/Scripts/Mouse/MousePos.cs b/2DGame/Assets/Scripts/Mouse/MousePos.cs index 379c2ce..756b04e 100644 --- a/2DGame/Assets/Scripts/Mouse/MousePos.cs +++ b/2DGame/Assets/Scripts/Mouse/MousePos.cs @@ -21,7 +21,7 @@ public class MousePos : MonoBehaviour health = GetComponent(); cheese = GetComponent(); transform.position = checkpointManager.lastCheckpointPos; - cheese.SetCheeseCount(checkpointManager.lastCheeseCount); + cheese.cheesecount = checkpointManager.lastCheeseCount; } void Update() -- 2.44.0