diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 62011de..0e9379c 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -3657,50 +3657,100 @@ MonoBehaviour: - {fileID: 1326456196} - {fileID: 144640423} - {fileID: 833259107} + oneoneCollider: + - {fileID: 416499492} + - {fileID: 1541006005} + - {fileID: 2013586993} twoone: - {fileID: 1201900458} - {fileID: 605592371} - {fileID: 1216668348} + twooneCollider: + - {fileID: 1624401003} + - {fileID: 1022299900} + - {fileID: 482097724} threeone: - {fileID: 1557522799} - {fileID: 494324061} - {fileID: 169295795} + threeoneCollider: + - {fileID: 508890158} + - {fileID: 1982496777} + - {fileID: 1374165778} onetwo: - {fileID: 325852436} - {fileID: 2139851218} - {fileID: 1429282887} + onetwoCollider: + - {fileID: 893820169} + - {fileID: 1328647951} + - {fileID: 236305771} twotwo: - {fileID: 181786101} - {fileID: 1323862075} - {fileID: 2084459196} + twotwoCollider: + - {fileID: 1615015558} + - {fileID: 1954876564} + - {fileID: 974343173} threetwo: - {fileID: 1677562173} - {fileID: 1084869153} - {fileID: 473458443} + threetwoCollider: + - {fileID: 1297498738} + - {fileID: 293544120} + - {fileID: 2137211082} onethree: - {fileID: 280090609} - {fileID: 1647177067} - {fileID: 1995086240} + onethreeCollider: + - {fileID: 706540132} + - {fileID: 683300588} + - {fileID: 1397901026} twothree: - {fileID: 2107810768} - {fileID: 2141320755} - {fileID: 720969165} + twothreeCollider: + - {fileID: 798647103} + - {fileID: 430026346} + - {fileID: 1570926430} threethree: - {fileID: 1374738211} - {fileID: 815573860} - {fileID: 1962024232} + threethreeCollider: + - {fileID: 1564652874} + - {fileID: 788057597} + - {fileID: 1002673360} onefour: - {fileID: 694600666} - {fileID: 2026770335} - {fileID: 1872052770} + onefourCollider: + - {fileID: 542154673} + - {fileID: 1678558476} + - {fileID: 421286395} twofour: - {fileID: 981449535} - {fileID: 716950397} - {fileID: 1347432663} + twofourCollider: + - {fileID: 1971118424} + - {fileID: 190452685} + - {fileID: 922632583} threefour: - {fileID: 939451652} - {fileID: 1965172624} - {fileID: 1054331718} + threefourCollider: + - {fileID: 1157172197} + - {fileID: 753661018} + - {fileID: 1240172719} + canKill: 0 + maincamera: {fileID: 519420031} --- !u!1 &229807670 GameObject: m_ObjectHideFlags: 0 @@ -6768,9 +6818,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 197904230} - m_TargetAssemblyTypeName: Elet, Assembly-CSharp - m_MethodName: Eletvesztes + - m_Target: {fileID: 197904235} + m_TargetAssemblyTypeName: Ugynok, Assembly-CSharp + m_MethodName: setCanKillTrue m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scripts/Ugynok.cs b/Assets/Scripts/Ugynok.cs index 1c453c0..1ca1a08 100644 --- a/Assets/Scripts/Ugynok.cs +++ b/Assets/Scripts/Ugynok.cs @@ -6,19 +6,39 @@ using TMPro; public class Ugynok : MonoBehaviour { public TMP_Text[] oneone; + public BoxCollider2D[] oneoneCollider; public TMP_Text[] twoone; + public BoxCollider2D[] twooneCollider; public TMP_Text[] threeone; + public BoxCollider2D[] threeoneCollider; public TMP_Text[] onetwo; + public BoxCollider2D[] onetwoCollider; public TMP_Text[] twotwo; + public BoxCollider2D[] twotwoCollider; public TMP_Text[] threetwo; + public BoxCollider2D[] threetwoCollider; public TMP_Text[] onethree; + public BoxCollider2D[] onethreeCollider; public TMP_Text[] twothree; + public BoxCollider2D[] twothreeCollider; public TMP_Text[] threethree; + public BoxCollider2D[] threethreeCollider; public TMP_Text[] onefour; + public BoxCollider2D[] onefourCollider; public TMP_Text[] twofour; + public BoxCollider2D[] twofourCollider; public TMP_Text[] threefour; + public BoxCollider2D[] threefourCollider; - private void Start() { + public bool canKill = false; + public void setCanKillTrue() + { + canKill = true; + } + public Camera maincamera; + + private void Start() + { for (int i = 0; i < oneone.Length; i++) { oneone[i].text = ""; @@ -69,104 +89,641 @@ public class Ugynok : MonoBehaviour { threefour[i].text = ""; } - + } - public void UgynokSorsolas(int x, int y) { - if (x == 1 && y == 1) { - if (oneone[0].text.Equals("")) { + private void Update() + { + if (canKill) + { + //check for collider onclick then x out tmp text then set canKill false + //check if text field is empty + //oneone + if (Input.GetKeyDown(KeyCode.Mouse0) && oneoneCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!oneone[0].text.Equals("")) + { + oneone[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && oneoneCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!oneone[1].text.Equals("")) + { + oneone[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && oneoneCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!oneone[2].text.Equals("")) + { + oneone[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //onetwo + if (Input.GetKeyDown(KeyCode.Mouse0) && onetwoCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onetwo[0].text.Equals("")) + { + onetwo[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onetwoCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onetwo[1].text.Equals("")) + { + onetwo[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onetwoCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onetwo[2].text.Equals("")) + { + onetwo[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //onethree + if (Input.GetKeyDown(KeyCode.Mouse0) && onethreeCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onethree[0].text.Equals("")) + { + onethree[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onethreeCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onethree[1].text.Equals("")) + { + onethree[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onethreeCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onethree[2].text.Equals("")) + { + onethree[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //onefour + if (Input.GetKeyDown(KeyCode.Mouse0) && onefourCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onefour[0].text.Equals("")) + { + onefour[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onefourCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onefour[1].text.Equals("")) + { + onefour[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && onefourCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!onefour[2].text.Equals("")) + { + onefour[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //twoone + if (Input.GetKeyDown(KeyCode.Mouse0) && twooneCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twoone[0].text.Equals("")) + { + twoone[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twooneCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twoone[1].text.Equals("")) + { + twoone[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twooneCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twoone[2].text.Equals("")) + { + twoone[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //twotwo + if (Input.GetKeyDown(KeyCode.Mouse0) && twotwoCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twotwo[0].text.Equals("")) + { + twotwo[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twotwoCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twotwo[1].text.Equals("")) + { + twotwo[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twotwoCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twotwo[2].text.Equals("")) + { + twotwo[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //twothree + if (Input.GetKeyDown(KeyCode.Mouse0) && twothreeCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twothree[0].text.Equals("")) + { + twothree[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twothreeCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twothree[1].text.Equals("")) + { + twothree[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twothreeCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twothree[2].text.Equals("")) + { + twothree[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //twofour + if (Input.GetKeyDown(KeyCode.Mouse0) && twofourCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twofour[0].text.Equals("")) + { + twofour[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twofourCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twofour[1].text.Equals("")) + { + twofour[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && twofourCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!twofour[2].text.Equals("")) + { + twofour[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //threeone + if (Input.GetKeyDown(KeyCode.Mouse0) && threeoneCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threeone[0].text.Equals("")) + { + threeone[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threeoneCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threeone[1].text.Equals("")) + { + threeone[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threeoneCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threeone[2].text.Equals("")) + { + threeone[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //threetwo + if (Input.GetKeyDown(KeyCode.Mouse0) && threetwoCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threetwo[0].text.Equals("")) + { + threetwo[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threetwoCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threetwo[1].text.Equals("")) + { + threetwo[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threetwoCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threetwo[2].text.Equals("")) + { + threetwo[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //threethree + if (Input.GetKeyDown(KeyCode.Mouse0) && threethreeCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threethree[0].text.Equals("")) + { + threethree[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threethreeCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threethree[1].text.Equals("")) + { + threethree[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threethreeCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threethree[2].text.Equals("")) + { + threethree[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + //threefour + if (Input.GetKeyDown(KeyCode.Mouse0) && threefourCollider[0].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threefour[0].text.Equals("")) + { + threefour[0].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threefourCollider[1].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threefour[1].text.Equals("")) + { + threefour[1].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + else if (Input.GetKeyDown(KeyCode.Mouse0) && threefourCollider[2].OverlapPoint(maincamera.ScreenToWorldPoint(Input.mousePosition))) + { + if (!threefour[2].text.Equals("")) + { + threefour[2].text = "X"; + canKill = false; + } + else + { + Debug.Log("itt nincs ugynok csapat!!!"); + } + } + } + } + + public void UgynokSorsolas(int x, int y) + { + if (x == 1 && y == 1) + { + if (oneone[0].text.Equals("")) + { oneone[0].text = UnityEngine.Random.Range(1, 7).ToString(); - }else if (oneone[1].text.Equals("")) { + } + else if (oneone[1].text.Equals("")) + { oneone[1].text = UnityEngine.Random.Range(1, 7).ToString(); - }else if (oneone[2].text.Equals("")) { + } + else if (oneone[2].text.Equals("")) + { oneone[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 1 && y == 2) { - if (onetwo[0].text.Equals("")) { + } + else if (x == 1 && y == 2) + { + if (onetwo[0].text.Equals("")) + { onetwo[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onetwo[1].text.Equals("")) { + } + else if (onetwo[1].text.Equals("")) + { onetwo[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onetwo[2].text.Equals("")) { + } + else if (onetwo[2].text.Equals("")) + { onetwo[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 1 && y == 3) { - if (onethree[0].text.Equals("")) { + } + else if (x == 1 && y == 3) + { + if (onethree[0].text.Equals("")) + { onethree[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onethree[1].text.Equals("")) { + } + else if (onethree[1].text.Equals("")) + { onethree[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onethree[2].text.Equals("")) { + } + else if (onethree[2].text.Equals("")) + { onethree[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 1 && y == 4) { - if (onefour[0].text.Equals("")) { + } + else if (x == 1 && y == 4) + { + if (onefour[0].text.Equals("")) + { onefour[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onefour[1].text.Equals("")) { + } + else if (onefour[1].text.Equals("")) + { onefour[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (onefour[2].text.Equals("")) { + } + else if (onefour[2].text.Equals("")) + { onefour[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 2 && y == 1) { - if (twoone[0].text.Equals("")) { + } + else if (x == 2 && y == 1) + { + if (twoone[0].text.Equals("")) + { twoone[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twoone[1].text.Equals("")) { + } + else if (twoone[1].text.Equals("")) + { twoone[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twoone[2].text.Equals("")) { + } + else if (twoone[2].text.Equals("")) + { twoone[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 2 && y == 2) { - if (twotwo[0].text.Equals("")) { + } + else if (x == 2 && y == 2) + { + if (twotwo[0].text.Equals("")) + { twotwo[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twotwo[1].text.Equals("")) { + } + else if (twotwo[1].text.Equals("")) + { twotwo[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twotwo[2].text.Equals("")) { + } + else if (twotwo[2].text.Equals("")) + { twotwo[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 2 && y == 3) { - if (twothree[0].text.Equals("")) { + } + else if (x == 2 && y == 3) + { + if (twothree[0].text.Equals("")) + { twothree[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twothree[1].text.Equals("")) { + } + else if (twothree[1].text.Equals("")) + { twothree[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twothree[2].text.Equals("")) { + } + else if (twothree[2].text.Equals("")) + { twothree[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 2 && y == 4) { - if (twofour[0].text.Equals("")) { + } + else if (x == 2 && y == 4) + { + if (twofour[0].text.Equals("")) + { twofour[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twofour[1].text.Equals("")) { + } + else if (twofour[1].text.Equals("")) + { twofour[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (twofour[2].text.Equals("")) { + } + else if (twofour[2].text.Equals("")) + { twofour[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 3 && y == 1) { - if (threeone[0].text.Equals("")) { + } + else if (x == 3 && y == 1) + { + if (threeone[0].text.Equals("")) + { threeone[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threeone[1].text.Equals("")) { + } + else if (threeone[1].text.Equals("")) + { threeone[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threeone[2].text.Equals("")) { + } + else if (threeone[2].text.Equals("")) + { threeone[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 3 && y == 2) { - if (threetwo[0].text.Equals("")) { + } + else if (x == 3 && y == 2) + { + if (threetwo[0].text.Equals("")) + { threetwo[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threetwo[1].text.Equals("")) { + } + else if (threetwo[1].text.Equals("")) + { threetwo[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threetwo[2].text.Equals("")) { + } + else if (threetwo[2].text.Equals("")) + { threetwo[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 3 && y == 3) { - if (threethree[0].text.Equals("")) { + } + else if (x == 3 && y == 3) + { + if (threethree[0].text.Equals("")) + { threethree[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threethree[1].text.Equals("")) { + } + else if (threethree[1].text.Equals("")) + { threethree[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threethree[2].text.Equals("")) { + } + else if (threethree[2].text.Equals("")) + { threethree[2].text = UnityEngine.Random.Range(1, 7).ToString(); } - } else if (x == 3 && y == 4) { - if (threefour[0].text.Equals("")) { + } + else if (x == 3 && y == 4) + { + if (threefour[0].text.Equals("")) + { threefour[0].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threefour[1].text.Equals("")) { + } + else if (threefour[1].text.Equals("")) + { threefour[1].text = UnityEngine.Random.Range(1, 7).ToString(); - } else if (threefour[2].text.Equals("")) { + } + else if (threefour[2].text.Equals("")) + { threefour[2].text = UnityEngine.Random.Range(1, 7).ToString(); } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 23fa33d..d066ac8 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 1511 + controlID: 3990 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 1512 + controlID: 3991 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 1513 + controlID: 3963 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e8f1ffff22fbffff + m_ExpandedIDs: 2afbffffcc6b0000ea6b0000fa6b0000986c0000e06c0000766d0000a86d00001a6e0000686e0000826e0000966e0000106f0000266f0000dc6f000044700000bc700000d47000005a71000074710000e0710000e8710000107200003a720000a672000034730000da73000008740000f67400005c7500007e750000b2750000d47500001476000024760000427600004a760000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -269,8 +269,8 @@ MonoBehaviour: y: 0 width: 1154 height: 555 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 2.9719262, y: -0.14416061, z: -0.024618205} + m_Target: {x: -6.49345, y: -0.15270035, z: -0.25521368} speed: 2 - m_Value: {x: 2.9719262, y: -0.14416061, z: -0.024618205} + m_Value: {x: -6.49345, y: -0.15270035, z: -0.25521368} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.46182 + m_Target: 11.7815 speed: 2 - m_Value: 12.46182 + m_Value: 11.7815 m_Ortho: m_Target: 1 speed: 2 @@ -647,7 +647,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -656,14 +656,14 @@ MonoBehaviour: y: 555 width: 1422 height: 392 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 10} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 11} m_Panes: - {fileID: 10} - {fileID: 11} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -718,9 +718,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 88770000 - m_LastClickedID: 30600 - m_ExpandedIDs: 00000000647700006677000068770000 + m_SelectedIDs: 3e780000 + m_LastClickedID: 30782 + m_ExpandedIDs: 00000000307800003278000034780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -748,7 +748,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000647700006677000068770000 + m_ExpandedIDs: 00000000307800003278000034780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -825,9 +825,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 564 + y: 628 width: 1421 - height: 435 + height: 371 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 7f480cb..83eb9e2 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -73,7 +73,7 @@ MonoBehaviour: height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: MyLayout + m_LastLoadedLayoutName: --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 1763 + controlID: 4318 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 1764 + controlID: 4319 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 1765 + controlID: 4320 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -206,7 +206,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -215,14 +215,14 @@ MonoBehaviour: y: 0 width: 1154 height: 555 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,8 +269,8 @@ MonoBehaviour: y: 0 width: 498 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -401,21 +401,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: f2afffff94b0ffff66b2ffff70b2ffffaeb6ffff50b7ffff22b9ffff2cb9ffffacbdffff52befffff6c1ffff14c2ffffe8f1ffff22fbffffa26b00003e730000fc73000064750000322a0100662a0100962a0100b42a0100c42a0100562b0100982b0100aa2b01001c2c0100482c0100ae2c0100f62c01000a2d01001e2d0100862d01009c2d0100462e0100a82e0100142f01002c2f0100542f0100702f0100ac2f0100c62f0100e42f0100f02f0100263001002e300100363001005030010074300100ac300100da30010062310100c6310100f0310100023201001e3201008a320100c0320100fa32010002330100063301006633010088330100b0330100cc3301000c3401001c34010024340100343401003c340100 + m_ExpandedIDs: 2afbffffcc6b0000ea6b0000fa6b0000986c0000e06c0000766d0000a86d00001a6e0000686e0000826e0000966e0000106f0000266f0000dc6f000044700000bc700000d47000005a71000074710000e0710000e8710000107200003a720000a672000034730000da73000008740000f67400005c7500007e750000b2750000d47500001476000024760000427600004a760000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Collider (32) - m_OriginalName: Collider (32) + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -29074 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 4 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -705,9 +705,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -8.318136, y: 2.1353097, z: -0.048845626} + m_Target: {x: -6.49345, y: -0.15270035, z: -0.25521368} speed: 2 - m_Value: {x: -8.318136, y: 2.1353097, z: -0.048845626} + m_Value: {x: -6.49345, y: -0.15270035, z: -0.25521368} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -758,9 +758,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 11.891162 + m_Target: 11.7815 speed: 2 - m_Value: 11.891162 + m_Value: 11.7815 m_Ortho: m_Target: 1 speed: 2 @@ -826,22 +826,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 88 m_LastFolders: - - Assets/Scripts + - Assets m_LastFoldersGridSize: 88 m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 88770000 - m_LastClickedID: 30600 - m_ExpandedIDs: 00000000647700006677000068770000 + m_SelectedIDs: 30780000 + m_LastClickedID: 30768 + m_ExpandedIDs: 00000000307800003278000034780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000647700006677000068770000 + m_ExpandedIDs: 00000000307800003278000034780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -896,7 +896,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -946,9 +946,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 564 + y: 628 width: 1421 - height: 435 + height: 371 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default