From 02dd8a4076d995d022ccb07b43718f703e767314 Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Mon, 23 Jan 2023 13:03:35 +0100 Subject: [PATCH] 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