From e6fa264973dc785899cf11fb9168f916ba99cda3 Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Tue, 17 Jan 2023 09:01:53 +0100 Subject: [PATCH 1/8] update --- Assets/Scripts/uj.cs | 18 ++++++++++++++ Assets/Scripts/uj.cs.meta | 11 +++++++++ UserSettings/Layouts/default-2021.dwlt | 34 +++++++++++++------------- 3 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 Assets/Scripts/uj.cs create mode 100644 Assets/Scripts/uj.cs.meta diff --git a/Assets/Scripts/uj.cs b/Assets/Scripts/uj.cs new file mode 100644 index 0000000..f9baa07 --- /dev/null +++ b/Assets/Scripts/uj.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class uj : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/uj.cs.meta b/Assets/Scripts/uj.cs.meta new file mode 100644 index 0000000..5c740b6 --- /dev/null +++ b/Assets/Scripts/uj.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eaba8d7c523212e4a8a40fcef8e9eb9e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 30e5513..b8fbc05 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 958 + controlID: 98 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 959 + controlID: 99 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 960 + controlID: 100 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -206,7 +206,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -217,12 +217,12 @@ MonoBehaviour: height: 385 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -402,7 +402,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: aeddffff2adeffffd0e1fffff2e1ffff8cf3ffff08f4ffffaaf7ffffc8f7ffff1efbffff + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -446,10 +446,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 + x: 218 y: 73 - width: 1040 - height: 553 + width: 739 + height: 364 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -840,9 +840,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 76770000 - m_LastClickedID: 30582 - m_ExpandedIDs: 000000005c77000000ca9a3bffffff7f + m_SelectedIDs: 6e770000 + m_LastClickedID: 30574 + m_ExpandedIDs: 000000005677000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -870,7 +870,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005c77000000ca9a3bffffff7f + m_ExpandedIDs: 0000000056770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -897,7 +897,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300000000000034ecffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -922,7 +922,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 86.498474} + m_ScrollPosition: {x: 0, y: 69.5} m_GridSize: 71 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 164 From 38dc6fa9eebd02d623bd114f566619250a925941 Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Fri, 20 Jan 2023 11:46:45 +0100 Subject: [PATCH 2/8] valami --- Assets/Scripts/Ugynok.cs | 39 --------- .../Layouts/CurrentMaximizeLayout.dwlt | 28 +++--- UserSettings/Layouts/default-2021.dwlt | 86 +++++++++---------- 3 files changed, 57 insertions(+), 96 deletions(-) diff --git a/Assets/Scripts/Ugynok.cs b/Assets/Scripts/Ugynok.cs index c5958d7..4ec4f58 100644 --- a/Assets/Scripts/Ugynok.cs +++ b/Assets/Scripts/Ugynok.cs @@ -18,45 +18,6 @@ public class Ugynok : MonoBehaviour public TMP_Text[] twofour; public TMP_Text[] threefour; - private void Start() { - foreach(var item in oneone) { - item.text = ""; - } - foreach (var item in twoone) { - item.text = ""; - } - foreach (var item in threeone) { - item.text = ""; - } - foreach (var item in onetwo) { - item.text = ""; - } - foreach (var item in twotwo) { - item.text = ""; - } - foreach (var item in threetwo) { - item.text = ""; - } - foreach (var item in onethree) { - item.text = ""; - } - foreach (var item in twothree) { - item.text = ""; - } - foreach (var item in threethree) { - item.text = ""; - } - foreach (var item in onefour) { - item.text = ""; - } - foreach (var item in twofour) { - item.text = ""; - } - foreach (var item in threefour) { - item.text = ""; - } - } - public void UgynokSorsolas(int x, int y) { if (x == 1 && y == 1) { if (oneone[0].text.Equals("")) { diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 9854a0d..f4d98e7 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 75 + controlID: 96 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 76 + controlID: 97 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 51 + controlID: 98 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 20fbffff + m_ExpandedIDs: 2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -656,8 +656,8 @@ MonoBehaviour: y: 574 width: 1348 height: 373 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} @@ -719,9 +719,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 84770000 - m_LastClickedID: 30596 - m_ExpandedIDs: 000000005c7700005e77000060770000 + m_SelectedIDs: 74770000 + m_LastClickedID: 30580 + m_ExpandedIDs: 0000000056770000587700005a770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -749,7 +749,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005c7700005e77000060770000 + m_ExpandedIDs: 0000000056770000587700005a770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -774,9 +774,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: 98240000 + m_LastClickedInstanceID: 9368 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300000000000034ecffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1069,7 +1069,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 9368 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 5db82b7..3e675d1 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 509 + controlID: 70 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1348 + width: 1353 height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 514 + controlID: 16 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1348 + width: 1353 height: 574 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 515 + controlID: 17 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,7 +187,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 306 + width: 253 height: 574 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -206,23 +206,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 306 + x: 253 y: 0 - width: 1042 + width: 1100 height: 574 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,7 +240,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 574 - width: 1348 + width: 1353 height: 373 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -266,9 +266,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1348 + x: 1353 y: 0 - width: 572 + width: 567 height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -297,9 +297,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 + x: 253 y: 73 - width: 1040 + width: 1098 height: 553 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -311,7 +311,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1040, y: 532} + m_TargetSize: {x: 1098, y: 532} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -326,8 +326,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -520 - m_HBaseRangeMax: 520 + m_HBaseRangeMin: -549 + m_HBaseRangeMax: 549 m_VBaseRangeMin: -266 m_VBaseRangeMax: 266 m_HAllowExceedBaseRangeMin: 1 @@ -347,23 +347,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1040 + width: 1098 height: 532 m_Scale: {x: 1, y: 1} - m_Translation: {x: 520, y: 266} + m_Translation: {x: 549, y: 266} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -520 + x: -549 y: -266 - width: 1040 + width: 1098 height: 532 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1040, y: 553} + m_LastWindowPixelSize: {x: 1098, y: 553} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -391,7 +391,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 305 + width: 252 height: 553 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -400,9 +400,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 20fbffff + m_SelectedIDs: 186c0000 + m_LastClickedID: 27672 + m_ExpandedIDs: 2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -446,9 +446,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 + x: 253 y: 73 - width: 1040 + width: 1098 height: 553 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -706,9 +706,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.5465274, y: -1.4268839, z: -0.07916484} + m_Target: {x: -3.6265645, y: -1.6099756, z: -0.09372259} speed: 2 - m_Value: {x: -4.5465274, y: -1.4268839, z: -0.07916484} + m_Value: {x: -3.6265645, y: -1.6099756, z: -0.09372259} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -759,9 +759,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10.31249 + m_Target: 11.768265 speed: 2 - m_Value: 10.31249 + m_Value: 11.768265 m_Ortho: m_Target: 1 speed: 2 @@ -808,7 +808,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 647 - width: 1347 + width: 1352 height: 352 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -840,9 +840,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 84770000 - m_LastClickedID: 30596 - m_ExpandedIDs: 000000005c7700005e77000060770000 + m_SelectedIDs: 7e770000 + m_LastClickedID: 30590 + m_ExpandedIDs: 0000000056770000587700005a770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -870,7 +870,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005c7700005e77000060770000 + m_ExpandedIDs: 0000000056770000587700005a770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1150,9 +1150,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1348 + x: 1353 y: 73 - width: 571 + width: 566 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: From 4ef29659687ccabede22fc924a53b17bac9d8ece Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Fri, 20 Jan 2023 11:58:31 +0100 Subject: [PATCH 3/8] ugynok sorsolas mukodik --- Assets/Scripts/Ugynok.cs | 54 + Assets/Scripts/movement.cs | 40 +- .../Layouts/CurrentMaximizeLayout.dwlt | 329 +--- UserSettings/Layouts/default-2021.dwlt | 1454 ++++++----------- 4 files changed, 649 insertions(+), 1228 deletions(-) diff --git a/Assets/Scripts/Ugynok.cs b/Assets/Scripts/Ugynok.cs index 4ec4f58..1c453c0 100644 --- a/Assets/Scripts/Ugynok.cs +++ b/Assets/Scripts/Ugynok.cs @@ -18,6 +18,60 @@ public class Ugynok : MonoBehaviour public TMP_Text[] twofour; public TMP_Text[] threefour; + private void Start() { + for (int i = 0; i < oneone.Length; i++) + { + oneone[i].text = ""; + } + for (int i = 0; i < onetwo.Length; i++) + { + onetwo[i].text = ""; + } + for (int i = 0; i < onethree.Length; i++) + { + onethree[i].text = ""; + } + for (int i = 0; i < onefour.Length; i++) + { + onefour[i].text = ""; + } + + for (int i = 0; i < twoone.Length; i++) + { + twoone[i].text = ""; + } + for (int i = 0; i < twotwo.Length; i++) + { + twotwo[i].text = ""; + } + for (int i = 0; i < twothree.Length; i++) + { + twothree[i].text = ""; + } + for (int i = 0; i < twofour.Length; i++) + { + twofour[i].text = ""; + } + + for (int i = 0; i < threeone.Length; i++) + { + threeone[i].text = ""; + } + for (int i = 0; i < threetwo.Length; i++) + { + threetwo[i].text = ""; + } + for (int i = 0; i < threethree.Length; i++) + { + threethree[i].text = ""; + } + for (int i = 0; i < threefour.Length; i++) + { + threefour[i].text = ""; + } + + } + public void UgynokSorsolas(int x, int y) { if (x == 1 && y == 1) { if (oneone[0].text.Equals("")) { diff --git a/Assets/Scripts/movement.cs b/Assets/Scripts/movement.cs index ddabf8c..d231d86 100644 --- a/Assets/Scripts/movement.cs +++ b/Assets/Scripts/movement.cs @@ -71,6 +71,7 @@ public class movement : MonoBehaviour { public GameObject korhazlepes2; private Akciopont ap; + private Ugynok ugynok; private int oneonecount = 0; private int twoonecount = 0; @@ -104,6 +105,7 @@ public class movement : MonoBehaviour { void Start() { ap = FindObjectOfType(); + ugynok = FindObjectOfType(); eromulepes1.SetActive(false); eromulepes2.SetActive(false); @@ -154,72 +156,84 @@ public class movement : MonoBehaviour { eromulepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 1; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 2) { player.transform.position = twoone.transform.position; feketepiaclepes1.SetActive(true); feketepiaclepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 1; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 3) { player.transform.position = threeone.transform.position; metrolepes1.SetActive(true); metrolepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 1; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 4) { player.transform.position = onetwo.transform.position; szervereklepes1.SetActive(true); szervereklepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 2; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 5) { player.transform.position = twotwo.transform.position; kingcasinolepes1.SetActive(true); kingcasinolepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 2; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 6) { player.transform.position = threetwo.transform.position; feltoltolepes1.SetActive(true); feltoltolepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 2; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 7) { player.transform.position = onethree.transform.position; kutatolaborlepes1.SetActive(true); kutatolaborlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 3; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 8) { player.transform.position = twothree.transform.position; kriptoklublepes1.SetActive(true); kriptoklublepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 3; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 9) { player.transform.position = threethree.transform.position; cyberplazalepes1.SetActive(true); cyberplazalepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 3; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 10) { player.transform.position = onefour.transform.position; hadiuzemlepes1.SetActive(true); hadiuzemlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 4; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 11) { player.transform.position = twofour.transform.position; konyvtarlepes1.SetActive(true); konyvtarlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 4; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } else if (random == 12) { player.transform.position = threefour.transform.position; korhazlepes1.SetActive(true); korhazlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 4; + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); } } @@ -652,6 +666,8 @@ public class movement : MonoBehaviour { ap.akciopont = ap.akciopont - tavolsag; oneonecount = oneonecount + 1; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); if (eromulepes1.activeSelf == true) { eromulepes2.SetActive(true); moveCounter++; @@ -691,7 +707,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 1; ap.akciopont = ap.akciopont - tavolsag; twoonecount = twoonecount + 1; - Debug.Log(ap.akciopont); + Debug.Log(ap.akciopont);Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); if (feketepiaclepes1.activeSelf == true) { feketepiaclepes2.SetActive(true); moveCounter++; @@ -731,7 +748,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 1; ap.akciopont = ap.akciopont - tavolsag; threeonecount++; - Debug.Log(ap.akciopont); + Debug.Log(ap.akciopont);Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); if (metrolepes1.activeSelf == true) { metrolepes2.SetActive(true); moveCounter++; @@ -776,6 +794,8 @@ public class movement : MonoBehaviour { ap.akciopont = ap.akciopont - tavolsag; onetwocount++; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); if (szervereklepes1.activeSelf == true) { szervereklepes2.SetActive(true); moveCounter++; @@ -815,6 +835,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 2; ap.akciopont = ap.akciopont - tavolsag; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); twotwocount++; if (kingcasinolepes1.activeSelf == true) { kingcasinolepes2.SetActive(true); @@ -860,6 +882,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 2; ap.akciopont = ap.akciopont - tavolsag; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); threetwocount++; if (feltoltolepes1.activeSelf == true) { feltoltolepes2.SetActive(true); @@ -901,6 +925,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 3; ap.akciopont = ap.akciopont - tavolsag; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); onethreecount++; if (kutatolaborlepes1.activeSelf == true) { kutatolaborlepes2.SetActive(true); @@ -946,6 +972,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 3; ap.akciopont = ap.akciopont - tavolsag; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); twothreecount++; if (kriptoklublepes1.activeSelf == true) { kriptoklublepes2.SetActive(true); @@ -988,6 +1016,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 3; ap.akciopont = ap.akciopont - tavolsag; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); threethreecount++; if (cyberplazalepes1.activeSelf == true) { cyberplazalepes2.SetActive(true); @@ -1029,6 +1059,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 4; ap.akciopont = ap.akciopont - tavolsag; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); onefourcount++; if (hadiuzemlepes1.activeSelf == true) { hadiuzemlepes2.SetActive(true); @@ -1070,6 +1102,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 4; ap.akciopont = ap.akciopont - tavolsag; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); twofourcount++; if (konyvtarlepes1.activeSelf == true) { konyvtarlepes2.SetActive(true); @@ -1111,6 +1145,8 @@ public class movement : MonoBehaviour { jelenlegi_y = 4; ap.akciopont = ap.akciopont - tavolsag; Debug.Log(ap.akciopont); + Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); threefourcount++; if (korhazlepes1.activeSelf == true) { korhazlepes2.SetActive(true); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index f4d98e7..4d347aa 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 13} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 96 + controlID: 1074 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 + x: 268 y: 73 - width: 1040 - height: 553 + width: 1152 + height: 534 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1040, y: 532} + m_TargetSize: {x: 1152, y: 513} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -520 - m_HBaseRangeMax: 520 - m_VBaseRangeMin: -266 - m_VBaseRangeMax: 266 + m_HBaseRangeMin: -576 + m_HBaseRangeMax: 576 + m_VBaseRangeMin: -256.5 + m_VBaseRangeMax: 256.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1040 - height: 532 + width: 1152 + height: 513 m_Scale: {x: 1, y: 1} - m_Translation: {x: 520, y: 266} + m_Translation: {x: 576, y: 256.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -520 - y: -266 - width: 1040 - height: 532 + x: -576 + y: -256.5 + width: 1152 + height: 513 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1040, y: 553} + m_LastWindowPixelSize: {x: 1152, y: 534} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,12 +136,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1348 + width: 1422 height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 97 + controlID: 1075 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,12 +161,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1348 - height: 574 + width: 1422 + height: 555 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 98 + controlID: 1076 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -184,10 +184,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 306 - height: 574 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 268 + height: 555 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -215,8 +215,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 305 - height: 553 + width: 267 + height: 534 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2afbffff + m_ExpandedIDs: e8f1ffff22fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -265,12 +265,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 306 + x: 268 y: 0 - width: 1042 - height: 574 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 1154 + height: 555 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -297,10 +297,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 + x: 268 y: 73 - width: 1040 - height: 553 + width: 1152 + height: 534 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.5465274, y: -1.4268839, z: -0.07916484} + m_Target: {x: 2.9719262, y: -0.14416061, z: -0.024618205} speed: 2 - m_Value: {x: -4.5465274, y: -1.4268839, z: -0.07916484} + m_Value: {x: 2.9719262, y: -0.14416061, z: -0.024618205} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10.31249 + m_Target: 12.46182 speed: 2 - m_Value: 10.31249 + m_Value: 12.46182 m_Ortho: m_Target: 1 speed: 2 @@ -653,18 +653,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 574 - width: 1348 - height: 373 + y: 555 + width: 1422 + height: 392 m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} - {fileID: 11} - - {fileID: 12} m_Selected: 0 - m_LastSelected: 2 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -686,9 +685,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 647 - width: 1347 - height: 352 + y: 628 + width: 1421 + height: 371 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -710,18 +709,18 @@ MonoBehaviour: m_Globs: [] m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 71 + m_StartGridSize: 88 m_LastFolders: - Assets/Scripts - m_LastFoldersGridSize: 71 + m_LastFoldersGridSize: 88 m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 74770000 - m_LastClickedID: 30580 - m_ExpandedIDs: 0000000056770000587700005a770000 + m_SelectedIDs: 88770000 + m_LastClickedID: 30600 + m_ExpandedIDs: 00000000647700006677000068770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -749,7 +748,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000056770000587700005a770000 + m_ExpandedIDs: 00000000647700006677000068770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -774,10 +773,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 98240000 - m_LastClickedInstanceID: 9368 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c62300000000000034ecffff + m_SelectedInstanceIDs: 226c0000 + m_LastClickedInstanceID: 27682 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -802,9 +801,9 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 71 + m_GridSize: 88 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 164 + m_DirectoriesAreaWidth: 193 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -813,183 +812,7 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12373, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Audio Mixer - m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 550 - width: 1472 - height: 449 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_MixersTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 30544 - m_ExpandedIDs: 12eb343c - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_LayoutStripsOnTop: - m_VerticalSplitter: - ID: 0 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: - - 65 - - 35 - relativeSizes: - - 0.65 - - 0.35000002 - minSizes: - - 85 - - 105 - maxSizes: - - 0 - - 0 - lastTotalSize: 0 - splitSize: 6 - xOffset: 0 - m_Version: 1 - oldRealSizes: - oldMinSizes: - oldMaxSizes: - oldSplitSize: 0 - m_HorizontalSplitter: - ID: 0 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: - - 60 - - 60 - - 60 - - 60 - relativeSizes: - - 0.25 - - 0.25 - - 0.25 - - 0.25 - minSizes: - - 85 - - 85 - - 85 - - 85 - maxSizes: - - 0 - - 0 - - 0 - - 0 - lastTotalSize: 0 - splitSize: 6 - xOffset: 0 - m_Version: 1 - oldRealSizes: - oldMinSizes: - oldMaxSizes: - oldSplitSize: 0 - m_LayoutStripsOnRight: - m_VerticalSplitter: - ID: 0 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: - - 60 - - 60 - - 60 - - 60 - relativeSizes: - - 0.25 - - 0.25 - - 0.25 - - 0.25 - minSizes: - - 100 - - 85 - - 85 - - 85 - maxSizes: - - 0 - - 0 - - 0 - - 0 - lastTotalSize: 0 - splitSize: 6 - xOffset: 0 - m_Version: 1 - oldRealSizes: - oldMinSizes: - oldMaxSizes: - oldSplitSize: 0 - m_HorizontalSplitter: - ID: 115 - splitterInitialOffset: 299 - currentActiveSplitter: -1 - realSizes: - - 592 - - 880 - relativeSizes: - - 0.40213048 - - 0.5978695 - minSizes: - - 160 - - 160 - maxSizes: - - 0 - - 0 - lastTotalSize: 1472 - splitSize: 6 - xOffset: 0 - m_Version: 1 - oldRealSizes: - oldMinSizes: - oldMaxSizes: - oldSplitSize: 0 - m_SectionOrder: 00000000030000000100000002000000 - m_LayoutMode: 1 - m_SortGroupsAlphabetically: 0 - m_ShowReferencedBuses: 1 - m_ShowBusConnections: 0 - m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -1002,14 +825,14 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 647 - width: 1347 - height: 352 + y: 564 + width: 1421 + height: 435 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &13 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1024,18 +847,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1348 + x: 1422 y: 0 - width: 572 + width: 498 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 14} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1055,9 +878,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1348 + x: 1422 y: 73 - width: 571 + width: 497 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1069,7 +892,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 9368 + m_LastInspectedObjectInstanceID: 27682 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 9a9a4e7..6a0b8ed 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -8,23 +8,127 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43 - width: 1920 - height: 997 + x: 2249 + y: 302.5 + width: 1206 + height: 715 m_ShowMode: 4 - m_Title: Inspector - m_RootView: {fileID: 2} + m_Title: + m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1206 + height: 665 + m_MinSize: {x: 679, y: 492} + m_MaxSize: {x: 14002, y: 14042} + vertical: 0 + controlID: 119 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 921 + y: 0 + width: 285 + height: 665 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 228 + height: 394 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 394 + width: 921 + height: 271 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,22 +141,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - - {fileID: 4} + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1206 + height: 715 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_UseTopView: 1 - m_TopViewHeight: 30 - m_UseBottomView: 1 - m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -69,12 +169,14 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1206 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: ---- !u!114 &4 + m_LoadedToolbars: [] + m_MainToolbar: {fileID: 18} + m_LastLoadedLayoutName: Default +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -90,136 +192,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 695 + width: 1206 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1920 - height: 947 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 -<<<<<<< HEAD - controlID: 70 -======= -<<<<<<< HEAD - controlID: 98 -======= - controlID: 509 ->>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2 ->>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 10} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1353 - height: 947 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 -<<<<<<< HEAD - controlID: 16 -======= -<<<<<<< HEAD - controlID: 99 -======= - controlID: 514 ->>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2 ->>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 8} - - {fileID: 9} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1353 - height: 574 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 -<<<<<<< HEAD - controlID: 17 -======= -<<<<<<< HEAD - controlID: 100 -======= - controlID: 515 ->>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2 ->>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 253 - height: 574 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -229,24 +206,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 10} + - {fileID: 5} m_Position: serializedVersion: 2 - x: 253 + x: 0 y: 0 - width: 1100 - height: 574 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 + width: 921 + height: 665 + m_MinSize: {x: 403, y: 492} + m_MaxSize: {x: 10001, y: 14042} + vertical: 1 + controlID: 92 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -256,25 +231,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 - y: 574 - width: 1353 - height: 373 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - - {fileID: 16} - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 2 + y: 0 + width: 921 + height: 394 + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} + vertical: 0 + controlID: 93 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -285,549 +257,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1353 + x: 228 y: 0 - width: 567 - height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + width: 693 + height: 394 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 18} + - {fileID: 15} + - {fileID: 16} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 253 - y: 73 - width: 1098 - height: 553 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1098, y: 532} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 1 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -549 - m_HBaseRangeMax: 549 - m_VBaseRangeMin: -266 - m_VBaseRangeMax: 266 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1098 - height: 532 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 549, y: 266} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -549 - y: -266 - width: 1098 - height: 532 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1098, y: 553} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 73 - width: 252 - height: 553 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} -<<<<<<< HEAD - m_SelectedIDs: 186c0000 - m_LastClickedID: 27672 - m_ExpandedIDs: 2afbffff -======= - m_SelectedIDs: - m_LastClickedID: 0 -<<<<<<< HEAD - m_ExpandedIDs: 28fbffff -======= - m_ExpandedIDs: 20fbffff ->>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2 ->>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 -<<<<<<< HEAD - x: 253 - y: 73 - width: 1098 - height: 553 -======= - x: 218 - y: 73 - width: 739 - height: 364 ->>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -101, y: -26} - snapCorner: 3 - id: Tool Settings - index: 0 - layout: 1 - - dockPosition: 0 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 - id: unity-grid-and-snap-toolbar - index: 1 - layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-scene-view-toolbar - index: 0 - layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 - id: unity-search-toolbar - index: 1 - layout: 1 - - dockPosition: 0 - containerId: overlay-container--left - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-transform-toolbar - index: 0 - layout: 2 - - dockPosition: 0 - containerId: overlay-container--left - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 197} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-component-tools - index: 1 - layout: 2 - - dockPosition: 0 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 67.5, y: 86} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Orientation - index: 0 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Light Settings - index: 0 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Camera - index: 1 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Cloth Constraints - index: 2 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Cloth Collisions - index: 3 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Navmesh Display - index: 4 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Agent Display - index: 5 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Obstacle Display - index: 6 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Occlusion Culling - index: 7 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Physics Debugger - index: 8 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Scene Visibility - index: 9 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Particles - index: 10 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Tilemap - index: 11 - layout: 4 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Tilemap Palette Helper - index: 12 - layout: 4 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Open Tile Palette - index: 2 - layout: 4 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Tilemap Focus - index: 3 - layout: 4 - m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 - m_SceneLighting: 1 - m_2DMode: 1 - m_isRotationLocked: 0 - m_PlayAudio: 0 - m_AudioPlay: 0 - m_Position: - m_Target: {x: -3.6265645, y: -1.6099756, z: -0.09372259} - speed: 2 - m_Value: {x: -3.6265645, y: -1.6099756, z: -0.09372259} - m_RenderMode: 0 - m_CameraMode: - drawMode: 0 - name: Shaded - section: Shading Mode - m_ValidateTrueMetals: 0 - m_DoValidateTrueMetals: 0 - m_ExposureSliderValue: 0 - m_SceneViewState: - m_AlwaysRefresh: 0 - showFog: 1 - showSkybox: 1 - showFlares: 1 - showImageEffects: 1 - showParticleSystems: 1 - showVisualEffectGraphs: 1 - m_FxEnabled: 1 - m_Grid: - xGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} - yGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - zGrid: - m_Fade: - m_Target: 1 - speed: 2 - m_Value: 1 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - m_ShowGrid: 1 - m_GridAxis: 1 - m_gridOpacity: 0.5 - m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} - speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} - m_Size: - m_Target: 11.768265 - speed: 2 - m_Value: 11.768265 - m_Ortho: - m_Target: 1 - speed: 2 - m_Value: 1 - m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 - m_SpeedMin: 0.001 - m_SpeedMax: 2 - m_EasingEnabled: 1 - m_EasingDuration: 0.4 - m_AccelerationEnabled: 1 - m_FieldOfViewHorizontalOrVertical: 60 - m_NearClip: 0.03 - m_FarClip: 10000 - m_DynamicClip: 1 - m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - m_LastSceneViewOrtho: 0 - m_ReplacementShader: {fileID: 0} - m_ReplacementString: - m_SceneVisActive: 1 - m_LastLockedObject: {fileID: 0} - m_ViewIsLockedToObject: 0 ---- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -847,14 +294,11 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 647 - width: 1352 - height: 352 + x: 2249 + y: 726.5 + width: 920 + height: 250 m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] m_SearchFilter: m_NameFilter: m_ClassNames: [] @@ -868,34 +312,21 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] - m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 71 + m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts - m_LastFoldersGridSize: 71 - m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource + - Assets + m_LastFoldersGridSize: -1 + m_LastProjectPath: U:\layout m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} -<<<<<<< HEAD - m_SelectedIDs: 7e770000 - m_LastClickedID: 30590 - m_ExpandedIDs: 0000000056770000587700005a770000 -======= -<<<<<<< HEAD - m_SelectedIDs: 6e770000 - m_LastClickedID: 30574 - m_ExpandedIDs: 000000005677000000ca9a3bffffff7f -======= - m_SelectedIDs: 84770000 - m_LastClickedID: 30596 - m_ExpandedIDs: 000000005c7700005e77000060770000 ->>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2 ->>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a + m_SelectedIDs: f4350000 + m_LastClickedID: 13812 + m_ExpandedIDs: 00000000f435000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -911,7 +342,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 0} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -923,15 +354,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 -<<<<<<< HEAD - m_ExpandedIDs: 0000000056770000587700005a770000 -======= -<<<<<<< HEAD - m_ExpandedIDs: 0000000056770000 -======= - m_ExpandedIDs: 000000005c7700005e77000060770000 ->>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2 ->>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a + m_ExpandedIDs: 00000000f4350000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -958,8 +381,8 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c62300000000000034ecffff + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -975,7 +398,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -983,219 +406,11 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 -<<<<<<< HEAD - m_ScrollPosition: {x: 0, y: 69.5} -======= m_ScrollPosition: {x: 0, y: 0} ->>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2 - m_GridSize: 71 + m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 164 ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12373, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Audio Mixer - m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 550 - width: 1472 - height: 449 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_MixersTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 30544 - m_ExpandedIDs: 12eb343c - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_LayoutStripsOnTop: - m_VerticalSplitter: - ID: 0 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: - - 65 - - 35 - relativeSizes: - - 0.65 - - 0.35000002 - minSizes: - - 85 - - 105 - maxSizes: - - 0 - - 0 - lastTotalSize: 0 - splitSize: 6 - xOffset: 0 - m_Version: 1 - oldRealSizes: - oldMinSizes: - oldMaxSizes: - oldSplitSize: 0 - m_HorizontalSplitter: - ID: 0 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: - - 60 - - 60 - - 60 - - 60 - relativeSizes: - - 0.25 - - 0.25 - - 0.25 - - 0.25 - minSizes: - - 85 - - 85 - - 85 - - 85 - maxSizes: - - 0 - - 0 - - 0 - - 0 - lastTotalSize: 0 - splitSize: 6 - xOffset: 0 - m_Version: 1 - oldRealSizes: - oldMinSizes: - oldMaxSizes: - oldSplitSize: 0 - m_LayoutStripsOnRight: - m_VerticalSplitter: - ID: 0 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: - - 60 - - 60 - - 60 - - 60 - relativeSizes: - - 0.25 - - 0.25 - - 0.25 - - 0.25 - minSizes: - - 100 - - 85 - - 85 - - 85 - maxSizes: - - 0 - - 0 - - 0 - - 0 - lastTotalSize: 0 - splitSize: 6 - xOffset: 0 - m_Version: 1 - oldRealSizes: - oldMinSizes: - oldMaxSizes: - oldSplitSize: 0 - m_HorizontalSplitter: - ID: 115 - splitterInitialOffset: 299 - currentActiveSplitter: -1 - realSizes: - - 592 - - 880 - relativeSizes: - - 0.40213048 - - 0.5978695 - minSizes: - - 160 - - 160 - maxSizes: - - 0 - - 0 - lastTotalSize: 1472 - splitSize: 6 - xOffset: 0 - m_Version: 1 - oldRealSizes: - oldMinSizes: - oldMaxSizes: - oldSplitSize: 0 - m_SectionOrder: 00000000030000000100000002000000 - m_LayoutMode: 1 - m_SortGroupsAlphabetically: 0 - m_ShowReferencedBuses: 1 - m_ShowBusConnections: 0 - m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 647 - width: 1347 - height: 352 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !u!114 &18 + m_DirectoriesAreaWidth: 207 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1215,14 +430,11 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1353 - y: 73 - width: 566 - height: 926 + x: 3170 + y: 332.5 + width: 284 + height: 644 m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: @@ -1231,8 +443,304 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 + m_AssetGUID: + m_InstanceID: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2249 + y: 332.5 + width: 227 + height: 373 + m_ViewDataDictionary: {fileID: 0} + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 42fbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2477 + y: 332.5 + width: 691 + height: 373 + m_ViewDataDictionary: {fileID: 0} + m_ShowContextualTools: 0 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 0 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0, y: 0, z: 0} + speed: 2 + m_Value: {x: 0, y: 0, z: 0} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 0 + m_SceneViewState: + showFog: 1 + showMaterialUpdate: 0 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + speed: 2 + m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Size: + m_Target: 10 + speed: 2 + m_Value: 10 + m_Ortho: + m_Target: 0 + speed: 2 + m_Value: 0 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfView: 90 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 507 + y: 94 + width: 1532 + height: 790 + m_ViewDataDictionary: {fileID: 0} + m_SerializedViewsNames: [] + m_SerializedViewsValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 640, y: 480} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 0 + m_MaximizeOnPlay: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -766 + m_HBaseRangeMax: 766 + m_VBaseRangeMin: -395 + m_VBaseRangeMax: 395 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 0 + width: 1532 + height: 790 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 766, y: 395} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -766 + y: -395 + width: 1532 + height: 790 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1532, y: 790} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2249 + y: 726.5 + width: 920 + height: 250 + m_ViewDataDictionary: {fileID: 0} +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13963, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_DontSaveToLayout: 0 From 5ccdaa9c12926b126c4e5273bddc3f4359d1bfbb Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Fri, 20 Jan 2023 13:21:00 +0100 Subject: [PATCH 4/8] ugynok collider --- Assets/Scenes/Jatek.unity | 2376 ++++++++++++++++- Assets/Scripts/helyszinaktivalas.cs | 52 +- ProjectSettings/ProjectSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 14 +- UserSettings/Layouts/default-2021.dwlt | 1222 +++++---- .../armeabi-v7a/lib_burst_generated.txt | 189 ++ 6 files changed, 3296 insertions(+), 561 deletions(-) create mode 100644 build android/fts_BurstDebugInformation_DoNotShip/tempburstlibs/armeabi-v7a/lib_burst_generated.txt diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 785aba5..62011de 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -1920,7 +1920,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1541006004} m_Father: {fileID: 1661214550} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2383,7 +2384,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1374165777} m_Father: {fileID: 1117282719} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2653,7 +2655,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1615015557} m_Father: {fileID: 1848662044} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2894,6 +2897,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 182002020} m_CullTransparentMesh: 1 +--- !u!1 &190452683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 190452684} + - component: {fileID: 190452685} + m_Layer: 5 + m_Name: Collider (22) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &190452684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190452683} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 716950396} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &190452685 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190452683} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &191744299 GameObject: m_ObjectHideFlags: 0 @@ -3904,6 +3970,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 235549630} m_CullTransparentMesh: 1 +--- !u!1 &236305769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 236305770} + - component: {fileID: 236305771} + m_Layer: 5 + m_Name: Collider (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &236305770 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236305769} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1429282886} + 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: -1.4, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &236305771 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236305769} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &245385154 GameObject: m_ObjectHideFlags: 0 @@ -4829,7 +4958,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 706540131} m_Father: {fileID: 1871225617} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5192,6 +5322,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 292899837} m_CullTransparentMesh: 1 +--- !u!1 &293544118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 293544119} + - component: {fileID: 293544120} + m_Layer: 5 + m_Name: Collider (34) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &293544119 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293544118} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1084869152} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &293544120 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293544118} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &309550009 GameObject: m_ObjectHideFlags: 0 @@ -5896,7 +6089,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 893820168} m_Father: {fileID: 357101321} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6759,6 +6953,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410263759} m_CullTransparentMesh: 1 +--- !u!1 &416499490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 416499491} + - component: {fileID: 416499492} + m_Layer: 5 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &416499491 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 416499490} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1326456195} + 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: -1, y: -1.406} + m_SizeDelta: {x: 18.98, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &416499492 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 416499490} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 +--- !u!1 &421286393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 421286394} + - component: {fileID: 421286395} + m_Layer: 5 + m_Name: Collider (11) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &421286394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 421286393} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1872052769} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &421286395 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 421286393} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &424761686 GameObject: m_ObjectHideFlags: 0 @@ -7028,6 +7348,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 425448838} m_CullTransparentMesh: 1 +--- !u!1 &430026344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 430026345} + - component: {fileID: 430026346} + m_Layer: 5 + m_Name: Collider (19) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &430026345 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 430026344} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2141320754} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &430026346 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 430026344} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &434887431 GameObject: m_ObjectHideFlags: 0 @@ -7774,7 +8157,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2137211081} m_Father: {fileID: 1228659130} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8015,6 +8399,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 481811353} m_CullTransparentMesh: 1 +--- !u!1 &482097722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 482097723} + - component: {fileID: 482097724} + m_Layer: 5 + m_Name: Collider (14) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &482097723 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482097722} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1216668347} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &482097724 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 482097722} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &482966388 GameObject: m_ObjectHideFlags: 0 @@ -8457,7 +8904,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1982496776} m_Father: {fileID: 1117282719} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8563,6 +9011,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 494324059} m_CullTransparentMesh: 1 +--- !u!1 &508890156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 508890157} + - component: {fileID: 508890158} + m_Layer: 5 + m_Name: Collider (24) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &508890157 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508890156} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1557522798} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &508890158 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508890156} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &519159253 GameObject: m_ObjectHideFlags: 0 @@ -9413,6 +9924,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 542111665} m_CullTransparentMesh: 1 +--- !u!1 &542154671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 542154672} + - component: {fileID: 542154673} + m_Layer: 5 + m_Name: Collider (9) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &542154672 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542154671} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 694600665} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &542154673 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542154671} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &548868623 GameObject: m_ObjectHideFlags: 0 @@ -9981,7 +10555,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1022299899} m_Father: {fileID: 1405135744} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11062,6 +11637,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 663535672} m_CullTransparentMesh: 1 +--- !u!1 &683300586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 683300587} + - component: {fileID: 683300588} + m_Layer: 5 + m_Name: Collider (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &683300587 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683300586} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1647177066} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &683300588 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683300586} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &694600664 GameObject: m_ObjectHideFlags: 0 @@ -11091,7 +11729,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 542154672} m_Father: {fileID: 1767879044} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11197,6 +11836,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 694600664} m_CullTransparentMesh: 1 +--- !u!1 &706540130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 706540131} + - component: {fileID: 706540132} + m_Layer: 5 + m_Name: Collider (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &706540131 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706540130} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 280090608} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &706540132 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 706540130} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &710452254 GameObject: m_ObjectHideFlags: 0 @@ -11342,7 +12044,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 190452684} m_Father: {fileID: 1267975127} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11653,7 +12356,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1570926429} m_Father: {fileID: 2116651430} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12339,6 +13043,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 750410050} m_CullTransparentMesh: 1 +--- !u!1 &753661016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 753661017} + - component: {fileID: 753661018} + m_Layer: 5 + m_Name: Collider (31) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &753661017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 753661016} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1965172623} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &753661018 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 753661016} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &767162772 GameObject: m_ObjectHideFlags: 0 @@ -12878,6 +13645,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 788040709} m_CullTransparentMesh: 1 +--- !u!1 &788057595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 788057596} + - component: {fileID: 788057597} + m_Layer: 5 + m_Name: Collider (28) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &788057596 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788057595} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 815573859} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &788057597 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788057595} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &791831418 GameObject: m_ObjectHideFlags: 0 @@ -13013,6 +13843,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 791831418} m_CullTransparentMesh: 1 +--- !u!1 &798647101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 798647102} + - component: {fileID: 798647103} + m_Layer: 5 + m_Name: Collider (18) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &798647102 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798647101} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2107810767} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &798647103 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798647101} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &805644603 GameObject: m_ObjectHideFlags: 0 @@ -13299,7 +14192,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 788057596} m_Father: {fileID: 1339188195} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13627,7 +14521,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2013586992} m_Father: {fileID: 1661214550} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -15062,6 +15957,69 @@ RectTransform: m_AnchoredPosition: {x: -8.464, y: 0} m_SizeDelta: {x: 788.7806, y: 562} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &893820167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 893820168} + - component: {fileID: 893820169} + m_Layer: 5 + m_Name: Collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &893820168 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893820167} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 325852435} + 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: -1, y: -1} + m_SizeDelta: {x: 18.98, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &893820169 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893820167} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &910984027 GameObject: m_ObjectHideFlags: 0 @@ -15762,6 +16720,69 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &922632581 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 922632582} + - component: {fileID: 922632583} + m_Layer: 5 + m_Name: Collider (23) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &922632582 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922632581} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1347432662} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &922632583 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922632581} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &924303922 GameObject: m_ObjectHideFlags: 0 @@ -16228,7 +17249,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1157172196} m_Father: {fileID: 45666889} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -17541,6 +18563,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970497335} m_CullTransparentMesh: 1 +--- !u!1 &974343171 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 974343172} + - component: {fileID: 974343173} + m_Layer: 5 + m_Name: Collider (17) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &974343172 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 974343171} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2084459195} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &974343173 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 974343171} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &975035252 GameObject: m_ObjectHideFlags: 0 @@ -17705,7 +18790,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1971118423} m_Father: {fileID: 1267975127} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -18518,6 +19604,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 998264440} m_CullTransparentMesh: 1 +--- !u!1 &1002673358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1002673359} + - component: {fileID: 1002673360} + m_Layer: 5 + m_Name: Collider (29) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1002673359 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002673358} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1962024231} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1002673360 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002673358} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1008356026 GameObject: m_ObjectHideFlags: 0 @@ -18788,6 +19937,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1016171085} m_CullTransparentMesh: 1 +--- !u!1 &1022299898 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1022299899} + - component: {fileID: 1022299900} + m_Layer: 5 + m_Name: Collider (13) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1022299899 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1022299898} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 605592370} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1022299900 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1022299898} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1022405224 GameObject: m_ObjectHideFlags: 0 @@ -19344,7 +20556,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1240172718} m_Father: {fileID: 45666889} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19749,7 +20962,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 293544119} m_Father: {fileID: 1228659130} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -21280,6 +22494,69 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -73.8} m_SizeDelta: {x: 18.7, y: 21.87} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1157172195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1157172196} + - component: {fileID: 1157172197} + m_Layer: 5 + m_Name: Collider (30) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1157172196 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157172195} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 939451651} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1157172197 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157172195} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1157818476 GameObject: m_ObjectHideFlags: 0 @@ -21771,7 +23048,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1624401002} m_Father: {fileID: 1405135744} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -22175,7 +23453,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 482097723} m_Father: {fileID: 1405135744} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -22645,6 +23924,69 @@ Transform: m_Father: {fileID: 1620267093} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1240172717 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1240172718} + - component: {fileID: 1240172719} + m_Layer: 5 + m_Name: Collider (32) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1240172718 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1240172717} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1054331717} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1240172719 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1240172717} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1251112982 GameObject: m_ObjectHideFlags: 0 @@ -23360,6 +24702,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1296910703} m_CullTransparentMesh: 1 +--- !u!1 &1297498736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297498737} + - component: {fileID: 1297498738} + m_Layer: 5 + m_Name: Collider (33) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1297498737 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297498736} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1677562172} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1297498738 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297498736} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1306260451 GameObject: m_ObjectHideFlags: 0 @@ -23646,7 +25051,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1954876563} m_Father: {fileID: 1848662044} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -23781,7 +25187,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 416499491} m_Father: {fileID: 1661214550} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -23887,6 +25294,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1326456194} m_CullTransparentMesh: 1 +--- !u!1 &1328647949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1328647950} + - component: {fileID: 1328647951} + m_Layer: 5 + m_Name: Collider (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1328647950 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328647949} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2139851217} + 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: -1, y: -1} + m_SizeDelta: {x: 18.98, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1328647951 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328647949} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1339188194 GameObject: m_ObjectHideFlags: 0 @@ -24310,7 +25780,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 922632582} m_Father: {fileID: 1267975127} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -24854,6 +26325,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369718625} m_CullTransparentMesh: 1 +--- !u!1 &1374165776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1374165777} + - component: {fileID: 1374165778} + m_Layer: 5 + m_Name: Collider (26) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1374165777 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1374165776} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 169295794} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1374165778 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1374165776} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1374738209 GameObject: m_ObjectHideFlags: 0 @@ -24883,7 +26417,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1564652873} m_Father: {fileID: 1339188195} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -25556,6 +27091,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1393612611} m_CullTransparentMesh: 1 +--- !u!1 &1397901024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1397901025} + - component: {fileID: 1397901026} + m_Layer: 5 + m_Name: Collider (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1397901025 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397901024} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1995086239} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1397901026 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1397901024} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1403012377 GameObject: m_ObjectHideFlags: 0 @@ -26422,7 +28020,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 236305770} m_Father: {fileID: 357101321} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -28404,6 +30003,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1538197609} m_CullTransparentMesh: 1 +--- !u!1 &1541006003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1541006004} + - component: {fileID: 1541006005} + m_Layer: 5 + m_Name: Collider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1541006004 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1541006003} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 144640422} + 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: -1, y: -1.406} + m_SizeDelta: {x: 18.98, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1541006005 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1541006003} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1541045929 GameObject: m_ObjectHideFlags: 0 @@ -28544,7 +30206,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 508890157} m_Father: {fileID: 1117282719} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -28869,6 +30532,132 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1564652872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1564652873} + - component: {fileID: 1564652874} + m_Layer: 5 + m_Name: Collider (27) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1564652873 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1564652872} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1374738210} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1564652874 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1564652872} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 +--- !u!1 &1570926428 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1570926429} + - component: {fileID: 1570926430} + m_Layer: 5 + m_Name: Collider (20) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1570926429 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570926428} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 720969164} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1570926430 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570926428} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1573977804 GameObject: m_ObjectHideFlags: 0 @@ -30007,6 +31796,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1611114213} m_CullTransparentMesh: 1 +--- !u!1 &1615015556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1615015557} + - component: {fileID: 1615015558} + m_Layer: 5 + m_Name: Collider (15) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1615015557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1615015556} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 181786100} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1615015558 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1615015556} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1618306676 GameObject: m_ObjectHideFlags: 0 @@ -30364,6 +32216,69 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1624401001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1624401002} + - component: {fileID: 1624401003} + m_Layer: 5 + m_Name: Collider (12) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1624401002 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624401001} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1201900457} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1624401003 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1624401001} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1629591638 GameObject: m_ObjectHideFlags: 0 @@ -30785,7 +32700,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 683300587} m_Father: {fileID: 1871225617} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -31489,7 +33405,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1297498737} m_Father: {fileID: 1228659130} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -31730,6 +33647,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1677576235} m_CullTransparentMesh: 1 +--- !u!1 &1678558474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1678558475} + - component: {fileID: 1678558476} + m_Layer: 5 + m_Name: Collider (10) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1678558475 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678558474} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2026770334} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1678558476 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1678558474} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1683003563 GameObject: m_ObjectHideFlags: 0 @@ -35115,7 +37095,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 421286394} m_Father: {fileID: 1767879044} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -36400,6 +38381,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1954172262} m_CullTransparentMesh: 1 +--- !u!1 &1954876562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1954876563} + - component: {fileID: 1954876564} + m_Layer: 5 + m_Name: Collider (16) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1954876563 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954876562} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1323862074} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1954876564 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954876562} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1961080820 GameObject: m_ObjectHideFlags: 0 @@ -36551,7 +38595,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1002673359} m_Father: {fileID: 1339188195} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -37078,7 +39123,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 753661017} m_Father: {fileID: 45666889} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -37454,6 +39500,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1970422690} m_CullTransparentMesh: 1 +--- !u!1 &1971118422 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1971118423} + - component: {fileID: 1971118424} + m_Layer: 5 + m_Name: Collider (21) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1971118423 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971118422} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 981449534} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1971118424 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1971118422} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 +--- !u!1 &1982496775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1982496776} + - component: {fileID: 1982496777} + m_Layer: 5 + m_Name: Collider (25) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1982496776 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982496775} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 494324060} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &1982496777 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982496775} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &1989134581 GameObject: m_ObjectHideFlags: 0 @@ -37753,7 +39925,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1397901025} m_Father: {fileID: 1871225617} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -38170,6 +40343,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2004810158} m_CullTransparentMesh: 1 +--- !u!1 &2013586991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2013586992} + - component: {fileID: 2013586993} + m_Layer: 5 + m_Name: Collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2013586992 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013586991} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 833259106} + 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: -1, y: -1.406} + m_SizeDelta: {x: 18.98, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &2013586993 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013586991} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &2026770333 GameObject: m_ObjectHideFlags: 0 @@ -38199,7 +40435,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1678558475} m_Father: {fileID: 1767879044} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -39152,7 +41389,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 974343172} m_Father: {fileID: 1848662044} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -39422,7 +41660,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 798647102} m_Father: {fileID: 2116651430} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -39735,6 +41974,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2125780725} m_CullTransparentMesh: 1 +--- !u!1 &2137211080 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2137211081} + - component: {fileID: 2137211082} + m_Layer: 5 + m_Name: Collider (35) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2137211081 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137211080} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 473458442} + 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: -1, y: -1} + m_SizeDelta: {x: 19.781, y: 19.519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!61 &2137211082 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2137211080} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 18.98, y: 19.519} + m_EdgeRadius: 0 --- !u!1 &2139851216 GameObject: m_ObjectHideFlags: 0 @@ -39764,7 +42066,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1328647950} m_Father: {fileID: 357101321} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -39899,7 +42202,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03672014, y: 0.03672014, z: 0.03672014} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 430026345} m_Father: {fileID: 2116651430} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/helyszinaktivalas.cs b/Assets/Scripts/helyszinaktivalas.cs index d5c5ece..6e6e0b6 100644 --- a/Assets/Scripts/helyszinaktivalas.cs +++ b/Assets/Scripts/helyszinaktivalas.cs @@ -13,14 +13,13 @@ public class helyszinaktivalas : MonoBehaviour private Upgrade upgrade; private Akciopont akciopont; private movement movement; - //int movement.jelenlegi_x; - //int movement.movement.jelenlegi_y; + bool canUpgrade = false; + public bool canKill = false; private int diceResult; public Sprite[] diceSides = new Sprite[6]; public SpriteRenderer hely1; - // Start is called before the first frame update void Start() { dice = FindObjectOfType(); @@ -32,38 +31,31 @@ public class helyszinaktivalas : MonoBehaviour elet = FindObjectOfType(); } - // Update is called once per frame - /*void Update() - { - movement.jelenlegi_x = movement.jelenlegi_x; - movement.jelenlegi_y = movement.jelenlegi_y; - canUpgrade = false; - }*/ - public void HelyszinAktivalas() { - //1-es mezõ + //1-es mez� if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 1) { - //ügynökcsapat ölés bárhol töltény nélkül + //ugynokcsapat oles barhol tolteny nelkul + canKill = true; //megolhetunk egy csapatot } - //2-es mezõ -- KÉSZ + //2-es mez� -- K�SZ if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 1) { canUpgrade = true; akciopont.akciopont++; } - //3-es mezõ -- KÉSZ + //3-es mez� -- K�SZ if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 1) { movement.helyreTeleport(); } - //4-es mezõ + //4-es mez� if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 2) { - //kapsz egy tárgyat + //kapsz egy t�rgyat } - //5-es mezõ + //5-es mez� if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 2) { /*diceResult = RollDice(); @@ -71,19 +63,19 @@ public class helyszinaktivalas : MonoBehaviour hely1.size = new Vector2(38, 38); targyak.targy_szamlalo++;*/ } - //6-es mezõ + //6-es mez� if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 2) { - //+1 akció + //+1 akci� } - //7-es mezõ -- KÉSZ + //7-es mez� -- K�SZ if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 3) { - //1 fejlesztés ingyen + //1 fejleszt�s ingyen canUpgrade = true; akciopont.akciopont++; } - //8-es mezõ + //8-es mez� if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 3) { @@ -93,32 +85,32 @@ public class helyszinaktivalas : MonoBehaviour targyak.targy_szamlalo++;*/ } - //9-es mezõ -- KÉSZ + //9-es mez� -- K�SZ if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 3) { targyak.RandomTargy(); targyak.targy_szamlalo++; } - //10-es mezõ -- KÉSZ ? + //10-es mez� -- K�SZ ? if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 4) { - //+4 töltény + //+4 t�lt�ny akciok.Betarazas(4); } - //11-es mezõ + //11-es mez� if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 4) { - //Dobj! Megkapod a tárgyat. + //Dobj! Megkapod a t�rgyat. /* diceResult = RollDice(); hely1.sprite = diceSides[diceResult - 1]; hely1.size = new Vector2(38, 38); targyak.targy_szamlalo++;*/ } - //12-es mezõ -- KÉSZ + //12-es mez� -- K�SZ if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 4) { - //+1 élet + //+1 �let elet.Eletplusz(); } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0f1e47d..0b38132 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -56,8 +56,8 @@ PlayerSettings: androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 - allowedAutorotateToPortrait: 1 - allowedAutorotateToPortraitUpsideDown: 1 + allowedAutorotateToPortrait: 0 + allowedAutorotateToPortraitUpsideDown: 0 allowedAutorotateToLandscapeRight: 1 allowedAutorotateToLandscapeLeft: 1 useOSAutorotation: 1 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 4d347aa..23fa33d 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 1074 + controlID: 1511 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 1075 + controlID: 1512 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 1076 + controlID: 1513 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,8 +269,8 @@ MonoBehaviour: y: 0 width: 1154 height: 555 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -656,8 +656,8 @@ MonoBehaviour: y: 555 width: 1422 height: 392 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 6a0b8ed..7f480cb 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,121 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 2249 - y: 302.5 - width: 1206 - height: 715 + x: 0 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: - m_RootView: {fileID: 6} + m_Title: Hierarchy + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 9} - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1206 - height: 665 - m_MinSize: {x: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} - vertical: 0 - controlID: 119 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 921 - y: 0 - width: 285 - height: 665 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 228 - height: 394 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 394 - width: 921 - height: 271 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} - m_Panes: - - {fileID: 12} - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -141,18 +37,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 2} - - {fileID: 8} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1206 - height: 715 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &7 + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -169,14 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1206 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LoadedToolbars: [] - m_MainToolbar: {fileID: 18} - m_LastLoadedLayoutName: Default ---- !u!114 &8 + m_LastLoadedLayoutName: MyLayout +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -192,12 +90,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 695 - width: 1206 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &9 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -210,44 +108,69 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 921 - height: 665 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} - vertical: 1 - controlID: 92 ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 4} + - {fileID: 6} - {fileID: 11} m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 921 - height: 394 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + y: 30 + width: 1920 + height: 947 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 93 ---- !u!114 &11 + controlID: 1763 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1422 + height: 947 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 1764 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 9} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1422 + height: 555 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 1765 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -262,19 +185,607 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 228 + x: 0 y: 0 - width: 693 - height: 394 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 268 + height: 555 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 268 + y: 0 + width: 1154 + height: 555 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + - {fileID: 12} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 555 + width: 1422 + height: 392 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 16} m_Selected: 0 m_LastSelected: 1 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: InspectorWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1422 + y: 0 + width: 498 + height: 947 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 268 + y: 73 + width: 1152 + height: 534 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1152, y: 513} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 1 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -576 + m_HBaseRangeMax: 576 + m_VBaseRangeMin: -256.5 + m_VBaseRangeMax: 256.5 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1152 + height: 513 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 576, y: 256.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -576 + y: -256.5 + width: 1152 + height: 513 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1152, y: 534} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73 + width: 267 + height: 534 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: f2afffff94b0ffff66b2ffff70b2ffffaeb6ffff50b7ffff22b9ffff2cb9ffffacbdffff52befffff6c1ffff14c2ffffe8f1ffff22fbffffa26b00003e730000fc73000064750000322a0100662a0100962a0100b42a0100c42a0100562b0100982b0100aa2b01001c2c0100482c0100ae2c0100f62c01000a2d01001e2d0100862d01009c2d0100462e0100a82e0100142f01002c2f0100542f0100702f0100ac2f0100c62f0100e42f0100f02f0100263001002e300100363001005030010074300100ac300100da30010062310100c6310100f0310100023201001e3201008a320100c0320100fa32010002330100063301006633010088330100b0330100cc3301000c3401001c34010024340100343401003c340100 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: Collider (32) + m_OriginalName: Collider (32) + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: -29074 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 4 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 8} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 268 + y: 73 + width: 1152 + height: 534 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 3 + layout: 4 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: -8.318136, y: 2.1353097, z: -0.048845626} + speed: 2 + m_Value: {x: -8.318136, y: 2.1353097, z: -0.048845626} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 11.891162 + speed: 2 + m_Value: 11.891162 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -294,11 +805,14 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 628 + width: 1421 + height: 371 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_SearchFilter: m_NameFilter: m_ClassNames: [] @@ -312,21 +826,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] + m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 64 + m_StartGridSize: 88 m_LastFolders: - - Assets - m_LastFoldersGridSize: -1 - m_LastProjectPath: U:\layout + - Assets/Scripts + m_LastFoldersGridSize: 88 + m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f4350000 - m_LastClickedID: 13812 - m_ExpandedIDs: 00000000f435000000ca9a3b + m_SelectedIDs: 88770000 + m_LastClickedID: 30600 + m_ExpandedIDs: 00000000647700006677000068770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -342,7 +857,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -354,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f4350000 + m_ExpandedIDs: 00000000647700006677000068770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -382,7 +897,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000 + m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -398,7 +913,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -407,306 +922,10 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 + m_GridSize: 88 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 3170 - y: 332.5 - width: 284 - height: 644 - m_ViewDataDictionary: {fileID: 0} - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: 160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_AssetGUID: - m_InstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 2249 - y: 332.5 - width: 227 - height: 373 - m_ViewDataDictionary: {fileID: 0} - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 42fbffff - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 2477 - y: 332.5 - width: 691 - height: 373 - m_ViewDataDictionary: {fileID: 0} - m_ShowContextualTools: 0 - m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 - m_SceneLighting: 1 - m_2DMode: 0 - m_isRotationLocked: 0 - m_PlayAudio: 0 - m_AudioPlay: 0 - m_Position: - m_Target: {x: 0, y: 0, z: 0} - speed: 2 - m_Value: {x: 0, y: 0, z: 0} - m_RenderMode: 0 - m_CameraMode: - drawMode: 0 - name: Shaded - section: Shading Mode - m_ValidateTrueMetals: 0 - m_DoValidateTrueMetals: 0 - m_ExposureSliderValue: 0 - m_SceneViewState: - showFog: 1 - showMaterialUpdate: 0 - showSkybox: 1 - showFlares: 1 - showImageEffects: 1 - showParticleSystems: 1 - showVisualEffectGraphs: 1 - m_Grid: - xGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} - yGrid: - m_Fade: - m_Target: 1 - speed: 2 - m_Value: 1 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} - zGrid: - m_Fade: - m_Target: 0 - speed: 2 - m_Value: 0 - m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} - m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} - m_ShowGrid: 1 - m_GridAxis: 1 - m_gridOpacity: 0.5 - m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} - m_Size: - m_Target: 10 - speed: 2 - m_Value: 10 - m_Ortho: - m_Target: 0 - speed: 2 - m_Value: 0 - m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 - m_SpeedMin: 0.001 - m_SpeedMax: 2 - m_EasingEnabled: 1 - m_EasingDuration: 0.4 - m_AccelerationEnabled: 1 - m_FieldOfView: 90 - m_NearClip: 0.03 - m_FarClip: 10000 - m_DynamicClip: 1 - m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} - m_LastSceneViewOrtho: 0 - m_ReplacementShader: {fileID: 0} - m_ReplacementString: - m_SceneVisActive: 1 - m_LastLockedObject: {fileID: 0} - m_ViewIsLockedToObject: 0 + m_DirectoriesAreaWidth: 193 --- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 507 - y: 94 - width: 1532 - height: 790 - m_ViewDataDictionary: {fileID: 0} - m_SerializedViewsNames: [] - m_SerializedViewsValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 640, y: 480} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 0 - m_MaximizeOnPlay: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -766 - m_HBaseRangeMax: 766 - m_VBaseRangeMin: -395 - m_VBaseRangeMax: 395 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 0 - width: 1532 - height: 790 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 395} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -766 - y: -395 - width: 1532 - height: 790 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1532, y: 790} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -726,21 +945,52 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 564 + width: 1421 + height: 435 m_ViewDataDictionary: {fileID: 0} ---- !u!114 &18 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &17 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13963, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_DontSaveToLayout: 0 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1422 + y: 73 + width: 497 + height: 926 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} diff --git a/build android/fts_BurstDebugInformation_DoNotShip/tempburstlibs/armeabi-v7a/lib_burst_generated.txt b/build android/fts_BurstDebugInformation_DoNotShip/tempburstlibs/armeabi-v7a/lib_burst_generated.txt new file mode 100644 index 0000000..2bae11a --- /dev/null +++ b/build android/fts_BurstDebugInformation_DoNotShip/tempburstlibs/armeabi-v7a/lib_burst_generated.txt @@ -0,0 +1,189 @@ +Library: lib_burst_generated +--platform=Android +--backend=burst-llvm-12 +--target=ARMV7A_NEON32 +--global-safety-checks-setting=Off +--dump=Function +--float-precision=Standard +--disable-warnings=BC1370 +--compilation-defines=UNITY_2021_3_12 +--compilation-defines=UNITY_2021_3 +--compilation-defines=UNITY_2021 +--compilation-defines=UNITY_5_3_OR_NEWER +--compilation-defines=UNITY_5_4_OR_NEWER +--compilation-defines=UNITY_5_5_OR_NEWER +--compilation-defines=UNITY_5_6_OR_NEWER +--compilation-defines=UNITY_2017_1_OR_NEWER +--compilation-defines=UNITY_2017_2_OR_NEWER +--compilation-defines=UNITY_2017_3_OR_NEWER +--compilation-defines=UNITY_2017_4_OR_NEWER +--compilation-defines=UNITY_2018_1_OR_NEWER +--compilation-defines=UNITY_2018_2_OR_NEWER +--compilation-defines=UNITY_2018_3_OR_NEWER +--compilation-defines=UNITY_2018_4_OR_NEWER +--compilation-defines=UNITY_2019_1_OR_NEWER +--compilation-defines=UNITY_2019_2_OR_NEWER +--compilation-defines=UNITY_2019_3_OR_NEWER +--compilation-defines=UNITY_2019_4_OR_NEWER +--compilation-defines=UNITY_2020_1_OR_NEWER +--compilation-defines=UNITY_2020_2_OR_NEWER +--compilation-defines=UNITY_2020_3_OR_NEWER +--compilation-defines=UNITY_2021_1_OR_NEWER +--compilation-defines=UNITY_2021_2_OR_NEWER +--compilation-defines=UNITY_2021_3_OR_NEWER +--compilation-defines=USE_SEARCH_ENGINE_API +--compilation-defines=USE_SEARCH_TABLE +--compilation-defines=USE_SEARCH_MODULE +--compilation-defines=USE_PROPERTY_DATABASE +--compilation-defines=USE_SEARCH_EXTENSION_API +--compilation-defines=SCENE_TEMPLATE_MODULE +--compilation-defines=ENABLE_AR +--compilation-defines=ENABLE_AUDIO +--compilation-defines=ENABLE_CACHING +--compilation-defines=ENABLE_CLOTH +--compilation-defines=ENABLE_EVENT_QUEUE +--compilation-defines=ENABLE_MICROPHONE +--compilation-defines=ENABLE_MULTIPLE_DISPLAYS +--compilation-defines=ENABLE_PHYSICS +--compilation-defines=ENABLE_TEXTURE_STREAMING +--compilation-defines=ENABLE_UNET +--compilation-defines=ENABLE_LZMA +--compilation-defines=ENABLE_UNITYEVENTS +--compilation-defines=ENABLE_VR +--compilation-defines=ENABLE_WEBCAM +--compilation-defines=ENABLE_UNITYWEBREQUEST +--compilation-defines=ENABLE_WWW +--compilation-defines=ENABLE_CLOUD_SERVICES +--compilation-defines=ENABLE_CLOUD_SERVICES_COLLAB +--compilation-defines=ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS +--compilation-defines=ENABLE_CLOUD_SERVICES_ADS +--compilation-defines=ENABLE_CLOUD_SERVICES_USE_WEBREQUEST +--compilation-defines=ENABLE_CLOUD_SERVICES_CRASH_REPORTING +--compilation-defines=ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING +--compilation-defines=ENABLE_CLOUD_SERVICES_PURCHASING +--compilation-defines=ENABLE_CLOUD_SERVICES_ANALYTICS +--compilation-defines=ENABLE_CLOUD_SERVICES_UNET +--compilation-defines=ENABLE_CLOUD_SERVICES_BUILD +--compilation-defines=ENABLE_CLOUD_LICENSE +--compilation-defines=ENABLE_EDITOR_HUB_LICENSE +--compilation-defines=ENABLE_WEBSOCKET_CLIENT +--compilation-defines=ENABLE_DIRECTOR_AUDIO +--compilation-defines=ENABLE_DIRECTOR_TEXTURE +--compilation-defines=ENABLE_MANAGED_JOBS +--compilation-defines=ENABLE_MANAGED_TRANSFORM_JOBS +--compilation-defines=ENABLE_MANAGED_ANIMATION_JOBS +--compilation-defines=ENABLE_MANAGED_AUDIO_JOBS +--compilation-defines=ENABLE_RUNTIME_PERMISSIONS +--compilation-defines=ENABLE_ENGINE_CODE_STRIPPING +--compilation-defines=ENABLE_ONSCREEN_KEYBOARD +--compilation-defines=ENABLE_MANAGED_UNITYTLS +--compilation-defines=INCLUDE_DYNAMIC_GI +--compilation-defines=ENABLE_SCRIPTING_GC_WBARRIERS +--compilation-defines=PLATFORM_SUPPORTS_MONO +--compilation-defines=ENABLE_VIDEO +--compilation-defines=ENABLE_ACCELERATOR_CLIENT_DEBUGGING +--compilation-defines=PLATFORM_ANDROID +--compilation-defines=TEXTCORE_1_0_OR_NEWER +--compilation-defines=UNITY_ANDROID +--compilation-defines=UNITY_ANDROID_API +--compilation-defines=ENABLE_EGL +--compilation-defines=ENABLE_NETWORK +--compilation-defines=ENABLE_RUNTIME_GI +--compilation-defines=ENABLE_CRUNCH_TEXTURE_COMPRESSION +--compilation-defines=UNITY_CAN_SHOW_SPLASH_SCREEN +--compilation-defines=UNITY_HAS_GOOGLEVR +--compilation-defines=UNITY_HAS_TANGO +--compilation-defines=ENABLE_SPATIALTRACKING +--compilation-defines=ENABLE_ETC_COMPRESSION +--compilation-defines=PLATFORM_EXTENDS_VULKAN_DEVICE +--compilation-defines=PLATFORM_HAS_MULTIPLE_SWAPCHAINS +--compilation-defines=UNITY_ANDROID_SUPPORTS_SHADOWFILES +--compilation-defines=PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP +--compilation-defines=ENABLE_UNITYADS_RUNTIME +--compilation-defines=UNITY_UNITYADS_API +--compilation-defines=ENABLE_MONO +--compilation-defines=NET_STANDARD_2_0 +--compilation-defines=NET_STANDARD +--compilation-defines=NET_STANDARD_2_1 +--compilation-defines=NETSTANDARD +--compilation-defines=NETSTANDARD2_1 +--compilation-defines=ENABLE_CUSTOM_RENDER_TEXTURE +--compilation-defines=ENABLE_DIRECTOR +--compilation-defines=ENABLE_LOCALIZATION +--compilation-defines=ENABLE_SPRITES +--compilation-defines=ENABLE_TERRAIN +--compilation-defines=ENABLE_TILEMAP +--compilation-defines=ENABLE_TIMELINE +--compilation-defines=ENABLE_LEGACY_INPUT_MANAGER +--compilation-defines=PACKAGE_PHYSICS +--compilation-defines=PACKAGE_PHYSICS2D +--compilation-defines=PACKAGE_TILEMAP +--compilation-defines=PACKAGE_ANIMATION +--compilation-defines=PACKAGE_UITOOLKIT +--compilation-defines=CSHARP_7_OR_LATER +--compilation-defines=CSHARP_7_3_OR_NEWER +--compilation-defines=ENABLE_VR_MODULE +--compilation-defines=ENABLE_XR_MODULE +--compilation-defines=MODULE_AI_EXISTS +--compilation-defines=MODULE_ANIMATION_EXISTS +--compilation-defines=MODULE_PHYSICS_EXISTS +--compilation-defines=MODULE_PHYSICS_2D_EXISTS +--compilation-defines=MODULE_PARTICLE_SYSTEM_EXISTS +--compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER +--compilation-defines=USING_ANIMATION_MODULE +--compilation-defines=USING_PHYSICS2D_MODULE +--compilation-defines=ENABLE_ANIMATION_BURST +--compilation-defines=TIMELINE_FRAMEACCURATE +--compilation-defines=ENABLE_SPRITESHAPE_BURST +--generate-link-xml=Temp\burst.link.xml +--output=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\tempburstlibs\armeabi-v7a\lib_burst_generated +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\UnityEngine.UI.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.Core.Runtime.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.VisualScripting.Flow.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Mathematics.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Telemetry.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.VisualScripting.State.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.VisualScripting.Core.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.Universal.Runtime.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Environments.Internal.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Burst.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.Animation.Runtime.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.TextMeshPro.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Timeline.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipeline.Universal.ShaderLibrary.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Environments.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Internal.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Analytics.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.SpriteShape.Runtime.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Scheduler.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Registration.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.PixelPerfect.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.Common.Runtime.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.IK.Runtime.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Device.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Threading.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.Tilemap.Extras.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Networking.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Assembly-CSharp.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.Core.ShaderLibrary.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.InternalAPIEngineBridge.001.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Configuration.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.Universal.Shaders.dll +--root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll +--assembly-folder=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\ +--pdb-search-paths=Temp/ManagedSymbols/ +--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.VisibleLight, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.VisibleLight, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--b04c75a68edf1d166f6547f2ea0e8928 +--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.Universal.LightMinMaxZ, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.Universal.LightMinMaxZ, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--e943843acfb78f5f2f3716a6553740d9 +--method=Unity.Burst.BurstCompiler+BurstCompilerHelper, Unity.Burst, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::IsBurstEnabled()--8c2be93e18276203cbd918daa2748a10 +--method=UnityEngine.U2D.Animation.BurstedSpriteSkinUtilities, Unity.2D.Animation.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::ValidateBoneWeights(Unity.Collections.NativeSlice`1[[UnityEngine.BoneWeight, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--5bf0a813706ef9287fcaa55dd0ccb876 +--method=Unity.Jobs.IJobExtensions+JobStruct`1[[UnityEngine.Rendering.Universal.RadixSortJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.RadixSortJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--26c6d10914da2fc98755b3533c59141e +--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.SliceCombineJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.SliceCombineJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--e046a1595d0148509657ed4dbcb52a86 +--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.SliceCullingJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.SliceCullingJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--1998da082e6413092f0e7bcd5a0e9331 +--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.ZBinningJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.ZBinningJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--77fc393cb521ac129b1392d4eb94d29a +--method=Unity.Jobs.IJobExtensions+JobStruct`1[[UnityEngine.Rendering.Universal.DecalCreateDrawCallSystem+DrawCallJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.DecalCreateDrawCallSystem+DrawCallJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--aa309157da5950aa53ed6075709e6e40 +--method=UnityEngine.Jobs.IJobParallelForTransformExtensions+TransformParallelForLoopStruct`1[[UnityEngine.Rendering.Universal.DecalUpdateCachedSystem+UpdateTransformsJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.DecalUpdateCachedSystem+UpdateTransformsJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--670478f3fb3f285eeace534fbe61a03e +--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.LightExtractionJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.LightExtractionJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--34e8fec66b799db60cf2f2f751c3bdd9 +--method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.MinMaxZJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.MinMaxZJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--d23a07cb3c3f217121d5bf94e76674f0 +--method=Unity.Jobs.IJobExtensions+JobStruct`1[[UnityEngine.U2D.SpriteShapeGenerator, Unity.2D.SpriteShape.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.U2D.SpriteShapeGenerator&, Unity.2D.SpriteShape.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--a185c62eba2497c95197140e5282b27a + From f306a5d9d37d4b4f9a9f637911998f5ee7bdaf98 Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Sun, 22 Jan 2023 17:30:36 +0100 Subject: [PATCH 5/8] ugynok csapat oles kesz --- Assets/Scenes/Jatek.unity | 56 +- Assets/Scripts/Ugynok.cs | 659 ++++++++++++++++-- .../Layouts/CurrentMaximizeLayout.dwlt | 44 +- UserSettings/Layouts/default-2021.dwlt | 60 +- 4 files changed, 713 insertions(+), 106 deletions(-) diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 62011de..0e9379c 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -3657,50 +3657,100 @@ MonoBehaviour: - {fileID: 1326456196} - {fileID: 144640423} - {fileID: 833259107} + oneoneCollider: + - {fileID: 416499492} + - {fileID: 1541006005} + - {fileID: 2013586993} twoone: - {fileID: 1201900458} - {fileID: 605592371} - {fileID: 1216668348} + twooneCollider: + - {fileID: 1624401003} + - {fileID: 1022299900} + - {fileID: 482097724} threeone: - {fileID: 1557522799} - {fileID: 494324061} - {fileID: 169295795} + threeoneCollider: + - {fileID: 508890158} + - {fileID: 1982496777} + - {fileID: 1374165778} onetwo: - {fileID: 325852436} - {fileID: 2139851218} - {fileID: 1429282887} + onetwoCollider: + - {fileID: 893820169} + - {fileID: 1328647951} + - {fileID: 236305771} twotwo: - {fileID: 181786101} - {fileID: 1323862075} - {fileID: 2084459196} + twotwoCollider: + - {fileID: 1615015558} + - {fileID: 1954876564} + - {fileID: 974343173} threetwo: - {fileID: 1677562173} - {fileID: 1084869153} - {fileID: 473458443} + threetwoCollider: + - {fileID: 1297498738} + - {fileID: 293544120} + - {fileID: 2137211082} onethree: - {fileID: 280090609} - {fileID: 1647177067} - {fileID: 1995086240} + onethreeCollider: + - {fileID: 706540132} + - {fileID: 683300588} + - {fileID: 1397901026} twothree: - {fileID: 2107810768} - {fileID: 2141320755} - {fileID: 720969165} + twothreeCollider: + - {fileID: 798647103} + - {fileID: 430026346} + - {fileID: 1570926430} threethree: - {fileID: 1374738211} - {fileID: 815573860} - {fileID: 1962024232} + threethreeCollider: + - {fileID: 1564652874} + - {fileID: 788057597} + - {fileID: 1002673360} onefour: - {fileID: 694600666} - {fileID: 2026770335} - {fileID: 1872052770} + onefourCollider: + - {fileID: 542154673} + - {fileID: 1678558476} + - {fileID: 421286395} twofour: - {fileID: 981449535} - {fileID: 716950397} - {fileID: 1347432663} + twofourCollider: + - {fileID: 1971118424} + - {fileID: 190452685} + - {fileID: 922632583} threefour: - {fileID: 939451652} - {fileID: 1965172624} - {fileID: 1054331718} + threefourCollider: + - {fileID: 1157172197} + - {fileID: 753661018} + - {fileID: 1240172719} + canKill: 0 + maincamera: {fileID: 519420031} --- !u!1 &229807670 GameObject: m_ObjectHideFlags: 0 @@ -6768,9 +6818,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 197904230} - m_TargetAssemblyTypeName: Elet, Assembly-CSharp - m_MethodName: Eletvesztes + - m_Target: {fileID: 197904235} + m_TargetAssemblyTypeName: Ugynok, Assembly-CSharp + m_MethodName: setCanKillTrue m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scripts/Ugynok.cs b/Assets/Scripts/Ugynok.cs index 1c453c0..1ca1a08 100644 --- a/Assets/Scripts/Ugynok.cs +++ b/Assets/Scripts/Ugynok.cs @@ -6,19 +6,39 @@ using TMPro; public class Ugynok : MonoBehaviour { public TMP_Text[] oneone; + public BoxCollider2D[] oneoneCollider; public TMP_Text[] twoone; + public BoxCollider2D[] twooneCollider; public TMP_Text[] threeone; + public BoxCollider2D[] threeoneCollider; public TMP_Text[] onetwo; + public BoxCollider2D[] onetwoCollider; public TMP_Text[] twotwo; + public BoxCollider2D[] twotwoCollider; public TMP_Text[] threetwo; + public BoxCollider2D[] threetwoCollider; public TMP_Text[] onethree; + public BoxCollider2D[] onethreeCollider; public TMP_Text[] twothree; + public BoxCollider2D[] twothreeCollider; public TMP_Text[] threethree; + public BoxCollider2D[] threethreeCollider; public TMP_Text[] onefour; + public BoxCollider2D[] onefourCollider; public TMP_Text[] twofour; + public BoxCollider2D[] twofourCollider; public TMP_Text[] threefour; + public BoxCollider2D[] threefourCollider; - private void Start() { + public bool canKill = false; + public void setCanKillTrue() + { + canKill = true; + } + public Camera maincamera; + + private void Start() + { for (int i = 0; i < oneone.Length; i++) { oneone[i].text = ""; @@ -69,104 +89,641 @@ public class Ugynok : MonoBehaviour { threefour[i].text = ""; } - + } - public void UgynokSorsolas(int x, int y) { - if (x == 1 && y == 1) { - if (oneone[0].text.Equals("")) { + private void Update() + { + if (canKill) + { + //check for collider onclick then x out tmp text then set canKill false + //check if text field is empty + //oneone + if (Input.GetKeyDown(KeyCode.Mouse0) && oneoneCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!oneone[0].text.Equals("")) + { + oneone[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && oneoneCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!oneone[1].text.Equals("")) + { + oneone[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && oneoneCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!oneone[2].text.Equals("")) + { + oneone[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //onetwo + if (Input.GetKeyDown(KeyCode.Mouse0) && onetwoCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onetwo[0].text.Equals("")) + { + onetwo[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onetwoCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onetwo[1].text.Equals("")) + { + onetwo[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onetwoCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onetwo[2].text.Equals("")) + { + onetwo[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //onethree + if (Input.GetKeyDown(KeyCode.Mouse0) && onethreeCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onethree[0].text.Equals("")) + { + onethree[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onethreeCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onethree[1].text.Equals("")) + { + onethree[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onethreeCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onethree[2].text.Equals("")) + { + onethree[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //onefour + if (Input.GetKeyDown(KeyCode.Mouse0) && onefourCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onefour[0].text.Equals("")) + { + onefour[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onefourCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onefour[1].text.Equals("")) + { + onefour[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onefourCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onefour[2].text.Equals("")) + { + onefour[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //twoone + if (Input.GetKeyDown(KeyCode.Mouse0) && twooneCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twoone[0].text.Equals("")) + { + twoone[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twooneCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twoone[1].text.Equals("")) + { + twoone[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twooneCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twoone[2].text.Equals("")) + { + twoone[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //twotwo + if (Input.GetKeyDown(KeyCode.Mouse0) && twotwoCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twotwo[0].text.Equals("")) + { + twotwo[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twotwoCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twotwo[1].text.Equals("")) + { + twotwo[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twotwoCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twotwo[2].text.Equals("")) + { + twotwo[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //twothree + if (Input.GetKeyDown(KeyCode.Mouse0) && twothreeCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twothree[0].text.Equals("")) + { + twothree[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twothreeCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twothree[1].text.Equals("")) + { + twothree[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twothreeCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twothree[2].text.Equals("")) + { + twothree[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //twofour + if (Input.GetKeyDown(KeyCode.Mouse0) && twofourCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twofour[0].text.Equals("")) + { + twofour[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twofourCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twofour[1].text.Equals("")) + { + twofour[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twofourCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twofour[2].text.Equals("")) + { + twofour[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //threeone + if (Input.GetKeyDown(KeyCode.Mouse0) && threeoneCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threeone[0].text.Equals("")) + { + threeone[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threeoneCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threeone[1].text.Equals("")) + { + threeone[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threeoneCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threeone[2].text.Equals("")) + { + threeone[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //threetwo + if (Input.GetKeyDown(KeyCode.Mouse0) && threetwoCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threetwo[0].text.Equals("")) + { + threetwo[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threetwoCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threetwo[1].text.Equals("")) + { + threetwo[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threetwoCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threetwo[2].text.Equals("")) + { + threetwo[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //threethree + if (Input.GetKeyDown(KeyCode.Mouse0) && threethreeCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threethree[0].text.Equals("")) + { + threethree[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threethreeCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threethree[1].text.Equals("")) + { + threethree[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threethreeCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threethree[2].text.Equals("")) + { + threethree[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //threefour + if (Input.GetKeyDown(KeyCode.Mouse0) && threefourCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threefour[0].text.Equals("")) + { + threefour[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threefourCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threefour[1].text.Equals("")) + { + threefour[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threefourCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threefour[2].text.Equals("")) + { + threefour[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + } + } + + public void UgynokSorsolas(int x, int y) + { + if (x == 1 && y == 1) + { + if (oneone[0].text.Equals("")) + { oneone[0].text = UnityEngine.Random.Range(1, 7).ToString(); - }else if (oneone[1].text.Equals("")) { + } + else if (oneone[1].text.Equals("")) + { oneone[1].text = UnityEngine.Random.Range(1, 7).ToString(); - }else if (oneone[2].text.Equals("")) { + } + else if (oneone[2].text.Equals("")) + { oneone[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 1 && y == 2) { - if (onetwo[0].text.Equals("")) { + } + else if (x == 1 && y == 2) + { + if (onetwo[0].text.Equals("")) + { onetwo[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onetwo[1].text.Equals("")) { + } + else if (onetwo[1].text.Equals("")) + { onetwo[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onetwo[2].text.Equals("")) { + } + else if (onetwo[2].text.Equals("")) + { onetwo[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 1 && y == 3) { - if (onethree[0].text.Equals("")) { + } + else if (x == 1 && y == 3) + { + if (onethree[0].text.Equals("")) + { onethree[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onethree[1].text.Equals("")) { + } + else if (onethree[1].text.Equals("")) + { onethree[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onethree[2].text.Equals("")) { + } + else if (onethree[2].text.Equals("")) + { onethree[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 1 && y == 4) { - if (onefour[0].text.Equals("")) { + } + else if (x == 1 && y == 4) + { + if (onefour[0].text.Equals("")) + { onefour[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onefour[1].text.Equals("")) { + } + else if (onefour[1].text.Equals("")) + { onefour[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onefour[2].text.Equals("")) { + } + else if (onefour[2].text.Equals("")) + { onefour[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 2 && y == 1) { - if (twoone[0].text.Equals("")) { + } + else if (x == 2 && y == 1) + { + if (twoone[0].text.Equals("")) + { twoone[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twoone[1].text.Equals("")) { + } + else if (twoone[1].text.Equals("")) + { twoone[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twoone[2].text.Equals("")) { + } + else if (twoone[2].text.Equals("")) + { twoone[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 2 && y == 2) { - if (twotwo[0].text.Equals("")) { + } + else if (x == 2 && y == 2) + { + if (twotwo[0].text.Equals("")) + { twotwo[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twotwo[1].text.Equals("")) { + } + else if (twotwo[1].text.Equals("")) + { twotwo[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twotwo[2].text.Equals("")) { + } + else if (twotwo[2].text.Equals("")) + { twotwo[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 2 && y == 3) { - if (twothree[0].text.Equals("")) { + } + else if (x == 2 && y == 3) + { + if (twothree[0].text.Equals("")) + { twothree[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twothree[1].text.Equals("")) { + } + else if (twothree[1].text.Equals("")) + { twothree[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twothree[2].text.Equals("")) { + } + else if (twothree[2].text.Equals("")) + { twothree[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 2 && y == 4) { - if (twofour[0].text.Equals("")) { + } + else if (x == 2 && y == 4) + { + if (twofour[0].text.Equals("")) + { twofour[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twofour[1].text.Equals("")) { + } + else if (twofour[1].text.Equals("")) + { twofour[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twofour[2].text.Equals("")) { + } + else if (twofour[2].text.Equals("")) + { twofour[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 3 && y == 1) { - if (threeone[0].text.Equals("")) { + } + else if (x == 3 && y == 1) + { + if (threeone[0].text.Equals("")) + { threeone[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threeone[1].text.Equals("")) { + } + else if (threeone[1].text.Equals("")) + { threeone[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threeone[2].text.Equals("")) { + } + else if (threeone[2].text.Equals("")) + { threeone[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 3 && y == 2) { - if (threetwo[0].text.Equals("")) { + } + else if (x == 3 && y == 2) + { + if (threetwo[0].text.Equals("")) + { threetwo[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threetwo[1].text.Equals("")) { + } + else if (threetwo[1].text.Equals("")) + { threetwo[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threetwo[2].text.Equals("")) { + } + else if (threetwo[2].text.Equals("")) + { threetwo[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 3 && y == 3) { - if (threethree[0].text.Equals("")) { + } + else if (x == 3 && y == 3) + { + if (threethree[0].text.Equals("")) + { threethree[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threethree[1].text.Equals("")) { + } + else if (threethree[1].text.Equals("")) + { threethree[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threethree[2].text.Equals("")) { + } + else if (threethree[2].text.Equals("")) + { threethree[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 3 && y == 4) { - if (threefour[0].text.Equals("")) { + } + else if (x == 3 && y == 4) + { + if (threefour[0].text.Equals("")) + { threefour[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threefour[1].text.Equals("")) { + } + else if (threefour[1].text.Equals("")) + { threefour[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threefour[2].text.Equals("")) { + } + else if (threefour[2].text.Equals("")) + { threefour[2].text = UnityEngine.Random.Range(1, 7).ToString(); } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 23fa33d..d066ac8 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 1511 + controlID: 3990 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 1512 + controlID: 3991 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 1513 + controlID: 3963 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e8f1ffff22fbffff + m_ExpandedIDs: 2afbffffcc6b0000ea6b0000fa6b0000986c0000e06c0000766d0000a86d00001a6e0000686e0000826e0000966e0000106f0000266f0000dc6f000044700000bc700000d47000005a71000074710000e0710000e8710000107200003a720000a672000034730000da73000008740000f67400005c7500007e750000b2750000d47500001476000024760000427600004a760000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -269,8 +269,8 @@ MonoBehaviour: y: 0 width: 1154 height: 555 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 2.9719262, y: -0.14416061, z: -0.024618205} + m_Target: {x: -6.49345, y: -0.15270035, z: -0.25521368} speed: 2 - m_Value: {x: 2.9719262, y: -0.14416061, z: -0.024618205} + m_Value: {x: -6.49345, y: -0.15270035, z: -0.25521368} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.46182 + m_Target: 11.7815 speed: 2 - m_Value: 12.46182 + m_Value: 11.7815 m_Ortho: m_Target: 1 speed: 2 @@ -647,7 +647,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -656,14 +656,14 @@ MonoBehaviour: y: 555 width: 1422 height: 392 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 10} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 11} m_Panes: - {fileID: 10} - {fileID: 11} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -718,9 +718,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 88770000 - m_LastClickedID: 30600 - m_ExpandedIDs: 00000000647700006677000068770000 + m_SelectedIDs: 3e780000 + m_LastClickedID: 30782 + m_ExpandedIDs: 00000000307800003278000034780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -748,7 +748,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000647700006677000068770000 + m_ExpandedIDs: 00000000307800003278000034780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -825,9 +825,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 564 + y: 628 width: 1421 - height: 435 + height: 371 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 7f480cb..83eb9e2 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -73,7 +73,7 @@ MonoBehaviour: height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: MyLayout + m_LastLoadedLayoutName: --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 1763 + controlID: 4318 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 1764 + controlID: 4319 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 1765 + controlID: 4320 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -206,7 +206,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -215,14 +215,14 @@ MonoBehaviour: y: 0 width: 1154 height: 555 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,8 +269,8 @@ MonoBehaviour: y: 0 width: 498 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -401,21 +401,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: f2afffff94b0ffff66b2ffff70b2ffffaeb6ffff50b7ffff22b9ffff2cb9ffffacbdffff52befffff6c1ffff14c2ffffe8f1ffff22fbffffa26b00003e730000fc73000064750000322a0100662a0100962a0100b42a0100c42a0100562b0100982b0100aa2b01001c2c0100482c0100ae2c0100f62c01000a2d01001e2d0100862d01009c2d0100462e0100a82e0100142f01002c2f0100542f0100702f0100ac2f0100c62f0100e42f0100f02f0100263001002e300100363001005030010074300100ac300100da30010062310100c6310100f0310100023201001e3201008a320100c0320100fa32010002330100063301006633010088330100b0330100cc3301000c3401001c34010024340100343401003c340100 + m_ExpandedIDs: 2afbffffcc6b0000ea6b0000fa6b0000986c0000e06c0000766d0000a86d00001a6e0000686e0000826e0000966e0000106f0000266f0000dc6f000044700000bc700000d47000005a71000074710000e0710000e8710000107200003a720000a672000034730000da73000008740000f67400005c7500007e750000b2750000d47500001476000024760000427600004a760000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Collider (32) - m_OriginalName: Collider (32) + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -29074 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 4 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -705,9 +705,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -8.318136, y: 2.1353097, z: -0.048845626} + m_Target: {x: -6.49345, y: -0.15270035, z: -0.25521368} speed: 2 - m_Value: {x: -8.318136, y: 2.1353097, z: -0.048845626} + m_Value: {x: -6.49345, y: -0.15270035, z: -0.25521368} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -758,9 +758,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 11.891162 + m_Target: 11.7815 speed: 2 - m_Value: 11.891162 + m_Value: 11.7815 m_Ortho: m_Target: 1 speed: 2 @@ -826,22 +826,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 88 m_LastFolders: - - Assets/Scripts + - Assets m_LastFoldersGridSize: 88 m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 88770000 - m_LastClickedID: 30600 - m_ExpandedIDs: 00000000647700006677000068770000 + m_SelectedIDs: 30780000 + m_LastClickedID: 30768 + m_ExpandedIDs: 00000000307800003278000034780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000647700006677000068770000 + m_ExpandedIDs: 00000000307800003278000034780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -896,7 +896,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -946,9 +946,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 564 + y: 628 width: 1421 - height: 435 + height: 371 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default From 1cdcca2106843c652343e6cb0fdcf33989e6a64c Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Sun, 22 Jan 2023 17:33:32 +0100 Subject: [PATCH 6/8] update --- UserSettings/Layouts/default-2021.dwlt | 210 ++++++++++++++---- .../armeabi-v7a/lib_burst_generated.txt | 189 ---------------- 2 files changed, 167 insertions(+), 232 deletions(-) delete mode 100644 build android/fts_BurstDebugInformation_DoNotShip/tempburstlibs/armeabi-v7a/lib_burst_generated.txt diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 83eb9e2..4ecbf3e 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -1,6 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 674 + y: 202 + width: 640 + height: 601 + m_ShowMode: 0 + m_Title: Build Settings + m_RootView: {fileID: 4} + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + m_Maximized: 0 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -20,11 +44,61 @@ MonoBehaviour: height: 997 m_ShowMode: 4 m_Title: Hierarchy - m_RootView: {fileID: 2} + m_RootView: {fileID: 5} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &2 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: BuildPlayerWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 640 + height: 601 + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 640 + height: 601 + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + vertical: 0 + controlID: 126 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,9 +111,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - - {fileID: 4} + - {fileID: 6} + - {fileID: 8} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 @@ -52,7 +126,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -74,7 +148,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -95,7 +169,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -108,8 +182,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 11} + - {fileID: 9} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 @@ -119,8 +193,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 4318 ---- !u!114 &6 + controlID: 92 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -133,8 +207,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - {fileID: 10} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 @@ -144,8 +218,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 4319 ---- !u!114 &7 + controlID: 93 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -158,8 +232,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 9} + - {fileID: 11} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 @@ -169,8 +243,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 4320 ---- !u!114 &8 + controlID: 94 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -191,12 +265,12 @@ MonoBehaviour: height: 555 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 13} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -217,13 +291,13 @@ MonoBehaviour: height: 555 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 14} - - {fileID: 12} + - {fileID: 18} + - {fileID: 16} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -244,13 +318,13 @@ MonoBehaviour: height: 392 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 15} - - {fileID: 16} + - {fileID: 19} + - {fileID: 20} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &11 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -271,12 +345,62 @@ MonoBehaviour: height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 17} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 640, y: 580} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Build Settings + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 674 + y: 202 + width: 640 + height: 580 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -368,7 +492,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &13 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -401,7 +525,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2afbffffcc6b0000ea6b0000fa6b0000986c0000e06c0000766d0000a86d00001a6e0000686e0000826e0000966e0000106f0000266f0000dc6f000044700000bc700000d47000005a71000074710000e0710000e8710000107200003a720000a672000034730000da73000008740000f67400005c7500007e750000b2750000d47500001476000024760000427600004a760000 + m_ExpandedIDs: a0f3ffff1ef4ffffc2f7ffffe0f7ffff2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -417,7 +541,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 11} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -425,7 +549,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &14 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -785,7 +909,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &15 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -857,7 +981,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 13} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -896,7 +1020,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -913,7 +1037,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 13} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -925,7 +1049,7 @@ MonoBehaviour: m_GridSize: 88 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 ---- !u!114 &16 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -953,7 +1077,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &17 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} diff --git a/build android/fts_BurstDebugInformation_DoNotShip/tempburstlibs/armeabi-v7a/lib_burst_generated.txt b/build android/fts_BurstDebugInformation_DoNotShip/tempburstlibs/armeabi-v7a/lib_burst_generated.txt deleted file mode 100644 index 2bae11a..0000000 --- a/build android/fts_BurstDebugInformation_DoNotShip/tempburstlibs/armeabi-v7a/lib_burst_generated.txt +++ /dev/null @@ -1,189 +0,0 @@ -Library: lib_burst_generated ---platform=Android ---backend=burst-llvm-12 ---target=ARMV7A_NEON32 ---global-safety-checks-setting=Off ---dump=Function ---float-precision=Standard ---disable-warnings=BC1370 ---compilation-defines=UNITY_2021_3_12 ---compilation-defines=UNITY_2021_3 ---compilation-defines=UNITY_2021 ---compilation-defines=UNITY_5_3_OR_NEWER ---compilation-defines=UNITY_5_4_OR_NEWER ---compilation-defines=UNITY_5_5_OR_NEWER ---compilation-defines=UNITY_5_6_OR_NEWER ---compilation-defines=UNITY_2017_1_OR_NEWER ---compilation-defines=UNITY_2017_2_OR_NEWER ---compilation-defines=UNITY_2017_3_OR_NEWER ---compilation-defines=UNITY_2017_4_OR_NEWER ---compilation-defines=UNITY_2018_1_OR_NEWER ---compilation-defines=UNITY_2018_2_OR_NEWER ---compilation-defines=UNITY_2018_3_OR_NEWER ---compilation-defines=UNITY_2018_4_OR_NEWER ---compilation-defines=UNITY_2019_1_OR_NEWER ---compilation-defines=UNITY_2019_2_OR_NEWER ---compilation-defines=UNITY_2019_3_OR_NEWER ---compilation-defines=UNITY_2019_4_OR_NEWER ---compilation-defines=UNITY_2020_1_OR_NEWER ---compilation-defines=UNITY_2020_2_OR_NEWER ---compilation-defines=UNITY_2020_3_OR_NEWER ---compilation-defines=UNITY_2021_1_OR_NEWER ---compilation-defines=UNITY_2021_2_OR_NEWER ---compilation-defines=UNITY_2021_3_OR_NEWER ---compilation-defines=USE_SEARCH_ENGINE_API ---compilation-defines=USE_SEARCH_TABLE ---compilation-defines=USE_SEARCH_MODULE ---compilation-defines=USE_PROPERTY_DATABASE ---compilation-defines=USE_SEARCH_EXTENSION_API ---compilation-defines=SCENE_TEMPLATE_MODULE ---compilation-defines=ENABLE_AR ---compilation-defines=ENABLE_AUDIO ---compilation-defines=ENABLE_CACHING ---compilation-defines=ENABLE_CLOTH ---compilation-defines=ENABLE_EVENT_QUEUE ---compilation-defines=ENABLE_MICROPHONE ---compilation-defines=ENABLE_MULTIPLE_DISPLAYS ---compilation-defines=ENABLE_PHYSICS ---compilation-defines=ENABLE_TEXTURE_STREAMING ---compilation-defines=ENABLE_UNET ---compilation-defines=ENABLE_LZMA ---compilation-defines=ENABLE_UNITYEVENTS ---compilation-defines=ENABLE_VR ---compilation-defines=ENABLE_WEBCAM ---compilation-defines=ENABLE_UNITYWEBREQUEST ---compilation-defines=ENABLE_WWW ---compilation-defines=ENABLE_CLOUD_SERVICES ---compilation-defines=ENABLE_CLOUD_SERVICES_COLLAB ---compilation-defines=ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS ---compilation-defines=ENABLE_CLOUD_SERVICES_ADS ---compilation-defines=ENABLE_CLOUD_SERVICES_USE_WEBREQUEST ---compilation-defines=ENABLE_CLOUD_SERVICES_CRASH_REPORTING ---compilation-defines=ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING ---compilation-defines=ENABLE_CLOUD_SERVICES_PURCHASING ---compilation-defines=ENABLE_CLOUD_SERVICES_ANALYTICS ---compilation-defines=ENABLE_CLOUD_SERVICES_UNET ---compilation-defines=ENABLE_CLOUD_SERVICES_BUILD ---compilation-defines=ENABLE_CLOUD_LICENSE ---compilation-defines=ENABLE_EDITOR_HUB_LICENSE ---compilation-defines=ENABLE_WEBSOCKET_CLIENT ---compilation-defines=ENABLE_DIRECTOR_AUDIO ---compilation-defines=ENABLE_DIRECTOR_TEXTURE ---compilation-defines=ENABLE_MANAGED_JOBS ---compilation-defines=ENABLE_MANAGED_TRANSFORM_JOBS ---compilation-defines=ENABLE_MANAGED_ANIMATION_JOBS ---compilation-defines=ENABLE_MANAGED_AUDIO_JOBS ---compilation-defines=ENABLE_RUNTIME_PERMISSIONS ---compilation-defines=ENABLE_ENGINE_CODE_STRIPPING ---compilation-defines=ENABLE_ONSCREEN_KEYBOARD ---compilation-defines=ENABLE_MANAGED_UNITYTLS ---compilation-defines=INCLUDE_DYNAMIC_GI ---compilation-defines=ENABLE_SCRIPTING_GC_WBARRIERS ---compilation-defines=PLATFORM_SUPPORTS_MONO ---compilation-defines=ENABLE_VIDEO ---compilation-defines=ENABLE_ACCELERATOR_CLIENT_DEBUGGING ---compilation-defines=PLATFORM_ANDROID ---compilation-defines=TEXTCORE_1_0_OR_NEWER ---compilation-defines=UNITY_ANDROID ---compilation-defines=UNITY_ANDROID_API ---compilation-defines=ENABLE_EGL ---compilation-defines=ENABLE_NETWORK ---compilation-defines=ENABLE_RUNTIME_GI ---compilation-defines=ENABLE_CRUNCH_TEXTURE_COMPRESSION ---compilation-defines=UNITY_CAN_SHOW_SPLASH_SCREEN ---compilation-defines=UNITY_HAS_GOOGLEVR ---compilation-defines=UNITY_HAS_TANGO ---compilation-defines=ENABLE_SPATIALTRACKING ---compilation-defines=ENABLE_ETC_COMPRESSION ---compilation-defines=PLATFORM_EXTENDS_VULKAN_DEVICE ---compilation-defines=PLATFORM_HAS_MULTIPLE_SWAPCHAINS ---compilation-defines=UNITY_ANDROID_SUPPORTS_SHADOWFILES ---compilation-defines=PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP ---compilation-defines=ENABLE_UNITYADS_RUNTIME ---compilation-defines=UNITY_UNITYADS_API ---compilation-defines=ENABLE_MONO ---compilation-defines=NET_STANDARD_2_0 ---compilation-defines=NET_STANDARD ---compilation-defines=NET_STANDARD_2_1 ---compilation-defines=NETSTANDARD ---compilation-defines=NETSTANDARD2_1 ---compilation-defines=ENABLE_CUSTOM_RENDER_TEXTURE ---compilation-defines=ENABLE_DIRECTOR ---compilation-defines=ENABLE_LOCALIZATION ---compilation-defines=ENABLE_SPRITES ---compilation-defines=ENABLE_TERRAIN ---compilation-defines=ENABLE_TILEMAP ---compilation-defines=ENABLE_TIMELINE ---compilation-defines=ENABLE_LEGACY_INPUT_MANAGER ---compilation-defines=PACKAGE_PHYSICS ---compilation-defines=PACKAGE_PHYSICS2D ---compilation-defines=PACKAGE_TILEMAP ---compilation-defines=PACKAGE_ANIMATION ---compilation-defines=PACKAGE_UITOOLKIT ---compilation-defines=CSHARP_7_OR_LATER ---compilation-defines=CSHARP_7_3_OR_NEWER ---compilation-defines=ENABLE_VR_MODULE ---compilation-defines=ENABLE_XR_MODULE ---compilation-defines=MODULE_AI_EXISTS ---compilation-defines=MODULE_ANIMATION_EXISTS ---compilation-defines=MODULE_PHYSICS_EXISTS ---compilation-defines=MODULE_PHYSICS_2D_EXISTS ---compilation-defines=MODULE_PARTICLE_SYSTEM_EXISTS ---compilation-defines=ENABLE_BURST_1_0_0_OR_NEWER ---compilation-defines=USING_ANIMATION_MODULE ---compilation-defines=USING_PHYSICS2D_MODULE ---compilation-defines=ENABLE_ANIMATION_BURST ---compilation-defines=TIMELINE_FRAMEACCURATE ---compilation-defines=ENABLE_SPRITESHAPE_BURST ---generate-link-xml=Temp\burst.link.xml ---output=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\tempburstlibs\armeabi-v7a\lib_burst_generated ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\UnityEngine.UI.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.Core.Runtime.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.VisualScripting.Flow.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Mathematics.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Telemetry.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.VisualScripting.State.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.VisualScripting.Core.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.Universal.Runtime.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Environments.Internal.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Burst.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.Animation.Runtime.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.TextMeshPro.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Timeline.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipeline.Universal.ShaderLibrary.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Environments.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Internal.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Analytics.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.SpriteShape.Runtime.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Scheduler.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Registration.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.PixelPerfect.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.Common.Runtime.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.IK.Runtime.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Device.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Threading.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.2D.Tilemap.Extras.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Networking.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Assembly-CSharp.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.Core.ShaderLibrary.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.InternalAPIEngineBridge.001.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.Services.Core.Configuration.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.Universal.Shaders.dll ---root-assembly=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll ---assembly-folder=C:\dev\find the source\projekt\FindTheSource\Temp\StagingArea\Data\Managed\ ---pdb-search-paths=Temp/ManagedSymbols/ ---method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.VisibleLight, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.VisibleLight, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--b04c75a68edf1d166f6547f2ea0e8928 ---method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.Universal.LightMinMaxZ, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.ReorderJob`1[[UnityEngine.Rendering.Universal.LightMinMaxZ, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--e943843acfb78f5f2f3716a6553740d9 ---method=Unity.Burst.BurstCompiler+BurstCompilerHelper, Unity.Burst, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::IsBurstEnabled()--8c2be93e18276203cbd918daa2748a10 ---method=UnityEngine.U2D.Animation.BurstedSpriteSkinUtilities, Unity.2D.Animation.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::ValidateBoneWeights(Unity.Collections.NativeSlice`1[[UnityEngine.BoneWeight, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--5bf0a813706ef9287fcaa55dd0ccb876 ---method=Unity.Jobs.IJobExtensions+JobStruct`1[[UnityEngine.Rendering.Universal.RadixSortJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.RadixSortJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--26c6d10914da2fc98755b3533c59141e ---method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.SliceCombineJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.SliceCombineJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--e046a1595d0148509657ed4dbcb52a86 ---method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.SliceCullingJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.SliceCullingJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--1998da082e6413092f0e7bcd5a0e9331 ---method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.ZBinningJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.ZBinningJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--77fc393cb521ac129b1392d4eb94d29a ---method=Unity.Jobs.IJobExtensions+JobStruct`1[[UnityEngine.Rendering.Universal.DecalCreateDrawCallSystem+DrawCallJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.DecalCreateDrawCallSystem+DrawCallJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--aa309157da5950aa53ed6075709e6e40 ---method=UnityEngine.Jobs.IJobParallelForTransformExtensions+TransformParallelForLoopStruct`1[[UnityEngine.Rendering.Universal.DecalUpdateCachedSystem+UpdateTransformsJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.DecalUpdateCachedSystem+UpdateTransformsJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--670478f3fb3f285eeace534fbe61a03e ---method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.LightExtractionJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.LightExtractionJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--34e8fec66b799db60cf2f2f751c3bdd9 ---method=Unity.Jobs.IJobForExtensions+ForJobStruct`1[[UnityEngine.Rendering.Universal.MinMaxZJob, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.Rendering.Universal.MinMaxZJob&, Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--d23a07cb3c3f217121d5bf94e76674f0 ---method=Unity.Jobs.IJobExtensions+JobStruct`1[[UnityEngine.U2D.SpriteShapeGenerator, Unity.2D.SpriteShape.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null::Execute(UnityEngine.U2D.SpriteShapeGenerator&, Unity.2D.SpriteShape.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|System.IntPtr, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089|Unity.Jobs.LowLevel.Unsafe.JobRanges&, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null|System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089)--a185c62eba2497c95197140e5282b27a - From 02dd8a4076d995d022ccb07b43718f703e767314 Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Mon, 23 Jan 2023 13:03:35 +0100 Subject: [PATCH 7/8] targyak, movement, ugynok update --- Assets/Scripts/Akciok.cs | 6 +- Assets/Scripts/Targyak.cs | 22 +- Assets/Scripts/Ugynok.cs | 7 + Assets/Scripts/helyszinaktivalas.cs | 5 +- Assets/Scripts/movement.cs | 1042 ++++++++++++----- .../Layouts/CurrentMaximizeLayout.dwlt | 148 +-- UserSettings/Layouts/default-2021.dwlt | 344 ++---- 7 files changed, 988 insertions(+), 586 deletions(-) diff --git a/Assets/Scripts/Akciok.cs b/Assets/Scripts/Akciok.cs index 37e7893..4af054a 100644 --- a/Assets/Scripts/Akciok.cs +++ b/Assets/Scripts/Akciok.cs @@ -79,11 +79,11 @@ public class Akciok : MonoBehaviour } } - public void Loves(int elhasznalt_toltenyek) { + public bool Loves(int elhasznalt_toltenyek) { if (felhasznalt_tolteny < betarazott_tolteny) { if (felhasznalt_tolteny + elhasznalt_toltenyek > betarazott_tolteny) { Debug.Log("Nincs eleg tolteny betarazva, tul sok lenne egyszerre felhasznalva!"); - return; + return false; } else { felhasznalt_tolteny += elhasznalt_toltenyek; for (int i = 0; i < felhasznalt_tolteny; i++) { @@ -91,8 +91,10 @@ public class Akciok : MonoBehaviour } betarazott_tolteny -= elhasznalt_toltenyek; } + return true; } else { Debug.Log("Nincs eleg tolteny"); + return false; } } diff --git a/Assets/Scripts/Targyak.cs b/Assets/Scripts/Targyak.cs index 157efab..fe401a8 100644 --- a/Assets/Scripts/Targyak.cs +++ b/Assets/Scripts/Targyak.cs @@ -9,6 +9,7 @@ public class Targyak : MonoBehaviour private Akciopont akciopont; private movement movement; private Energia energia; + private Ugynok ugynok; public int targy_szamlalo = 0; public int adrenalinloket = 0; @@ -17,6 +18,7 @@ public class Targyak : MonoBehaviour public int droidgepagyu = 0; public int matavtaviranyito = 0; public int fustgranat = 0; + public bool lathatatlanOltozetAktivalva = false; private void Start() { akciok = FindObjectOfType(); @@ -24,6 +26,7 @@ public class Targyak : MonoBehaviour akciopont = FindObjectOfType(); movement = FindObjectOfType(); energia = FindObjectOfType(); + ugynok = FindObjectOfType(); } public void RandomTargy() @@ -32,32 +35,32 @@ public class Targyak : MonoBehaviour if (randomszam == 0) { adrenalinloket++; - Debug.Log("Kaptál egy AdrenalinLöketet!"); + Debug.Log("Kaptal egy AdrenalinLoketet!"); } else if (randomszam == 1) { hackercsatlakozo++; - Debug.Log("Kaptál egy Hacker Csatlakozót!"); + Debug.Log("Kaptal egy Hacker Csatlakozot!"); } else if (randomszam == 2) { lathatatlanoltozet++; - Debug.Log("Kaptál egy Láthatatlan Öltözetet!"); + Debug.Log("Kaptal egy Lathatatlan oltozetet!"); } else if (randomszam == 3) { droidgepagyu++; - Debug.Log("Kaptál egy Droid-X2 Gépágyút!"); + Debug.Log("Kaptal egy Droid-X2 Gepagyut!"); } else if (randomszam == 4) { matavtaviranyito++; - Debug.Log("Kaptál egy Mata'v Távirányítót!"); + Debug.Log("Kaptal egy Matav Taviranyitot!"); } else if (randomszam == 5) { fustgranat++; - Debug.Log("Kaptál egy Álomhozó Füstgránátot!"); + Debug.Log("Kaptal egy Alomhozo Fustgranatot!"); } } @@ -65,7 +68,7 @@ public class Targyak : MonoBehaviour targy_szamlalo++; } - public void HackerCsatlakozo() { //Hogyan kell aktivalni? + public void HackerCsatlakozo() { //+2 tolteny akciok.Betarazas(2); //+1 elet @@ -76,12 +79,15 @@ public class Targyak : MonoBehaviour } public void LathatatlanOltozek() { - movement.mozgasHelyre(2, 2); //megadni inkabb a hely nevet ahova menni akar? | input field es nev megadas + //movement.mozgasHelyre(2, 2); //megadni inkabb a hely nevet ahova menni akar? | input field es nev megadas + lathatatlanOltozetAktivalva = true; targy_szamlalo++; } public void DroidGepagyu() { targy_szamlalo++; + //ugynok cucc + ugynok.canKill = true; //barhol meg tud olni ha kattint } public void MatavTaviranyito() { diff --git a/Assets/Scripts/Ugynok.cs b/Assets/Scripts/Ugynok.cs index 1ca1a08..a6aec8a 100644 --- a/Assets/Scripts/Ugynok.cs +++ b/Assets/Scripts/Ugynok.cs @@ -31,6 +31,7 @@ public class Ugynok : MonoBehaviour public BoxCollider2D[] threefourCollider; public bool canKill = false; + public bool canShoot = false; //harchoz bool public void setCanKillTrue() { canKill = true; @@ -94,6 +95,12 @@ public class Ugynok : MonoBehaviour private void Update() { + if(canShoot){ + if(oneone[0].text.Equals("")){ + + } + } + if (canKill) { //check for collider onclick then x out tmp text then set canKill false diff --git a/Assets/Scripts/helyszinaktivalas.cs b/Assets/Scripts/helyszinaktivalas.cs index 6e6e0b6..1852883 100644 --- a/Assets/Scripts/helyszinaktivalas.cs +++ b/Assets/Scripts/helyszinaktivalas.cs @@ -13,9 +13,9 @@ public class helyszinaktivalas : MonoBehaviour private Upgrade upgrade; private Akciopont akciopont; private movement movement; + private Ugynok ugynok; bool canUpgrade = false; - public bool canKill = false; private int diceResult; public Sprite[] diceSides = new Sprite[6]; public SpriteRenderer hely1; @@ -29,6 +29,7 @@ public class helyszinaktivalas : MonoBehaviour targyak = FindObjectOfType(); akciok = FindObjectOfType(); elet = FindObjectOfType(); + ugynok = FindObjectOfType(); } public void HelyszinAktivalas() @@ -37,7 +38,7 @@ public class helyszinaktivalas : MonoBehaviour if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 1) { //ugynokcsapat oles barhol tolteny nelkul - canKill = true; //megolhetunk egy csapatot + ugynok.canKill = true; //megolhetunk egy csapatot } //2-es mez� -- K�SZ if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 1) diff --git a/Assets/Scripts/movement.cs b/Assets/Scripts/movement.cs index d231d86..e55dd87 100644 --- a/Assets/Scripts/movement.cs +++ b/Assets/Scripts/movement.cs @@ -6,7 +6,8 @@ using Unity.Mathematics; using TMPro; -public class movement : MonoBehaviour { +public class movement : MonoBehaviour +{ public Camera THE_Camera; public GameObject player; @@ -72,6 +73,7 @@ public class movement : MonoBehaviour { private Akciopont ap; private Ugynok ugynok; + private Targyak targyak; private int oneonecount = 0; private int twoonecount = 0; @@ -103,9 +105,11 @@ public class movement : MonoBehaviour { {"", "", "", "" } }; - void Start() { + void Start() + { ap = FindObjectOfType(); ugynok = FindObjectOfType(); + targyak = FindObjectOfType(); eromulepes1.SetActive(false); eromulepes2.SetActive(false); @@ -146,88 +150,112 @@ public class movement : MonoBehaviour { kezdoHelyMeghatarzoas(); } - private void kezdoHelyMeghatarzoas() { + private void kezdoHelyMeghatarzoas() + { int random = UnityEngine.Random.Range(1, 12); Debug.Log("Random a kezdohelyszinhez: " + random); - if (random == 1) { + if (random == 1) + { player.transform.position = oneone.transform.position; eromulepes1.SetActive(true); eromulepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 1; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 2) { + } + else if (random == 2) + { player.transform.position = twoone.transform.position; feketepiaclepes1.SetActive(true); feketepiaclepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 1; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 3) { + } + else if (random == 3) + { player.transform.position = threeone.transform.position; metrolepes1.SetActive(true); metrolepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 1; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 4) { + } + else if (random == 4) + { player.transform.position = onetwo.transform.position; szervereklepes1.SetActive(true); szervereklepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 2; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 5) { + } + else if (random == 5) + { player.transform.position = twotwo.transform.position; kingcasinolepes1.SetActive(true); kingcasinolepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 2; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 6) { + } + else if (random == 6) + { player.transform.position = threetwo.transform.position; feltoltolepes1.SetActive(true); feltoltolepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 2; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 7) { + } + else if (random == 7) + { player.transform.position = onethree.transform.position; kutatolaborlepes1.SetActive(true); kutatolaborlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 3; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 8) { + } + else if (random == 8) + { player.transform.position = twothree.transform.position; kriptoklublepes1.SetActive(true); kriptoklublepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 3; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 9) { + } + else if (random == 9) + { player.transform.position = threethree.transform.position; cyberplazalepes1.SetActive(true); cyberplazalepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 3; jelenlegi_y = 3; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 10) { + } + else if (random == 10) + { player.transform.position = onefour.transform.position; hadiuzemlepes1.SetActive(true); hadiuzemlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 1; jelenlegi_y = 4; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 11) { + } + else if (random == 11) + { player.transform.position = twofour.transform.position; konyvtarlepes1.SetActive(true); konyvtarlepes1.GetComponent().text = moveCounter.ToString(); jelenlegi_x = 2; jelenlegi_y = 4; ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - } else if (random == 12) { + } + else if (random == 12) + { player.transform.position = threefour.transform.position; korhazlepes1.SetActive(true); korhazlepes1.GetComponent().text = moveCounter.ToString(); @@ -237,75 +265,107 @@ public class movement : MonoBehaviour { } } - public void mozgasHelyre(int x, int y) { - if (x == 1 && y == 1) { + public void mozgasHelyre(int x, int y) + { + if (x == 1 && y == 1) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = oneone.transform.position; - } else if (x == 1 && y == 2) { + } + else if (x == 1 && y == 2) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = onetwo.transform.position; - } else if (x == 1 && y == 3) { + } + else if (x == 1 && y == 3) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = onethree.transform.position; - } else if (x == 1 && y == 4) { + } + else if (x == 1 && y == 4) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = onefour.transform.position; - } else if (x == 2 && y == 1) { + } + else if (x == 2 && y == 1) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = twoone.transform.position; - } else if (x == 2 && y == 2) { + } + else if (x == 2 && y == 2) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = twotwo.transform.position; - } else if (x == 2 && y == 3) { + } + else if (x == 2 && y == 3) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = twothree.transform.position; - } else if (x == 2 && y == 4) { + } + else if (x == 2 && y == 4) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = twofour.transform.position; - } else if (x == 3 && y == 1) { + } + else if (x == 3 && y == 1) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = threeone.transform.position; - } else if (x == 3 && y == 2) { + } + else if (x == 3 && y == 2) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = threetwo.transform.position; - } else if (x == 3 && y == 3) { + } + else if (x == 3 && y == 3) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = threethree.transform.position; - } else if (x == 3 && y == 4) { + } + else if (x == 3 && y == 4) + { jelenlegi_x = x; jelenlegi_y = y; player.transform.position = threefour.transform.position; } } - public void helyreTeleport() { - if (Input.GetKeyDown(KeyCode.Mouse0) && oneone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + public void helyreTeleport() + { + if (Input.GetKeyDown(KeyCode.Mouse0) && oneone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + oneone_Collider.gameObject.name); - if (eromulepes1.activeSelf == true & eromulepes2.activeSelf == true) { + if (eromulepes1.activeSelf == true & eromulepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { player.transform.position = oneone.transform.position; jelenlegi_x = 1; jelenlegi_y = 1; oneonecount = oneonecount + 1; - if (eromulepes1.activeSelf == true) { + if (eromulepes1.activeSelf == true) + { eromulepes2.SetActive(true); moveCounter++; eromulepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { eromulepes1.SetActive(true); moveCounter++; eromulepes1.GetComponent().text = moveCounter.ToString(); @@ -313,28 +373,38 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && twoone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && twoone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + twoone_Collider.gameObject.name); - if (feketepiaclepes1.activeSelf == true & feketepiaclepes2.activeSelf == true) { + if (feketepiaclepes1.activeSelf == true & feketepiaclepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (twoonecount < 2) { + if (twoonecount < 2) + { player.transform.position = twoone.transform.position; jelenlegi_x = 2; jelenlegi_y = 1; twoonecount = twoonecount + 1; - if (feketepiaclepes1.activeSelf == true) { + if (feketepiaclepes1.activeSelf == true) + { feketepiaclepes2.SetActive(true); moveCounter++; feketepiaclepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { feketepiaclepes1.SetActive(true); moveCounter++; feketepiaclepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } @@ -343,22 +413,30 @@ public class movement : MonoBehaviour { } - if (Input.GetKeyDown(KeyCode.Mouse0) && threeone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && threeone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + threeone_Collider.gameObject.name); - if (metrolepes1.activeSelf == true & metrolepes2.activeSelf == true) { + if (metrolepes1.activeSelf == true & metrolepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { - if (threeonecount < 2) { + } + else + { + if (threeonecount < 2) + { player.transform.position = threeone.transform.position; jelenlegi_x = 3; jelenlegi_y = 1; threeonecount++; - if (metrolepes1.activeSelf == true) { + if (metrolepes1.activeSelf == true) + { metrolepes2.SetActive(true); moveCounter++; metrolepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { metrolepes1.SetActive(true); moveCounter++; metrolepes1.GetComponent().text = moveCounter.ToString(); @@ -372,112 +450,152 @@ public class movement : MonoBehaviour { } - if (Input.GetKeyDown(KeyCode.Mouse0) && onetwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && onetwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + onetwo_Collider.gameObject.name); - if (szervereklepes1.activeSelf == true & szervereklepes2.activeSelf == true) { + if (szervereklepes1.activeSelf == true & szervereklepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (onetwocount < 2) { + if (onetwocount < 2) + { player.transform.position = onetwo.transform.position; jelenlegi_x = 1; jelenlegi_y = 2; onetwocount++; Debug.Log(ap.akciopont); - if (szervereklepes1.activeSelf == true) { + if (szervereklepes1.activeSelf == true) + { szervereklepes2.SetActive(true); moveCounter++; szervereklepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { szervereklepes1.SetActive(true); moveCounter++; szervereklepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez�n bel�l akarsz l�pni"); } } } - if (Input.GetKeyDown(KeyCode.Mouse0) && twotwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && twotwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + twotwo_Collider.gameObject.name); - if (kingcasinolepes1.activeSelf == true & kingcasinolepes2.activeSelf == true) { + if (kingcasinolepes1.activeSelf == true & kingcasinolepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (twotwocount < 2) { + if (twotwocount < 2) + { player.transform.position = twotwo.transform.position; jelenlegi_x = 2; jelenlegi_y = 2; twotwocount++; - if (kingcasinolepes1.activeSelf == true) { + if (kingcasinolepes1.activeSelf == true) + { kingcasinolepes2.SetActive(true); moveCounter++; kingcasinolepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { kingcasinolepes1.SetActive(true); moveCounter++; kingcasinolepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); } } } - if (Input.GetKeyDown(KeyCode.Mouse0) && threetwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && threetwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + threetwo_Collider.gameObject.name); - if (feltoltolepes1.activeSelf == true & feltoltolepes2.activeSelf == true) { + if (feltoltolepes1.activeSelf == true & feltoltolepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (threetwocount < 2) { + if (threetwocount < 2) + { player.transform.position = threetwo.transform.position; jelenlegi_x = 3; jelenlegi_y = 2; threetwocount++; - if (feltoltolepes1.activeSelf == true) { + if (feltoltolepes1.activeSelf == true) + { feltoltolepes2.SetActive(true); moveCounter++; feltoltolepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { feltoltolepes1.SetActive(true); moveCounter++; feltoltolepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } } } - if (Input.GetKeyDown(KeyCode.Mouse0) && onethree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && onethree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + onethree_Collider.gameObject.name); - if (kutatolaborlepes1.activeSelf == true & kutatolaborlepes2.activeSelf == true) { + if (kutatolaborlepes1.activeSelf == true & kutatolaborlepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (onethreecount < 2) { + if (onethreecount < 2) + { player.transform.position = onethree.transform.position; jelenlegi_x = 1; jelenlegi_y = 3; onethreecount++; - if (kutatolaborlepes1.activeSelf == true) { + if (kutatolaborlepes1.activeSelf == true) + { kutatolaborlepes2.SetActive(true); moveCounter++; kutatolaborlepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { kutatolaborlepes1.SetActive(true); moveCounter++; kutatolaborlepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } @@ -486,29 +604,39 @@ public class movement : MonoBehaviour { } - if (Input.GetKeyDown(KeyCode.Mouse0) && twothree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && twothree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + twothree_Collider.gameObject.name); - if (kriptoklublepes1.activeSelf == true & kriptoklublepes2.activeSelf == true) { + if (kriptoklublepes1.activeSelf == true & kriptoklublepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (twothreecount < 2) { + if (twothreecount < 2) + { player.transform.position = twothree.transform.position; jelenlegi_x = 2; jelenlegi_y = 3; twothreecount++; - if (kriptoklublepes1.activeSelf == true) { + if (kriptoklublepes1.activeSelf == true) + { kriptoklublepes2.SetActive(true); moveCounter++; kriptoklublepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { kriptoklublepes1.SetActive(true); moveCounter++; kriptoklublepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } @@ -518,29 +646,39 @@ public class movement : MonoBehaviour { } - if (Input.GetKeyDown(KeyCode.Mouse0) && threethree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && threethree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + threethree_Collider.gameObject.name); - if (cyberplazalepes1.activeSelf == true & cyberplazalepes2.activeSelf == true) { + if (cyberplazalepes1.activeSelf == true & cyberplazalepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (threethreecount < 2) { + if (threethreecount < 2) + { player.transform.position = threethree.transform.position; jelenlegi_x = 3; jelenlegi_y = 3; threethreecount++; - if (cyberplazalepes1.activeSelf == true) { + if (cyberplazalepes1.activeSelf == true) + { cyberplazalepes2.SetActive(true); moveCounter++; cyberplazalepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { cyberplazalepes1.SetActive(true); moveCounter++; cyberplazalepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); } @@ -549,29 +687,39 @@ public class movement : MonoBehaviour { } - if (Input.GetKeyDown(KeyCode.Mouse0) && onefour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && onefour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + onefour_Collider.gameObject.name); - if (hadiuzemlepes1.activeSelf == true & hadiuzemlepes2.activeSelf == true) { + if (hadiuzemlepes1.activeSelf == true & hadiuzemlepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (onefourcount < 2) { + if (onefourcount < 2) + { player.transform.position = onefour.transform.position; jelenlegi_x = 1; jelenlegi_y = 4; onefourcount++; - if (hadiuzemlepes1.activeSelf == true) { + if (hadiuzemlepes1.activeSelf == true) + { hadiuzemlepes2.SetActive(true); moveCounter++; hadiuzemlepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { hadiuzemlepes1.SetActive(true); moveCounter++; hadiuzemlepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } @@ -580,29 +728,39 @@ public class movement : MonoBehaviour { } - if (Input.GetKeyDown(KeyCode.Mouse0) && twofour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && twofour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + twofour_Collider.gameObject.name); - if (konyvtarlepes1.activeSelf == true & konyvtarlepes2.activeSelf == true) { + if (konyvtarlepes1.activeSelf == true & konyvtarlepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (twofourcount < 2) { + if (twofourcount < 2) + { player.transform.position = twofour.transform.position; jelenlegi_x = 2; jelenlegi_y = 4; twofourcount++; - if (konyvtarlepes1.activeSelf == true) { + if (konyvtarlepes1.activeSelf == true) + { konyvtarlepes2.SetActive(true); moveCounter++; konyvtarlepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { konyvtarlepes1.SetActive(true); moveCounter++; konyvtarlepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } @@ -611,29 +769,39 @@ public class movement : MonoBehaviour { } - if (Input.GetKeyDown(KeyCode.Mouse0) && threefour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { + if (Input.GetKeyDown(KeyCode.Mouse0) && threefour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { Debug.Log("Player clicked on the collider: " + threefour_Collider.gameObject.name); - if (korhazlepes1.activeSelf == true & korhazlepes2.activeSelf == true) { + if (korhazlepes1.activeSelf == true & korhazlepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { - if (threefourcount < 2) { + if (threefourcount < 2) + { player.transform.position = threefour.transform.position; jelenlegi_x = 3; jelenlegi_y = 4; threefourcount++; - if (korhazlepes1.activeSelf == true) { + if (korhazlepes1.activeSelf == true) + { korhazlepes2.SetActive(true); moveCounter++; korhazlepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { korhazlepes1.SetActive(true); moveCounter++; korhazlepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } @@ -646,38 +814,67 @@ public class movement : MonoBehaviour { // Update is called once per frame - public void Update() { + public void Update() + { tavolsag = math.abs(tavolsag); // player mozgat�sa �s konzolra irat�s - if (Input.GetKeyDown(KeyCode.Mouse0) && oneone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("oneone")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && oneone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("oneone")) + { Debug.Log("Player clicked on the collider: " + oneone_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (eromulepes1.activeSelf == true & eromulepes2.activeSelf == true) { + if (eromulepes1.activeSelf == true & eromulepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { - if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { + } + else + { + if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) + { player.transform.position = oneone.transform.position; jelenlegi_x = 1; jelenlegi_y = 1; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + if (targyak.lathatatlanOltozetAktivalva) + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + targyak.lathatatlanOltozetAktivalva = false; + } + targyak.lathatatlanOltozetAktivalva = false; + } oneonecount = oneonecount + 1; Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - if (eromulepes1.activeSelf == true) { + if (eromulepes1.activeSelf == true) + { eromulepes2.SetActive(true); moveCounter++; eromulepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { eromulepes1.SetActive(true); moveCounter++; eromulepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } @@ -686,42 +883,68 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && twoone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("twoone")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && twoone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("twoone")) + { Debug.Log("Player clicked on the collider: " + twoone_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (feketepiaclepes1.activeSelf == true & feketepiaclepes2.activeSelf == true) { + if (feketepiaclepes1.activeSelf == true & feketepiaclepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { if (jelenlegi_x == 1 && jelenlegi_y == 2) { tavolsag = 2; } - if (twoonecount < 2) { + if (twoonecount < 2) + { player.transform.position = twoone.transform.position; jelenlegi_x = 2; jelenlegi_y = 1; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + targyak.lathatatlanOltozetAktivalva = false; + } twoonecount = twoonecount + 1; - Debug.Log(ap.akciopont);Debug.Log("ugynok sorsolas"); + Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - if (feketepiaclepes1.activeSelf == true) { + if (feketepiaclepes1.activeSelf == true) + { feketepiaclepes2.SetActive(true); moveCounter++; feketepiaclepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { feketepiaclepes1.SetActive(true); moveCounter++; feketepiaclepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } @@ -731,38 +954,64 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && threeone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("threeone")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && threeone_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("threeone")) + { Debug.Log("Player clicked on the collider: " + threeone_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (metrolepes1.activeSelf == true & metrolepes2.activeSelf == true) { + if (metrolepes1.activeSelf == true & metrolepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { - if (threeonecount < 2) { + if (threeonecount < 2) + { player.transform.position = threeone.transform.position; jelenlegi_x = 3; jelenlegi_y = 1; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + targyak.lathatatlanOltozetAktivalva = false; + } threeonecount++; - Debug.Log(ap.akciopont);Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - if (metrolepes1.activeSelf == true) { + Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + if (metrolepes1.activeSelf == true) + { metrolepes2.SetActive(true); moveCounter++; metrolepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { metrolepes1.SetActive(true); moveCounter++; metrolepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } @@ -771,44 +1020,73 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && onetwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("onetwo")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && onetwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("onetwo")) + { Debug.Log("Player clicked on the collider: " + onetwo_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (szervereklepes1.activeSelf == true & szervereklepes2.activeSelf == true) { + if (szervereklepes1.activeSelf == true & szervereklepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { if (jelenlegi_x == 2 && jelenlegi_y == 1) { tavolsag = 2; } - if (onetwocount < 2) { + if (onetwocount < 2) + { player.transform.position = onetwo.transform.position; jelenlegi_x = 1; jelenlegi_y = 2; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + } onetwocount++; Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); - if (szervereklepes1.activeSelf == true) { + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + if (szervereklepes1.activeSelf == true) + { szervereklepes2.SetActive(true); moveCounter++; szervereklepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { szervereklepes1.SetActive(true); moveCounter++; szervereklepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez�n bel�l akarsz l�pni"); } } @@ -817,40 +1095,69 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && twotwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("twotwo")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && twotwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("twotwo")) + { Debug.Log("Player clicked on the collider: " + twotwo_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (kingcasinolepes1.activeSelf == true & kingcasinolepes2.activeSelf == true) { + if (kingcasinolepes1.activeSelf == true & kingcasinolepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { - if (twotwocount < 2) { + if (twotwocount < 2) + { player.transform.position = twotwo.transform.position; jelenlegi_x = 2; jelenlegi_y = 2; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); twotwocount++; - if (kingcasinolepes1.activeSelf == true) { + if (kingcasinolepes1.activeSelf == true) + { kingcasinolepes2.SetActive(true); moveCounter++; kingcasinolepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { kingcasinolepes1.SetActive(true); moveCounter++; kingcasinolepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez�n bel�l akarsz l�pni"); } } @@ -860,44 +1167,73 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && threetwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("threetwo")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && threetwo_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("threetwo")) + { Debug.Log("Player clicked on the collider: " + threetwo_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (feltoltolepes1.activeSelf == true & feltoltolepes2.activeSelf == true) { + if (feltoltolepes1.activeSelf == true & feltoltolepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { if (jelenlegi_x == 2 && jelenlegi_y == 3) { tavolsag = 2; } - if (threetwocount < 2) { + if (threetwocount < 2) + { player.transform.position = threetwo.transform.position; jelenlegi_x = 3; jelenlegi_y = 2; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); threetwocount++; - if (feltoltolepes1.activeSelf == true) { + if (feltoltolepes1.activeSelf == true) + { feltoltolepes2.SetActive(true); moveCounter++; feltoltolepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { feltoltolepes1.SetActive(true); moveCounter++; feltoltolepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } @@ -907,40 +1243,69 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && onethree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("onethree")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && onethree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("onethree")) + { Debug.Log("Player clicked on the collider: " + onethree_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (kutatolaborlepes1.activeSelf == true & kutatolaborlepes2.activeSelf == true) { + if (kutatolaborlepes1.activeSelf == true & kutatolaborlepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { - if (onethreecount < 2) { + if (onethreecount < 2) + { player.transform.position = onethree.transform.position; jelenlegi_x = 1; jelenlegi_y = 3; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); onethreecount++; - if (kutatolaborlepes1.activeSelf == true) { + if (kutatolaborlepes1.activeSelf == true) + { kutatolaborlepes2.SetActive(true); moveCounter++; kutatolaborlepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { kutatolaborlepes1.SetActive(true); moveCounter++; kutatolaborlepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } @@ -950,44 +1315,73 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && twothree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("twothree")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && twothree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("twothree")) + { Debug.Log("Player clicked on the collider: " + twothree_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (kriptoklublepes1.activeSelf == true & kriptoklublepes2.activeSelf == true) { + if (kriptoklublepes1.activeSelf == true & kriptoklublepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { if (jelenlegi_x == 3 && jelenlegi_y == 2) { tavolsag = 2; } - if (twothreecount < 2) { + if (twothreecount < 2) + { player.transform.position = twothree.transform.position; jelenlegi_x = 2; jelenlegi_y = 3; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); twothreecount++; - if (kriptoklublepes1.activeSelf == true) { + if (kriptoklublepes1.activeSelf == true) + { kriptoklublepes2.SetActive(true); moveCounter++; kriptoklublepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { kriptoklublepes1.SetActive(true); moveCounter++; kriptoklublepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } @@ -998,40 +1392,69 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && threethree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[x, y].Equals("threethree")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && threethree_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[x, y].Equals("threethree")) + { Debug.Log("Player clicked on the collider: " + threethree_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (cyberplazalepes1.activeSelf == true & cyberplazalepes2.activeSelf == true) { + if (cyberplazalepes1.activeSelf == true & cyberplazalepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { - if (threethreecount < 2) { + if (threethreecount < 2) + { player.transform.position = threethree.transform.position; jelenlegi_x = 3; jelenlegi_y = 3; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); threethreecount++; - if (cyberplazalepes1.activeSelf == true) { + if (cyberplazalepes1.activeSelf == true) + { cyberplazalepes2.SetActive(true); moveCounter++; cyberplazalepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { cyberplazalepes1.SetActive(true); moveCounter++; cyberplazalepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } @@ -1041,40 +1464,69 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && onefour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("onefour")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && onefour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("onefour")) + { Debug.Log("Player clicked on the collider: " + onefour_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (hadiuzemlepes1.activeSelf == true & hadiuzemlepes2.activeSelf == true) { + if (hadiuzemlepes1.activeSelf == true & hadiuzemlepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { - if (onefourcount < 2) { + if (onefourcount < 2) + { player.transform.position = onefour.transform.position; jelenlegi_x = 1; jelenlegi_y = 4; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); onefourcount++; - if (hadiuzemlepes1.activeSelf == true) { + if (hadiuzemlepes1.activeSelf == true) + { hadiuzemlepes2.SetActive(true); moveCounter++; hadiuzemlepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { hadiuzemlepes1.SetActive(true); moveCounter++; hadiuzemlepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } @@ -1084,40 +1536,69 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && twofour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("twofour")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && twofour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("twofour")) + { Debug.Log("Player clicked on the collider: " + twofour_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (konyvtarlepes1.activeSelf == true & konyvtarlepes2.activeSelf == true) { + if (konyvtarlepes1.activeSelf == true & konyvtarlepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { - if (twofourcount < 2) { + if (twofourcount < 2) + { player.transform.position = twofour.transform.position; jelenlegi_x = 2; jelenlegi_y = 4; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); twofourcount++; - if (konyvtarlepes1.activeSelf == true) { + if (konyvtarlepes1.activeSelf == true) + { konyvtarlepes2.SetActive(true); moveCounter++; konyvtarlepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { konyvtarlepes1.SetActive(true); moveCounter++; konyvtarlepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } @@ -1127,40 +1608,69 @@ public class movement : MonoBehaviour { } } - if (Input.GetKeyDown(KeyCode.Mouse0) && threefour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) { - for (int x = 0; x < w; x++) { - for (int y = 0; y < h; y++) { - if (helyek[y, x].Equals("threefour")) { + if (Input.GetKeyDown(KeyCode.Mouse0) && threefour_Collider.OverlapPoint(THE_Camera.ScreenToWorldPoint(Input.mousePosition))) + { + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (helyek[y, x].Equals("threefour")) + { Debug.Log("Player clicked on the collider: " + threefour_Collider.gameObject.name); tavolsag = math.abs((x + 1) - jelenlegi_x) + math.abs((y + 1) - jelenlegi_y); - if (korhazlepes1.activeSelf == true & korhazlepes2.activeSelf == true) { + if (korhazlepes1.activeSelf == true & korhazlepes2.activeSelf == true) + { Debug.Log("Maximum k�tszer l�phetsz egy mez�re"); - } else { + } + else + { if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0) { - if (threefourcount < 2) { + if (threefourcount < 2) + { player.transform.position = threefour.transform.position; jelenlegi_x = 3; jelenlegi_y = 4; - ap.akciopont = ap.akciopont - tavolsag; + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + if (targyak.lathatatlanOltozetAktivalva) + { + targyak.lathatatlanOltozetAktivalva = false; + } + else + { + ap.akciopont = ap.akciopont - tavolsag; + } + } Debug.Log(ap.akciopont); Debug.Log("ugynok sorsolas"); - ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); + ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y); threefourcount++; - if (korhazlepes1.activeSelf == true) { + if (korhazlepes1.activeSelf == true) + { korhazlepes2.SetActive(true); moveCounter++; korhazlepes2.GetComponent().text = moveCounter.ToString(); - } else { + } + else + { korhazlepes1.SetActive(true); moveCounter++; korhazlepes1.GetComponent().text = moveCounter.ToString(); } - } else { + } + else + { Debug.Log("Maximum k�tszer l�phetsz egy mez?re"); } - } else { + } + else + { Debug.Log("Nincs el�g akci�pontod vagy nem 1 mez?n bel�l akarsz l�pni"); } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index d066ac8..259a51c 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -19,12 +19,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1366 + height: 635 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 3990 + controlID: 96 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 268 + x: 191 y: 73 - width: 1152 - height: 534 + width: 819 + height: 351 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1152, y: 513} + m_TargetSize: {x: 819, y: 330} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -576 - m_HBaseRangeMax: 576 - m_VBaseRangeMin: -256.5 - m_VBaseRangeMax: 256.5 + m_HBaseRangeMin: -409.5 + m_HBaseRangeMax: 409.5 + m_VBaseRangeMin: -165 + m_VBaseRangeMax: 165 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1152 - height: 513 + width: 819 + height: 330 m_Scale: {x: 1, y: 1} - m_Translation: {x: 576, y: 256.5} + m_Translation: {x: 409.5, y: 165} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -576 - y: -256.5 - width: 1152 - height: 513 + x: -409.5 + y: -165 + width: 819 + height: 330 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1152, y: 534} + m_LastWindowPixelSize: {x: 819, y: 351} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,12 +136,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1422 - height: 947 + width: 1012 + height: 635 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 3991 + controlID: 97 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,12 +161,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1422 - height: 555 + width: 1012 + height: 372 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 3963 + controlID: 98 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -184,10 +184,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 268 - height: 555 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 191 + height: 372 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -215,8 +215,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 267 - height: 534 + width: 190 + height: 351 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2afbffffcc6b0000ea6b0000fa6b0000986c0000e06c0000766d0000a86d00001a6e0000686e0000826e0000966e0000106f0000266f0000dc6f000044700000bc700000d47000005a71000074710000e0710000e8710000107200003a720000a672000034730000da73000008740000f67400005c7500007e750000b2750000d47500001476000024760000427600004a760000 + m_ExpandedIDs: 18fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -265,12 +265,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 268 + x: 191 y: 0 - width: 1154 - height: 555 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 821 + height: 372 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -297,10 +297,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 268 + x: 191 y: 73 - width: 1152 - height: 534 + width: 819 + height: 351 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -550,16 +550,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 + m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -6.49345, y: -0.15270035, z: -0.25521368} + m_Target: {x: -6.6550636, y: 2.4831932, z: -0.021597017} speed: 2 - m_Value: {x: -6.49345, y: -0.15270035, z: -0.25521368} + m_Value: {x: -6.6550636, y: 2.4831932, z: -0.021597017} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 11.7815 + m_Target: 8.307541 speed: 2 - m_Value: 11.7815 + m_Value: 8.307541 m_Ortho: m_Target: 1 speed: 2 @@ -647,23 +647,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 555 - width: 1422 - height: 392 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 11} + y: 372 + width: 1012 + height: 263 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} - {fileID: 11} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -685,9 +685,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 628 - width: 1421 - height: 371 + y: 445 + width: 1011 + height: 242 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -705,22 +705,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 88 m_LastFolders: - - Assets/Scripts + - Assets m_LastFoldersGridSize: 88 - m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource + m_LastProjectPath: C:\dev\find the source m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3e780000 - m_LastClickedID: 30782 - m_ExpandedIDs: 00000000307800003278000034780000 + m_SelectedIDs: 40780000 + m_LastClickedID: 30784 + m_ExpandedIDs: 000000004078000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -748,7 +748,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000307800003278000034780000 + m_ExpandedIDs: 0000000040780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -773,9 +773,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 226c0000 - m_LastClickedInstanceID: 27682 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -847,10 +847,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1422 + x: 1012 y: 0 - width: 498 - height: 947 + width: 354 + height: 635 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} @@ -878,10 +878,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1422 + x: 1012 y: 73 - width: 497 - height: 926 + width: 353 + height: 614 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -892,7 +892,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 27682 + m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 4ecbf3e..85472d8 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 674 - y: 202 - width: 640 - height: 601 - m_ShowMode: 0 - m_Title: Build Settings - m_RootView: {fileID: 4} - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -40,65 +16,15 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 43 - width: 1920 - height: 997 + width: 1366 + height: 685 m_ShowMode: 4 m_Title: Hierarchy - m_RootView: {fileID: 5} + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: BuildPlayerWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 640 - height: 601 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 640 - height: 601 - m_MinSize: {x: 640, y: 601} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 126 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -111,22 +37,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 8} - - {fileID: 7} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1366 + height: 685 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -143,12 +69,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1366 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -164,12 +90,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 665 + width: 1366 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -182,19 +108,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 14} + - {fileID: 6} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1366 + height: 635 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 92 ---- !u!114 &9 + controlID: 51 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -207,19 +133,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 7} - {fileID: 10} - - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1422 - height: 947 + width: 1012 + height: 635 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 93 ---- !u!114 &10 + controlID: 52 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -232,19 +158,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 12} + - {fileID: 8} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1422 - height: 555 + width: 1012 + height: 395 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 94 ---- !u!114 &11 + controlID: 53 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -261,16 +187,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 268 - height: 555 + width: 191 + height: 395 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 17} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -285,19 +211,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 268 + x: 191 y: 0 - width: 1154 - height: 555 + width: 821 + height: 395 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 18} - - {fileID: 16} + - {fileID: 14} + - {fileID: 12} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -313,18 +239,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 555 - width: 1422 - height: 392 + y: 395 + width: 1012 + height: 240 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 19} - - {fileID: 20} + - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -339,68 +265,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1422 + x: 1012 y: 0 - width: 498 - height: 947 + width: 354 + height: 635 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 21} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 640, y: 580} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Build Settings - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 674 - y: 202 - width: 640 - height: 580 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: ---- !u!114 &16 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -420,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 268 + x: 191 y: 73 - width: 1152 - height: 534 + width: 819 + height: 374 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -434,7 +310,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1152, y: 513} + m_TargetSize: {x: 819, y: 353} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -449,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -576 - m_HBaseRangeMax: 576 - m_VBaseRangeMin: -256.5 - m_VBaseRangeMax: 256.5 + m_HBaseRangeMin: -409.5 + m_HBaseRangeMax: 409.5 + m_VBaseRangeMin: -176.5 + m_VBaseRangeMax: 176.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -470,29 +346,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1152 - height: 513 + width: 819 + height: 353 m_Scale: {x: 1, y: 1} - m_Translation: {x: 576, y: 256.5} + m_Translation: {x: 409.5, y: 176.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -576 - y: -256.5 - width: 1152 - height: 513 + x: -409.5 + y: -176.5 + width: 819 + height: 353 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1152, y: 534} + m_LastWindowPixelSize: {x: 819, y: 374} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &17 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -514,8 +390,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 267 - height: 534 + width: 190 + height: 374 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -525,7 +401,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: a0f3ffff1ef4ffffc2f7ffffe0f7ffff2afbffff + m_ExpandedIDs: 22fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -541,7 +417,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -549,7 +425,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -569,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 268 + x: 191 y: 73 - width: 1152 - height: 534 + width: 819 + height: 374 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -822,16 +698,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 + m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -6.49345, y: -0.15270035, z: -0.25521368} + m_Target: {x: -18.220608, y: -1.7600883, z: -0.04389826} speed: 2 - m_Value: {x: -6.49345, y: -0.15270035, z: -0.25521368} + m_Value: {x: -18.220608, y: -1.7600883, z: -0.04389826} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -882,9 +758,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 11.7815 + m_Target: 6.584696 speed: 2 - m_Value: 11.7815 + m_Value: 6.584696 m_Ortho: m_Target: 1 speed: 2 @@ -909,7 +785,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -930,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 628 - width: 1421 - height: 371 + y: 468 + width: 1011 + height: 219 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -950,22 +826,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 88 + m_StartGridSize: 52 m_LastFolders: - - Assets - m_LastFoldersGridSize: 88 - m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource + - Assets/Scripts + m_LastFoldersGridSize: 52 + m_LastProjectPath: C:\dev\find the source m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 30780000 - m_LastClickedID: 30768 - m_ExpandedIDs: 00000000307800003278000034780000 + m_SelectedIDs: 4c780000 + m_LastClickedID: 30796 + m_ExpandedIDs: 000000003678000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -981,7 +857,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 13} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -993,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000307800003278000034780000 + m_ExpandedIDs: 0000000036780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1020,7 +896,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1037,7 +913,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 13} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1045,11 +921,11 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 88 + m_ScrollPosition: {x: 0, y: 11} + m_GridSize: 52 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1077,7 +953,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1097,10 +973,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1422 + x: 1012 y: 73 - width: 497 - height: 926 + width: 353 + height: 614 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default From 0bc93bd0906af171ee279a82de95afba3dd19387 Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Tue, 24 Jan 2023 17:07:33 +0100 Subject: [PATCH 8/8] helyszinaktivalas, targyak update --- Assets/Scenes/Jatek.unity | 22 ++++ Assets/Scripts/Targyak.cs | 28 ++-- Assets/Scripts/helyszinaktivalas.cs | 91 ++++++------- Packages/manifest.json | 5 +- Packages/packages-lock.json | 58 +++++--- ProjectSettings/ProjectVersion.txt | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 124 +++++++++--------- UserSettings/Layouts/default-2021.dwlt | 114 ++++++++-------- 8 files changed, 252 insertions(+), 194 deletions(-) diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 0e9379c..d23b753 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -3253,6 +3253,7 @@ GameObject: - component: {fileID: 197904233} - component: {fileID: 197904234} - component: {fileID: 197904235} + - component: {fileID: 197904236} m_Layer: 0 m_Name: Mangager m_TagString: Untagged @@ -3750,7 +3751,28 @@ MonoBehaviour: - {fileID: 753661018} - {fileID: 1240172719} canKill: 0 + canShoot: 0 maincamera: {fileID: 519420031} +--- !u!114 &197904236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197904216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2595afc692aed134ab895e537a2c9f73, type: 3} + m_Name: + m_EditorClassIdentifier: + targy_szamlalo: 0 + adrenalinloket: 0 + hackercsatlakozo: 0 + lathatatlanoltozet: 0 + droidgepagyu: 0 + matavtaviranyito: 0 + fustgranat: 0 + lathatatlanOltozetAktivalva: 0 --- !u!1 &229807670 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Targyak.cs b/Assets/Scripts/Targyak.cs index fe401a8..d8c487b 100644 --- a/Assets/Scripts/Targyak.cs +++ b/Assets/Scripts/Targyak.cs @@ -19,6 +19,7 @@ public class Targyak : MonoBehaviour public int matavtaviranyito = 0; public int fustgranat = 0; public bool lathatatlanOltozetAktivalva = false; + private int randomszam; private void Start() { akciok = FindObjectOfType(); @@ -31,7 +32,14 @@ public class Targyak : MonoBehaviour public void RandomTargy() { - int randomszam = UnityEngine.Random.Range(0, 5); + string[] elerheto_targyak = {"Adrenalinloket", "Hacker csatlakozo", "Lathatatlan oltozet", "Droid agyu", "Matav taviranyito", "Alomhozo fustgranat"} ; + + do{ + randomszam = UnityEngine.Random.Range(0, elerheto_targyak.Length); + }while(!elerheto_targyak[randomszam].Equals("")); + + elerheto_targyak[randomszam] = ""; + if (randomszam == 0) { adrenalinloket++; @@ -65,38 +73,38 @@ public class Targyak : MonoBehaviour } public void AdrenalinLoket() { - targy_szamlalo++; + } - public void HackerCsatlakozo() { + public void HackerCsatlakozo() { //kesz //+2 tolteny akciok.Betarazas(2); //+1 elet elet.Eletplusz(); //+1 akcio akciopont.akciopont++; - targy_szamlalo++; + } - public void LathatatlanOltozek() { + public void LathatatlanOltozek() { //kesz //movement.mozgasHelyre(2, 2); //megadni inkabb a hely nevet ahova menni akar? | input field es nev megadas lathatatlanOltozetAktivalva = true; - targy_szamlalo++; + } - public void DroidGepagyu() { - targy_szamlalo++; + public void DroidGepagyu() { //kesz + //ugynok cucc ugynok.canKill = true; //barhol meg tud olni ha kattint } public void MatavTaviranyito() { - targy_szamlalo++; + } public void FustGranat() { energia.granatAktivalva = true; - targy_szamlalo++; + } } diff --git a/Assets/Scripts/helyszinaktivalas.cs b/Assets/Scripts/helyszinaktivalas.cs index 1852883..ac8ffbe 100644 --- a/Assets/Scripts/helyszinaktivalas.cs +++ b/Assets/Scripts/helyszinaktivalas.cs @@ -9,20 +9,14 @@ public class helyszinaktivalas : MonoBehaviour private Elet elet; private Akciok akciok; private Targyak targyak; - private Dice dice; private Upgrade upgrade; private Akciopont akciopont; private movement movement; private Ugynok ugynok; - - bool canUpgrade = false; - private int diceResult; - public Sprite[] diceSides = new Sprite[6]; - public SpriteRenderer hely1; + private Energia energia; void Start() { - dice = FindObjectOfType(); akciopont = FindObjectOfType(); movement = FindObjectOfType(); upgrade = FindObjectOfType(); @@ -30,100 +24,107 @@ public class helyszinaktivalas : MonoBehaviour akciok = FindObjectOfType(); elet = FindObjectOfType(); ugynok = FindObjectOfType(); + energia = FindObjectOfType(); } public void HelyszinAktivalas() { - //1-es mez� + //1-es mez� kesz if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 1) { //ugynokcsapat oles barhol tolteny nelkul ugynok.canKill = true; //megolhetunk egy csapatot + akciopont.UpdateAkciopont(-1); + energia.csokkenEnergia(1); + } //2-es mez� -- K�SZ if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 1) { - canUpgrade = true; + upgrade.canUpgrade = true; akciopont.akciopont++; + energia.csokkenEnergia(2); } - //3-es mez� -- K�SZ + //3-es mez� if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 1) { - movement.helyreTeleport(); + movement.helyreTeleport(); //hogy teleportal + energia.csokkenEnergia(1); } - //4-es mez� + //4-es mez� kesz if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 2) { //kapsz egy t�rgyat + targyak.RandomTargy(); + targyak.targy_szamlalo++; + akciopont.UpdateAkciopont(-1); + energia.csokkenEnergia(1); } - //5-es mez� + //5-es mez� kesz if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 2) { - /*diceResult = RollDice(); - hely1.sprite = diceSides[diceResult - 1]; - hely1.size = new Vector2(38, 38); - targyak.targy_szamlalo++;*/ + ///dobj paros +3 ap paratlan -1 energia + int eredmeny = UnityEngine.Random.Range(1,7); + Debug.Log("Dobas eredmeny: " + eredmeny); + if(eredmeny % 2 == 0) + akciopont.UpdateAkciopont(3); //+3ap + else + energia.csokkenEnergia(1); + + akciopont.UpdateAkciopont(-1); } - //6-es mez� + //6-es mez� kesz if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 2) { - //+1 akci� + //+1 akcio + akciopont.UpdateAkciopont(1); } //7-es mez� -- K�SZ if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 3) { //1 fejleszt�s ingyen - canUpgrade = true; - akciopont.akciopont++; + upgrade.canUpgrade = true; + akciopont.UpdateAkciopont(-2); } - //8-es mez� + //8-es mez� kesz if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 3) { - /*diceResult = RollDice(); - hely1.sprite = diceSides[diceResult - 1]; - hely1.size = new Vector2(38, 38); - targyak.targy_szamlalo++;*/ - + //2 kocka dobas egyik +ap masik -energia + int eredmeny1 = UnityEngine.Random.Range(1,7); //+ap + int eredmeny2 = UnityEngine.Random.Range(1,7); //-energia + Debug.Log("Dobas eredmeny elso: "+eredmeny1+ " masodik: " + eredmeny2); + akciopont.UpdateAkciopont(eredmeny1); + energia.csokkenEnergia(eredmeny2); } //9-es mez� -- K�SZ if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 3) { targyak.RandomTargy(); targyak.targy_szamlalo++; + akciopont.UpdateAkciopont(-2); } //10-es mez� -- K�SZ ? if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 4) { //+4 t�lt�ny akciok.Betarazas(4); + akciopont.UpdateAkciopont(-1); } - //11-es mez� + //11-es mez� kesz if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 4) { //Dobj! Megkapod a t�rgyat. - - /* diceResult = RollDice(); - hely1.sprite = diceSides[diceResult - 1]; - hely1.size = new Vector2(38, 38); - targyak.targy_szamlalo++;*/ + targyak.RandomTargy(); + targyak.targy_szamlalo++; + energia.csokkenEnergia(1); } //12-es mez� -- K�SZ if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 4) { - //+1 �let + //+1 elet elet.Eletplusz(); + akciopont.UpdateAkciopont(-1); } } - - - /*private int RollDice() - { - int randomDiceSide = UnityEngine.Random.Range(0, 5); - int finalSide = randomDiceSide + 1; - - Debug.Log(finalSide); - - return finalSide; - }*/ } diff --git a/Packages/manifest.json b/Packages/manifest.json index a25f00e..132b888 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,14 @@ { "dependencies": { - "com.unity.collab-proxy": "1.17.6", + "com.unity.collab-proxy": "1.17.7", "com.unity.feature.2d": "1.0.0", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", - "com.unity.render-pipelines.universal": "12.1.7", + "com.unity.render-pipelines.universal": "12.1.8", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", + "com.unity.toolchain.linux-x86_64": "2.0.4", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.8", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 30961a6..6105e8c 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "7.0.8", + "version": "7.0.9", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.5", + "com.unity.2d.common": "6.0.6", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -13,7 +13,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "6.0.5", + "version": "6.0.6", "depth": 2, "source": "registry", "dependencies": { @@ -32,7 +32,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.pixel-perfect": { - "version": "5.0.1", + "version": "5.0.3", "depth": 1, "source": "registry", "dependencies": {}, @@ -86,7 +86,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.7.3", + "version": "1.8.2", "depth": 1, "source": "registry", "dependencies": { @@ -95,7 +95,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.17.6", + "version": "1.17.7", "depth": 0, "source": "registry", "dependencies": { @@ -115,8 +115,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "7.0.8", - "com.unity.2d.pixel-perfect": "5.0.1", + "com.unity.2d.animation": "7.0.9", + "com.unity.2d.pixel-perfect": "5.0.3", "com.unity.2d.psdimporter": "6.0.6", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.spriteshape": "7.0.6", @@ -155,7 +155,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.7", + "version": "12.1.8", "depth": 1, "source": "builtin", "dependencies": { @@ -165,14 +165,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "12.1.7", + "version": "12.1.8", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "12.1.7", - "com.unity.shadergraph": "12.1.7" + "com.unity.burst": "1.8.2", + "com.unity.render-pipelines.core": "12.1.8", + "com.unity.shadergraph": "12.1.8" } }, "com.unity.searcher": { @@ -183,7 +183,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.4.3", + "version": "1.6.0", "depth": 1, "source": "registry", "dependencies": { @@ -194,14 +194,30 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.7", + "version": "12.1.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.7", + "com.unity.render-pipelines.core": "12.1.8", "com.unity.searcher": "4.9.1" } }, + "com.unity.sysroot": { + "version": "2.0.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.5" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 0, @@ -234,6 +250,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.linux-x86_64": { + "version": "2.0.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.5", + "com.unity.sysroot.linux-x86_64": "2.0.4" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b868996..3643b02 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.12f1 -m_EditorVersionWithRevision: 2021.3.12f1 (8af3c3e441b1) +m_EditorVersion: 2021.3.16f1 +m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f) diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 259a51c..5803feb 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -20,11 +20,11 @@ MonoBehaviour: x: 0 y: 30 width: 1366 - height: 635 + height: 622 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 96 + controlID: 83 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,9 +46,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 191 - y: 73 + y: 86 width: 819 - height: 351 + height: 366 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 819, y: 330} + m_TargetSize: {x: 819, y: 345} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -76,8 +76,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -409.5 m_HBaseRangeMax: 409.5 - m_VBaseRangeMin: -165 - m_VBaseRangeMax: 165 + m_VBaseRangeMin: -172.5 + m_VBaseRangeMax: 172.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -96,9 +96,9 @@ MonoBehaviour: x: 0 y: 21 width: 819 - height: 330 + height: 345 m_Scale: {x: 1, y: 1} - m_Translation: {x: 409.5, y: 165} + m_Translation: {x: 409.5, y: 172.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -106,12 +106,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -409.5 - y: -165 + y: -172.5 width: 819 - height: 330 + height: 345 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 819, y: 351} + m_LastWindowPixelSize: {x: 819, y: 366} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -137,11 +137,11 @@ MonoBehaviour: x: 0 y: 0 width: 1012 - height: 635 + height: 622 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 97 + controlID: 84 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,11 +162,11 @@ MonoBehaviour: x: 0 y: 0 width: 1012 - height: 372 + height: 387 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 98 + controlID: 85 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,9 +185,9 @@ MonoBehaviour: x: 0 y: 0 width: 191 - height: 372 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + height: 387 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -214,9 +214,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 + y: 86 width: 190 - height: 351 + height: 366 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 18fbffff + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -268,9 +268,9 @@ MonoBehaviour: x: 191 y: 0 width: 821 - height: 372 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + height: 387 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -298,9 +298,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 191 - y: 73 + y: 86 width: 819 - height: 351 + height: 366 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -6.6550636, y: 2.4831932, z: -0.021597017} + m_Target: {x: -11.670631, y: -3.049128, z: -0.05244342} speed: 2 - m_Value: {x: -6.6550636, y: 2.4831932, z: -0.021597017} + m_Value: {x: -11.670631, y: -3.049128, z: -0.05244342} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 8.307541 + m_Target: 8.236867 speed: 2 - m_Value: 8.307541 + m_Value: 8.236867 m_Ortho: m_Target: 1 speed: 2 @@ -647,23 +647,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 372 + y: 387 width: 1012 - height: 263 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 10} + height: 235 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 11} m_Panes: - {fileID: 10} - {fileID: 11} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -685,9 +685,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 445 + y: 473 width: 1011 - height: 242 + height: 214 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -705,22 +705,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 88 + m_StartGridSize: 52 m_LastFolders: - - Assets - m_LastFoldersGridSize: 88 - m_LastProjectPath: C:\dev\find the source + - Assets/Scripts + m_LastFoldersGridSize: 52 + m_LastProjectPath: /home/tom/Documents/dev/find the source m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 40780000 - m_LastClickedID: 30784 - m_ExpandedIDs: 000000004078000000ca9a3bffffff7f + m_SelectedIDs: 8c780000 + m_LastClickedID: 30860 + m_ExpandedIDs: 000000007678000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -748,7 +748,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000040780000 + m_ExpandedIDs: 0000000076780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -773,8 +773,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 686c0000 + m_LastClickedInstanceID: 27752 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: @@ -800,8 +800,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 88 + m_ScrollPosition: {x: 0, y: 16} + m_GridSize: 52 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 --- !u!114 &11 @@ -825,9 +825,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 628 - width: 1421 - height: 371 + y: 473 + width: 1011 + height: 214 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -850,7 +850,7 @@ MonoBehaviour: x: 1012 y: 0 width: 354 - height: 635 + height: 622 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} @@ -879,9 +879,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1012 - y: 73 + y: 86 width: 353 - height: 614 + height: 601 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -892,8 +892,8 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: 27752 + m_LastVerticalScrollValue: 139 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 85472d8..0be598b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -8,22 +8,22 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 + y: 28 width: 1366 - height: 685 + height: 672 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Scene m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,7 +45,7 @@ MonoBehaviour: x: 0 y: 0 width: 1366 - height: 685 + height: 672 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -90,7 +90,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 665 + y: 652 width: 1366 height: 20 m_MinSize: {x: 0, y: 0} @@ -115,11 +115,11 @@ MonoBehaviour: x: 0 y: 30 width: 1366 - height: 635 + height: 622 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 51 + controlID: 95 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,11 +140,11 @@ MonoBehaviour: x: 0 y: 0 width: 1012 - height: 635 + height: 622 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 52 + controlID: 96 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,11 +165,11 @@ MonoBehaviour: x: 0 y: 0 width: 1012 - height: 395 + height: 387 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 53 + controlID: 97 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,7 +188,7 @@ MonoBehaviour: x: 0 y: 0 width: 191 - height: 395 + height: 387 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -206,7 +206,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -214,15 +214,15 @@ MonoBehaviour: x: 191 y: 0 width: 821 - height: 395 + height: 387 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -239,9 +239,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 395 + y: 387 width: 1012 - height: 240 + height: 235 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -268,7 +268,7 @@ MonoBehaviour: x: 1012 y: 0 width: 354 - height: 635 + height: 622 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -297,9 +297,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 191 - y: 73 + y: 86 width: 819 - height: 374 + height: 366 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -310,11 +310,11 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 819, y: 353} + m_TargetSize: {x: 819, y: 345} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 1 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -327,8 +327,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -409.5 m_HBaseRangeMax: 409.5 - m_VBaseRangeMin: -176.5 - m_VBaseRangeMax: 176.5 + m_VBaseRangeMin: -172.5 + m_VBaseRangeMax: 172.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -347,9 +347,9 @@ MonoBehaviour: x: 0 y: 21 width: 819 - height: 353 + height: 345 m_Scale: {x: 1, y: 1} - m_Translation: {x: 409.5, y: 176.5} + m_Translation: {x: 409.5, y: 172.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -357,12 +357,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -409.5 - y: -176.5 + y: -172.5 width: 819 - height: 353 + height: 345 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 819, y: 374} + m_LastWindowPixelSize: {x: 819, y: 366} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -389,9 +389,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 + y: 86 width: 190 - height: 374 + height: 366 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -401,7 +401,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 22fbffff + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -446,9 +446,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 191 - y: 73 + y: 86 width: 819 - height: 374 + height: 366 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -705,9 +705,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -18.220608, y: -1.7600883, z: -0.04389826} + m_Target: {x: -10.620693, y: -3.3132205, z: -0.04804741} speed: 2 - m_Value: {x: -18.220608, y: -1.7600883, z: -0.04389826} + m_Value: {x: -10.620693, y: -3.3132205, z: -0.04804741} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -758,9 +758,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.584696 + m_Target: 7.797266 speed: 2 - m_Value: 6.584696 + m_Value: 7.797266 m_Ortho: m_Target: 1 speed: 2 @@ -806,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 468 + y: 473 width: 1011 - height: 219 + height: 214 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -834,14 +834,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts m_LastFoldersGridSize: 52 - m_LastProjectPath: C:\dev\find the source + m_LastProjectPath: /home/tom/Documents/dev/find the source m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4c780000 - m_LastClickedID: 30796 - m_ExpandedIDs: 000000003678000000ca9a3bffffff7f + m_SelectedIDs: 8c780000 + m_LastClickedID: 30860 + m_ExpandedIDs: 000000007678000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000036780000 + m_ExpandedIDs: 0000000076780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -896,7 +896,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -921,7 +921,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 11} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 52 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 @@ -946,9 +946,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 628 - width: 1421 - height: 371 + y: 473 + width: 1011 + height: 214 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -974,9 +974,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1012 - y: 73 + y: 86 width: 353 - height: 614 + height: 601 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -988,7 +988,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 1505.795 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: