From: KG0104 <76601263+KG0104@users.noreply.github.com> Date: Sat, 28 Aug 2021 14:23:25 +0000 (+0200) Subject: Dialog-System v0.2 X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=df31aed2fb500d456c392f69916a5b40906a322e;p=SuperMouseAdventure.git Dialog-System v0.2 --- 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 0398c6e..28132a2 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: 115 + m_RootOrder: 116 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &26713742 GameObject: @@ -239,7 +239,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &43277336 GameObject: @@ -364,7 +364,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 43 + m_RootOrder: 44 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &49731307 GameObject: @@ -489,7 +489,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 57 + m_RootOrder: 58 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &54829512 GameObject: @@ -614,7 +614,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 55 + m_RootOrder: 56 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &56472776 GameObject: @@ -739,7 +739,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 88 + m_RootOrder: 89 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &61187373 GameObject: @@ -796,7 +796,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &64427148 GameObject: @@ -921,7 +921,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 72 + m_RootOrder: 73 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &66658440 GameObject: @@ -1051,7 +1051,7 @@ RectTransform: - {fileID: 1887736391} - {fileID: 1307921123} m_Father: {fileID: 1107270362} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1204,7 +1204,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 37 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &115516884 MonoBehaviour: @@ -1344,7 +1344,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 85 + m_RootOrder: 86 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &141614171 GameObject: @@ -1469,7 +1469,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 46 + m_RootOrder: 47 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &152546817 GameObject: @@ -1594,7 +1594,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 92 + m_RootOrder: 93 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &169271316 GameObject: @@ -1694,7 +1694,7 @@ Transform: m_LocalScale: {x: 0.3, y: 0.3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &171693840 GameObject: @@ -1819,7 +1819,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 73 + m_RootOrder: 74 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &180334512 GameObject: @@ -1943,7 +1943,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 120 + m_RootOrder: 121 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &186249469 GameObject: @@ -2068,7 +2068,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 77 + m_RootOrder: 78 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &191038584 GameObject: @@ -2192,7 +2192,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 121 + m_RootOrder: 122 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &214740913 GameObject: @@ -2315,7 +2315,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 36 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &239287570 GameObject: @@ -2713,7 +2713,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 63 + m_RootOrder: 64 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &311476188 GameObject: @@ -3087,7 +3087,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 111 + m_RootOrder: 112 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &363924767 GameObject: @@ -3242,7 +3242,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 44 + m_RootOrder: 45 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &384204924 GameObject: @@ -3367,7 +3367,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 67 + m_RootOrder: 68 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &397286148 GameObject: @@ -3527,7 +3527,7 @@ Transform: m_Children: - {fileID: 1236178935} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &405401500 BoxCollider2D: @@ -3677,7 +3677,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 31 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &435101779 GameObject: @@ -3786,7 +3786,7 @@ Transform: m_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &444156460 GameObject: @@ -3911,7 +3911,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 74 + m_RootOrder: 75 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &445692660 GameObject: @@ -3939,16 +3939,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 445692660} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 7 + 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: 218, y: -204} + m_AnchoredPosition: {x: 218, y: -173.05} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &445692663 @@ -3972,7 +3972,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_NormalColor: {r: 1, g: 1, b: 1, a: 0.45490196} 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} @@ -3995,9 +3995,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: DialogueTrigger, Assembly-CSharp - m_MethodName: + - m_Target: {fileID: 2036393124} + m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp + m_MethodName: NextSentence m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -4006,7 +4006,7 @@ MonoBehaviour: m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 - m_CallState: 0 + m_CallState: 1 --- !u!114 &445692664 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4100,7 +4100,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &471674077 GameObject: @@ -4302,7 +4302,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 47 + m_RootOrder: 48 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &515202606 GameObject: @@ -4359,7 +4359,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: @@ -4639,7 +4639,7 @@ Transform: m_Children: - {fileID: 66658441} m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &529772005 GameObject: @@ -4764,7 +4764,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 62 + m_RootOrder: 63 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &581721062 GameObject: @@ -4889,7 +4889,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 96 + m_RootOrder: 97 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &583615246 GameObject: @@ -5044,7 +5044,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 94 + m_RootOrder: 95 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &668399697 GameObject: @@ -5105,7 +5105,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 116 + m_RootOrder: 117 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &694882655 GameObject: @@ -5230,7 +5230,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 89 + m_RootOrder: 90 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &714152977 GameObject: @@ -5355,7 +5355,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 71 + m_RootOrder: 72 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &717537039 GameObject: @@ -5570,7 +5570,7 @@ Transform: - {fileID: 1518807717} - {fileID: 668399698} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &722593447 GameObject: @@ -10404,7 +10404,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &727105740 GameObject: @@ -10529,7 +10529,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 68 + m_RootOrder: 69 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &746902506 GameObject: @@ -10557,15 +10557,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 746902506} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -3473.993} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1304108837} - m_RootOrder: 0 + 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} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -0.000091552734} m_SizeDelta: {x: 298.3, y: 154.14} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &746902508 @@ -10590,7 +10590,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 4acdced5932672c45ad19dbb82cf77f0, type: 3} - m_FontSize: 30 + m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -10601,7 +10601,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Hallo Lol + m_Text: --- !u!222 &746902509 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10733,7 +10733,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 50 + m_RootOrder: 51 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &794806973 GameObject: @@ -10858,7 +10858,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 101 + m_RootOrder: 102 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &795583261 GameObject: @@ -10983,7 +10983,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 48 + m_RootOrder: 49 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &799096931 GameObject: @@ -11190,7 +11190,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 59 + m_RootOrder: 60 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &834198266 GameObject: @@ -11274,7 +11274,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &834198269 PolygonCollider2D: @@ -11351,81 +11351,6 @@ MonoBehaviour: m_EditorClassIdentifier: isGolden: 0 mouse: {fileID: 936765968} ---- !u!1 &837061332 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 837061333} - - component: {fileID: 837061335} - - component: {fileID: 837061334} - m_Layer: 0 - m_Name: dialogueButtonImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &837061333 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837061332} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -3542.8853} - m_LocalScale: {x: 0.078125, y: 0.078125, z: 0.078125} - m_Children: [] - m_Father: {fileID: 1304108837} - 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} - m_AnchoredPosition: {x: 158.29582, y: -12.439194} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &837061334 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837061332} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 312a231f3a9ed6543a591eadeee82ef6, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &837061335 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 837061332} - m_CullTransparentMesh: 1 --- !u!1 &876283298 GameObject: m_ObjectHideFlags: 0 @@ -11579,7 +11504,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 38 + m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &896600231 GameObject: @@ -11779,7 +11704,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 81 + m_RootOrder: 82 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &936765968 GameObject: @@ -12453,7 +12378,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 103 + m_RootOrder: 104 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &972365581 GameObject: @@ -12671,7 +12596,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 51 + m_RootOrder: 52 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &985281166 GameObject: @@ -12796,7 +12721,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 70 + m_RootOrder: 71 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &995274835 GameObject: @@ -12994,7 +12919,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 35 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1006420611 GameObject: @@ -13209,7 +13134,7 @@ Transform: - {fileID: 1452174929} - {fileID: 1237924240} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1016078926 GameObject: @@ -13266,7 +13191,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1019550504 GameObject: @@ -13310,7 +13235,7 @@ Transform: m_Children: - {fileID: 1146337035} m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1026120322 GameObject: @@ -13435,7 +13360,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 82 + m_RootOrder: 83 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1052557857 GameObject: @@ -13560,7 +13485,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 80 + m_RootOrder: 81 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1057218423 GameObject: @@ -13685,7 +13610,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 66 + m_RootOrder: 67 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1081637519 GameObject: @@ -13808,7 +13733,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1083000045 GameObject: @@ -13964,7 +13889,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 58 + m_RootOrder: 59 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1103973579 GameObject: @@ -14156,7 +14081,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 84 + m_RootOrder: 85 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1106877271 GameObject: @@ -14288,7 +14213,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 126 + m_RootOrder: 127 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1106877277 Animator: @@ -14447,7 +14372,6 @@ RectTransform: - {fileID: 311476189} - {fileID: 397286149} - {fileID: 1304108837} - - {fileID: 445692661} - {fileID: 87876804} - {fileID: 1222121126} m_Father: {fileID: 0} @@ -14601,7 +14525,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 122 + m_RootOrder: 123 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1146337034 GameObject: @@ -26272,7 +26196,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 99 + m_RootOrder: 100 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1184577823 GameObject: @@ -26670,7 +26594,7 @@ Transform: m_LocalScale: {x: 1, y: -1.3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 128 + m_RootOrder: 129 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1206416085 GameObject: @@ -26803,7 +26727,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1222121125 GameObject: @@ -26835,7 +26759,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1107270362} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1222121127 MonoBehaviour: @@ -26994,7 +26918,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 79 + m_RootOrder: 80 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1230926686 GameObject: @@ -27117,7 +27041,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1236178932 GameObject: @@ -27439,7 +27363,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 112 + m_RootOrder: 113 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1262360371 GameObject: @@ -27837,7 +27761,7 @@ Transform: m_LocalScale: {x: 1, y: 1.4, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 127 + m_RootOrder: 128 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1283337206 GameObject: @@ -27946,7 +27870,7 @@ Transform: m_LocalScale: {x: 0.2, y: 0.2, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1304108836 GameObject: @@ -27977,9 +27901,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 746902507} - {fileID: 1691028830} - - {fileID: 837061333} + - {fileID: 445692661} + - {fileID: 746902507} m_Father: {fileID: 1107270362} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -28060,7 +27984,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 124.99994, y: -125.00015} + m_AnchoredPosition: {x: 124.99994, y: -125.00012} m_SizeDelta: {x: 250, y: 250} m_Pivot: {x: 0.5, y: 0.49999946} --- !u!114 &1307921124 @@ -28265,8 +28189,117 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 107 + m_RootOrder: 108 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1343376132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1343376134} + - component: {fileID: 1343376133} + - component: {fileID: 1343376135} + m_Layer: 0 + m_Name: prof_tutori + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1343376133 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343376132} + 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: b5b23020dccb47444945e86c108a6c9e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.94, y: 11.23} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1343376134 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343376132} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.25, y: 3.65, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 131 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1343376135 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343376132} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 6.745814, y: 19.829052} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 8.39, y: 7.43} + newSize: {x: 7.94, y: 11.23} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 4.6612864, y: 47.08811} + m_EdgeRadius: 0 --- !u!1 &1356534580 GameObject: m_ObjectHideFlags: 0 @@ -28390,7 +28423,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 69 + m_RootOrder: 70 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1359769958 GameObject: @@ -28447,7 +28480,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1364830490 GameObject: @@ -28572,7 +28605,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 65 + m_RootOrder: 66 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1365159613 GameObject: @@ -28697,7 +28730,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 93 + m_RootOrder: 94 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1375631335 GameObject: @@ -28853,7 +28886,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 102 + m_RootOrder: 103 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1421652117 GameObject: @@ -28978,7 +29011,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 41 + m_RootOrder: 42 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1422846021 GameObject: @@ -29241,7 +29274,7 @@ Transform: - {fileID: 1889886567} - {fileID: 973671303} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1452174928 GameObject: @@ -29397,7 +29430,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 104 + m_RootOrder: 105 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1460989978 GameObject: @@ -29668,7 +29701,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 106 + m_RootOrder: 107 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1518807716 GameObject: @@ -29756,7 +29789,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1554536745 GameObject: @@ -29971,7 +30004,7 @@ Transform: - {fileID: 1375631336} - {fileID: 1083000046} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1560879855 GameObject: @@ -30097,7 +30130,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 114 + m_RootOrder: 115 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1560879860 MonoBehaviour: @@ -30234,7 +30267,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 95 + m_RootOrder: 96 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1576216812 GameObject: @@ -30359,7 +30392,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 61 + m_RootOrder: 62 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1581008558 GameObject: @@ -30484,7 +30517,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 64 + m_RootOrder: 65 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1612255660 GameObject: @@ -30566,7 +30599,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 124 + m_RootOrder: 125 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1620211024 GameObject: @@ -30648,7 +30681,7 @@ Transform: m_LocalScale: {x: -0.75, y: 0.75, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 129 + m_RootOrder: 130 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1620409434 GameObject: @@ -30773,7 +30806,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 87 + m_RootOrder: 88 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1633153118 GameObject: @@ -30803,7 +30836,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 119 + m_RootOrder: 120 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1648284916 GameObject: @@ -30928,7 +30961,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 98 + m_RootOrder: 99 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1649732364 GameObject: @@ -31012,7 +31045,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1649732367 BoxCollider2D: @@ -31079,16 +31112,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1691028829} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -3473.993} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1304108837} - m_RootOrder: 1 + 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: 47.41597, y: -43.651947} - m_SizeDelta: {x: 60.072998, y: 59.83} + m_AnchoredPosition: {x: 44.300003, y: -41.3} + m_SizeDelta: {x: 68.766, y: 68.489} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1691028831 MonoBehaviour: @@ -31292,7 +31325,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 108 + m_RootOrder: 109 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1728737725 GameObject: @@ -31447,7 +31480,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 54 + m_RootOrder: 55 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1749582164 GameObject: @@ -31572,7 +31605,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 42 + m_RootOrder: 43 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1782500346 GameObject: @@ -31697,7 +31730,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 97 + m_RootOrder: 98 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1790915303 GameObject: @@ -31852,7 +31885,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 100 + m_RootOrder: 101 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1803555590 GameObject: @@ -31977,7 +32010,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 39 + m_RootOrder: 40 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1808579562 GameObject: @@ -32102,7 +32135,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 78 + m_RootOrder: 79 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1818015058 GameObject: @@ -32227,7 +32260,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 83 + m_RootOrder: 84 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1820232473 GameObject: @@ -32393,7 +32426,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 109 + m_RootOrder: 110 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1826873324 GameObject: @@ -32518,7 +32551,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 40 + m_RootOrder: 41 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1833155923 GameObject: @@ -32643,7 +32676,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 45 + m_RootOrder: 46 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1864677723 GameObject: @@ -32809,7 +32842,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 105 + m_RootOrder: 106 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1865508559 GameObject: @@ -32934,7 +32967,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 60 + m_RootOrder: 61 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1887736390 GameObject: @@ -33180,7 +33213,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 113 + m_RootOrder: 114 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1901651470 GameObject: @@ -33346,7 +33379,7 @@ Transform: m_LocalScale: {x: 3, y: 3, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 110 + m_RootOrder: 111 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1909309303 GameObject: @@ -33484,7 +33517,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 117 + m_RootOrder: 118 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1925059289 GameObject: @@ -33609,7 +33642,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 53 + m_RootOrder: 54 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1933878927 GameObject: @@ -33734,7 +33767,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 91 + m_RootOrder: 92 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1954471026 GameObject: @@ -33889,7 +33922,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 86 + m_RootOrder: 87 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1988317187 GameObject: @@ -34014,7 +34047,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 90 + m_RootOrder: 91 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1991681834 GameObject: @@ -34071,7 +34104,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2014517202 GameObject: @@ -34196,7 +34229,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 76 + m_RootOrder: 77 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2023385359 GameObject: @@ -34321,7 +34354,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 49 + m_RootOrder: 50 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2023394537 GameObject: @@ -34378,7 +34411,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2028387665 GameObject: @@ -34435,7 +34468,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2029381605 GameObject: @@ -34517,7 +34550,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 125 + m_RootOrder: 126 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2030985963 GameObject: @@ -34547,7 +34580,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 118 + m_RootOrder: 119 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2033687554 GameObject: @@ -34672,7 +34705,59 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 52 + m_RootOrder: 53 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2036393123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2036393125} + - component: {fileID: 2036393124} + m_Layer: 0 + m_Name: DialogueManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2036393124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2036393123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84f62f9206a55914bb1e69401b9a1b82, type: 3} + m_Name: + m_EditorClassIdentifier: + continueButton: {fileID: 445692660} + dialogueBox: {fileID: 1304108836} + dialogueText: {fileID: 746902508} + sentences: + - Hallo, ich bin Professor Tutori + - Was geht ab? + - "Ich werde dir alles erkl\xE4ren" + - In Ordnung? + typingSpeed: 0.04 +--- !u!4 &2036393125 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2036393123} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -28.611708, y: 5.9977274, z: 506.0536} + 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 &2066945850 GameObject: @@ -34797,7 +34882,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 75 + m_RootOrder: 76 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2105819224 GameObject: @@ -34854,7 +34939,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2110469192 GameObject: @@ -35058,7 +35143,7 @@ Transform: m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 56 + m_RootOrder: 57 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2142996814 GameObject: @@ -35182,5 +35267,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 123 + m_RootOrder: 124 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/2DGame/Assets/Scripts/Dialogue.meta b/2DGame/Assets/Scripts/Dialogue.meta new file mode 100644 index 0000000..bc547a7 --- /dev/null +++ b/2DGame/Assets/Scripts/Dialogue.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f6cdfb975139b945a5ff1d77cf22e04 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs new file mode 100644 index 0000000..fd6cde1 --- /dev/null +++ b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs @@ -0,0 +1,53 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Dialogue : MonoBehaviour +{ + public GameObject continueButton; + public GameObject dialogueBox; + public Text dialogueText; + public string[] sentences; + private int index; + public float typingSpeed; + + void Start() + { + StartCoroutine(Type()); + } + + void Update() + { + if (dialogueText.text == sentences[index]) + { + continueButton.SetActive(true); + } + } + + IEnumerator Type() + { + foreach (char letter in sentences[index].ToCharArray()) + { + dialogueText.text += letter; + yield return new WaitForSeconds(typingSpeed); + } + } + + public void NextSentence() + { + continueButton.SetActive(false); + + if (index < sentences.Length - 1) + { + index++; + dialogueText.text = ""; + StartCoroutine(Type()); + } + else + { + dialogueText.text = ""; + dialogueBox.SetActive(false); + } + } +} diff --git a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs.meta b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs.meta new file mode 100644 index 0000000..1a75468 --- /dev/null +++ b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 84f62f9206a55914bb1e69401b9a1b82 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Sprites/pauseMenu.png b/2DGame/Assets/Sprites/pauseMenu.png deleted file mode 100644 index c13c343..0000000 Binary files a/2DGame/Assets/Sprites/pauseMenu.png and /dev/null differ diff --git a/2DGame/Assets/Sprites/pauseMenu.png.meta b/2DGame/Assets/Sprites/pauseMenu.png.meta deleted file mode 100644 index 462b1e2..0000000 --- a/2DGame/Assets/Sprites/pauseMenu.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 9317a2097a4730648b6ea144f0ac869e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Sprites/prof_tutori.png b/2DGame/Assets/Sprites/prof_tutori.png new file mode 100644 index 0000000..d50e8ea Binary files /dev/null and b/2DGame/Assets/Sprites/prof_tutori.png differ diff --git a/2DGame/Assets/Sprites/prof_tutori.png.meta b/2DGame/Assets/Sprites/prof_tutori.png.meta new file mode 100644 index 0000000..13485ea --- /dev/null +++ b/2DGame/Assets/Sprites/prof_tutori.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: b5b23020dccb47444945e86c108a6c9e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: