movement fully working

Assets/Scripts/movement.cs

@@ -71,7 +71,6 @@ public class movement : MonoBehaviour {
     public GameObject korhazlepes2;
 
     private Akciopont ap;
-    private Ugynok ugynok;
 
     private int oneonecount = 0;
     private int twoonecount = 0;
@@ -105,7 +104,6 @@ public class movement : MonoBehaviour {
 
     void Start() {
         ap = FindObjectOfType<Akciopont>();
-        ugynok = FindObjectOfType<Ugynok>();
 
         eromulepes1.SetActive(false);
         eromulepes2.SetActive(false);
@@ -156,96 +154,72 @@ public class movement : MonoBehaviour {
             eromulepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 1;
             jelenlegi_y = 1;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 2) {
             player.transform.position = twoone.transform.position;
             feketepiaclepes1.SetActive(true);
             feketepiaclepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 2;
             jelenlegi_y = 1;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 3) {
             player.transform.position = threeone.transform.position;
             metrolepes1.SetActive(true);
             metrolepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 3;
             jelenlegi_y = 1;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 4) {
             player.transform.position = onetwo.transform.position;
             szervereklepes1.SetActive(true);
             szervereklepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 1;
             jelenlegi_y = 2;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 5) {
             player.transform.position = twotwo.transform.position;
             kingcasinolepes1.SetActive(true);
             kingcasinolepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 2;
             jelenlegi_y = 2;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 6) {
             player.transform.position = threetwo.transform.position;
             feltoltolepes1.SetActive(true);
             feltoltolepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 3;
             jelenlegi_y = 2;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 7) {
             player.transform.position = onethree.transform.position;
             kutatolaborlepes1.SetActive(true);
             kutatolaborlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 1;
             jelenlegi_y = 3;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 8) {
             player.transform.position = twothree.transform.position;
             kriptoklublepes1.SetActive(true);
             kriptoklublepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 2;
             jelenlegi_y = 3;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 9) {
             player.transform.position = threethree.transform.position;
             cyberplazalepes1.SetActive(true);
             cyberplazalepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 3;
             jelenlegi_y = 3;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 10) {
             player.transform.position = onefour.transform.position;
             hadiuzemlepes1.SetActive(true);
             hadiuzemlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 1;
             jelenlegi_y = 4;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 11) {
             player.transform.position = twofour.transform.position;
             konyvtarlepes1.SetActive(true);
             konyvtarlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 2;
             jelenlegi_y = 4;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         } else if (random == 12) {
             player.transform.position = threefour.transform.position;
             korhazlepes1.SetActive(true);
             korhazlepes1.GetComponent<TMP_Text>().text = moveCounter.ToString();
             jelenlegi_x = 3;
             jelenlegi_y = 4;
-            //Ugynokok sorsorlasa a helyre
-            ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
         }
     }
 
@@ -671,15 +645,13 @@ public class movement : MonoBehaviour {
                         if (eromulepes1.activeSelf == true & eromulepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            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;
                                 oneonecount = oneonecount + 1;
                                 Debug.Log(ap.akciopont);
-                                //Ugynokok sorsorlasa a helyre
-                                ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                 if (eromulepes1.activeSelf == true) {
                                     eromulepes2.SetActive(true);
                                     moveCounter++;
@@ -707,7 +679,8 @@ public class movement : MonoBehaviour {
                         if (feketepiaclepes1.activeSelf == true & feketepiaclepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (jelenlegi_x == 1 && jelenlegi_y == 2)
                                 {
                                     tavolsag = 2;
@@ -719,8 +692,6 @@ public class movement : MonoBehaviour {
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     twoonecount = twoonecount + 1;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     if (feketepiaclepes1.activeSelf == true) {
                                         feketepiaclepes2.SetActive(true);
                                         moveCounter++;
@@ -752,7 +723,8 @@ public class movement : MonoBehaviour {
                         if (metrolepes1.activeSelf == true & metrolepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (threeonecount < 2) {
                                     player.transform.position = threeone.transform.position;
                                     jelenlegi_x = 3;
@@ -760,8 +732,6 @@ public class movement : MonoBehaviour {
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     threeonecount++;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     if (metrolepes1.activeSelf == true) {
                                         metrolepes2.SetActive(true);
                                         moveCounter++;
@@ -793,7 +763,8 @@ public class movement : MonoBehaviour {
                         if (szervereklepes1.activeSelf == true & szervereklepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (jelenlegi_x == 2 && jelenlegi_y == 1)
                                 {
                                     tavolsag = 2;
@@ -805,8 +776,6 @@ public class movement : MonoBehaviour {
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     onetwocount++;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     if (szervereklepes1.activeSelf == true) {
                                         szervereklepes2.SetActive(true);
                                         moveCounter++;
@@ -838,15 +807,14 @@ public class movement : MonoBehaviour {
                         if (kingcasinolepes1.activeSelf == true & kingcasinolepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (twotwocount < 2) {
                                     player.transform.position = twotwo.transform.position;
                                     jelenlegi_x = 2;
                                     jelenlegi_y = 2;
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     twotwocount++;
                                     if (kingcasinolepes1.activeSelf == true) {
                                         kingcasinolepes2.SetActive(true);
@@ -880,7 +848,8 @@ public class movement : MonoBehaviour {
                         if (feltoltolepes1.activeSelf == true & feltoltolepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (jelenlegi_x == 2 && jelenlegi_y == 3)
                                 {
                                     tavolsag = 2;
@@ -891,8 +860,6 @@ public class movement : MonoBehaviour {
                                     jelenlegi_y = 2;
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     threetwocount++;
                                     if (feltoltolepes1.activeSelf == true) {
                                         feltoltolepes2.SetActive(true);
@@ -926,15 +893,14 @@ public class movement : MonoBehaviour {
                         if (kutatolaborlepes1.activeSelf == true & kutatolaborlepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (onethreecount < 2) {
                                     player.transform.position = onethree.transform.position;
                                     jelenlegi_x = 1;
                                     jelenlegi_y = 3;
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     onethreecount++;
                                     if (kutatolaborlepes1.activeSelf == true) {
                                         kutatolaborlepes2.SetActive(true);
@@ -968,7 +934,8 @@ public class movement : MonoBehaviour {
                         if (kriptoklublepes1.activeSelf == true & kriptoklublepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (jelenlegi_x == 3 && jelenlegi_y == 2)
                                 {
                                     tavolsag = 2;
@@ -979,8 +946,6 @@ public class movement : MonoBehaviour {
                                     jelenlegi_y = 3;
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     twothreecount++;
                                     if (kriptoklublepes1.activeSelf == true) {
                                         kriptoklublepes2.SetActive(true);
@@ -1015,15 +980,14 @@ public class movement : MonoBehaviour {
                         if (cyberplazalepes1.activeSelf == true & cyberplazalepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (threethreecount < 2) {
                                     player.transform.position = threethree.transform.position;
                                     jelenlegi_x = 3;
                                     jelenlegi_y = 3;
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     threethreecount++;
                                     if (cyberplazalepes1.activeSelf == true) {
                                         cyberplazalepes2.SetActive(true);
@@ -1057,15 +1021,14 @@ public class movement : MonoBehaviour {
                         if (hadiuzemlepes1.activeSelf == true & hadiuzemlepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (onefourcount < 2) {
                                     player.transform.position = onefour.transform.position;
                                     jelenlegi_x = 1;
                                     jelenlegi_y = 4;
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     onefourcount++;
                                     if (hadiuzemlepes1.activeSelf == true) {
                                         hadiuzemlepes2.SetActive(true);
@@ -1099,15 +1062,14 @@ public class movement : MonoBehaviour {
                         if (konyvtarlepes1.activeSelf == true & konyvtarlepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (twofourcount < 2) {
                                     player.transform.position = twofour.transform.position;
                                     jelenlegi_x = 2;
                                     jelenlegi_y = 4;
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     twofourcount++;
                                     if (konyvtarlepes1.activeSelf == true) {
                                         konyvtarlepes2.SetActive(true);
@@ -1141,15 +1103,14 @@ public class movement : MonoBehaviour {
                         if (korhazlepes1.activeSelf == true & korhazlepes2.activeSelf == true) {
                             Debug.Log("Maximum k<>tszer l<>phetsz egy mez<65>re");
                         } else {
-                            if (tavolsag <= ap.akciopont && ap.akciopont > 0) {
+                            if (tavolsag <= ap.akciopont && ap.akciopont > 0 && tavolsag != 0)
+                            {
                                 if (threefourcount < 2) {
                                     player.transform.position = threefour.transform.position;
                                     jelenlegi_x = 3;
                                     jelenlegi_y = 4;
                                     ap.akciopont = ap.akciopont - tavolsag;
                                     Debug.Log(ap.akciopont);
-                                    //Ugynokok sorsorlasa a helyre
-                                    ugynok.UgynokSorsolas(jelenlegi_x, jelenlegi_y);
                                     threefourcount++;
                                     if (korhazlepes1.activeSelf == true) {
                                         korhazlepes2.SetActive(true);

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -19,16 +19,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1366
-    height: 635
+    width: 1920
+    height: 947
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-<<<<<<< HEAD
-  controlID: 374
-=======
-  controlID: 847
->>>>>>> 6ddca2faf0b77d5b62b9d6ad931e04e9ff4541fc
+  controlID: 75
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -49,10 +45,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 218
+    x: 306
     y: 73
-    width: 739
-    height: 364
+    width: 1040
+    height: 553
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -63,7 +59,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 739, y: 343}
+  m_TargetSize: {x: 1040, y: 532}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -78,10 +74,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -369.5
-    m_HBaseRangeMax: 369.5
-    m_VBaseRangeMin: -171.5
-    m_VBaseRangeMax: 171.5
+    m_HBaseRangeMin: -520
+    m_HBaseRangeMax: 520
+    m_VBaseRangeMin: -266
+    m_VBaseRangeMax: 266
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -99,23 +95,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 739
-      height: 343
+      width: 1040
+      height: 532
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 369.5, y: 171.5}
+    m_Translation: {x: 520, y: 266}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -369.5
-      y: -171.5
-      width: 739
-      height: 343
+      x: -520
+      y: -266
+      width: 1040
+      height: 532
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 739, y: 364}
+  m_LastWindowPixelSize: {x: 1040, y: 553}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -140,16 +136,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 959
-    height: 635
+    width: 1348
+    height: 947
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-<<<<<<< HEAD
-  controlID: 375
-=======
-  controlID: 848
->>>>>>> 6ddca2faf0b77d5b62b9d6ad931e04e9ff4541fc
+  controlID: 76
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -169,16 +161,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 959
-    height: 385
+    width: 1348
+    height: 574
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-<<<<<<< HEAD
-  controlID: 376
-=======
-  controlID: 849
->>>>>>> 6ddca2faf0b77d5b62b9d6ad931e04e9ff4541fc
+  controlID: 51
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -196,8 +184,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 218
-    height: 385
+    width: 306
+    height: 574
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 6}
@@ -227,8 +215,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 217
-    height: 364
+    width: 305
+    height: 553
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -238,11 +226,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-<<<<<<< HEAD
       m_ExpandedIDs: 20fbffff
-=======
-      m_ExpandedIDs: aeddffff2adeffffd0e1fffff2e1ffff8cf3ffff08f4ffffaaf7ffffc8f7ffff1efbffff
->>>>>>> 6ddca2faf0b77d5b62b9d6ad931e04e9ff4541fc
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -281,10 +265,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 218
+    x: 306
     y: 0
-    width: 741
-    height: 385
+    width: 1042
+    height: 574
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 2}
@@ -566,16 +550,16 @@ MonoBehaviour:
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
   m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
-  m_SceneIsLit: 0
+  m_SceneIsLit: 1
   m_SceneLighting: 1
   m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -6.6550636, y: 2.4831932, z: -0.021597017}
+    m_Target: {x: -4.5465274, y: -1.4268839, z: -0.07916484}
     speed: 2
-    m_Value: {x: -6.6550636, y: 2.4831932, z: -0.021597017}
+    m_Value: {x: -4.5465274, y: -1.4268839, z: -0.07916484}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -626,9 +610,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 8.307541
+    m_Target: 10.31249
     speed: 2
-    m_Value: 8.307541
+    m_Value: 10.31249
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -669,15 +653,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-<<<<<<< HEAD
     y: 574
     width: 1348
     height: 373
-=======
-    y: 385
-    width: 959
-    height: 250
->>>>>>> 6ddca2faf0b77d5b62b9d6ad931e04e9ff4541fc
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
   m_ActualView: {fileID: 10}
@@ -708,9 +686,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 458
-    width: 958
-    height: 229
+    y: 647
+    width: 1347
+    height: 352
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -736,20 +714,14 @@ MonoBehaviour:
   m_LastFolders:
   - Assets/Scripts
   m_LastFoldersGridSize: 71
-  m_LastProjectPath: C:\dev\find the source
+  m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-<<<<<<< HEAD
     m_SelectedIDs: 84770000
     m_LastClickedID: 30596
     m_ExpandedIDs: 000000005c7700005e77000060770000
-=======
-    m_SelectedIDs: 76770000
-    m_LastClickedID: 30582
-    m_ExpandedIDs: 000000005c77000000ca9a3bffffff7f
->>>>>>> 6ddca2faf0b77d5b62b9d6ad931e04e9ff4541fc
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -777,11 +749,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-<<<<<<< HEAD
     m_ExpandedIDs: 000000005c7700005e77000060770000
-=======
-    m_ExpandedIDs: 000000005c77000000ca9a3bffffff7f
->>>>>>> 6ddca2faf0b77d5b62b9d6ad931e04e9ff4541fc
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -833,7 +801,7 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 86.498474}
+    m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 71
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 164
@@ -1056,15 +1024,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 959
+    x: 1348
     y: 0
-<<<<<<< HEAD
     width: 572
     height: 947
-=======
-    width: 407
-    height: 635
->>>>>>> 6ddca2faf0b77d5b62b9d6ad931e04e9ff4541fc
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 14}
@@ -1092,10 +1055,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 959
+    x: 1348
     y: 73
-    width: 406
-    height: 614
+    width: 571
+    height: 926
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default

UserSettings/Layouts/default-2021.dwlt

@@ -16,8 +16,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 43
-    width: 1366
-    height: 685
+    width: 1920
+    height: 997
   m_ShowMode: 4
   m_Title: Hierarchy
   m_RootView: {fileID: 2}
@@ -44,8 +44,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1366
-    height: 685
+    width: 1920
+    height: 997
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -69,7 +69,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1366
+    width: 1920
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -90,8 +90,8 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 665
-    width: 1366
+    y: 977
+    width: 1920
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -114,12 +114,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1366
-    height: 635
+    width: 1920
+    height: 947
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 958
+  controlID: 509
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -139,12 +139,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 959
-    height: 635
+    width: 1348
+    height: 947
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 959
+  controlID: 514
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -164,12 +164,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 959
-    height: 385
+    width: 1348
+    height: 574
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 960
+  controlID: 515
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -187,8 +187,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 218
-    height: 385
+    width: 306
+    height: 574
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 13}
@@ -211,10 +211,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 218
+    x: 306
     y: 0
-    width: 741
-    height: 385
+    width: 1042
+    height: 574
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 12}
@@ -239,9 +239,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 385
-    width: 959
-    height: 250
+    y: 574
+    width: 1348
+    height: 373
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
   m_ActualView: {fileID: 15}
@@ -266,10 +266,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 959
+    x: 1348
     y: 0
-    width: 407
-    height: 635
+    width: 572
+    height: 947
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 18}
@@ -297,10 +297,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 218
+    x: 306
     y: 73
-    width: 739
-    height: 364
+    width: 1040
+    height: 553
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -311,7 +311,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 739, y: 343}
+  m_TargetSize: {x: 1040, y: 532}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -326,10 +326,10 @@ MonoBehaviour:
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -369.5
-    m_HBaseRangeMax: 369.5
-    m_VBaseRangeMin: -171.5
-    m_VBaseRangeMax: 171.5
+    m_HBaseRangeMin: -520
+    m_HBaseRangeMax: 520
+    m_VBaseRangeMin: -266
+    m_VBaseRangeMax: 266
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -347,23 +347,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 739
-      height: 343
+      width: 1040
+      height: 532
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 369.5, y: 171.5}
+    m_Translation: {x: 520, y: 266}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -369.5
-      y: -171.5
-      width: 739
-      height: 343
+      x: -520
+      y: -266
+      width: 1040
+      height: 532
     m_MinimalGUI: 1
   m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 739, y: 364}
+  m_LastWindowPixelSize: {x: 1040, y: 553}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -391,8 +391,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 217
-    height: 364
+    width: 305
+    height: 553
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -402,7 +402,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: aeddffff2adeffffd0e1fffff2e1ffff8cf3ffff08f4ffffaaf7ffffc8f7ffff1efbffff
+      m_ExpandedIDs: 20fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -699,16 +699,16 @@ MonoBehaviour:
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
   m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
-  m_SceneIsLit: 0
+  m_SceneIsLit: 1
   m_SceneLighting: 1
   m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -6.6550636, y: 2.4831932, z: -0.021597017}
+    m_Target: {x: -4.5465274, y: -1.4268839, z: -0.07916484}
     speed: 2
-    m_Value: {x: -6.6550636, y: 2.4831932, z: -0.021597017}
+    m_Value: {x: -4.5465274, y: -1.4268839, z: -0.07916484}
   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: 8.307541
+    m_Target: 10.31249
     speed: 2
-    m_Value: 8.307541
+    m_Value: 10.31249
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -807,9 +807,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 458
-    width: 958
-    height: 229
+    y: 647
+    width: 1347
+    height: 352
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -835,14 +835,14 @@ MonoBehaviour:
   m_LastFolders:
   - Assets/Scripts
   m_LastFoldersGridSize: 71
-  m_LastProjectPath: C:\dev\find the source
+  m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 76770000
-    m_LastClickedID: 30582
-    m_ExpandedIDs: 000000005c77000000ca9a3bffffff7f
+    m_SelectedIDs: 84770000
+    m_LastClickedID: 30596
+    m_ExpandedIDs: 000000005c7700005e77000060770000
     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: 000000005c7700005e77000060770000
     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: 0}
     m_GridSize: 71
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 164
@@ -1150,10 +1150,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 959
+    x: 1348
     y: 73
-    width: 406
-    height: 614
+    width: 571
+    height: 926
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default