From 1aac93d4e244239de47142989fc5c1712bf2d91c Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Tue, 24 Jan 2023 19:35:16 +0100 Subject: [PATCH] jatekmanager + while bug (beta) --- Assets/Scenes/Jatek.unity | 128 +++++++++++------- Assets/Scripts/Akciok.cs | 178 +++++++++++++++++-------- Assets/Scripts/forras.cs | 62 --------- Assets/Scripts/forras.cs.meta | 11 -- Assets/Scripts/jatekmanager.cs | 7 +- UserSettings/Layouts/default-2021.dwlt | 166 +++++++++++------------ 6 files changed, 288 insertions(+), 264 deletions(-) delete mode 100644 Assets/Scripts/forras.cs delete mode 100644 Assets/Scripts/forras.cs.meta diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 5b46ede..c115ee4 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -490,7 +490,7 @@ Transform: - {fileID: 168362747} - {fileID: 255844035} m_Father: {fileID: 1620267093} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &53063408 GameObject: @@ -3254,6 +3254,7 @@ GameObject: - component: {fileID: 197904234} - component: {fileID: 197904235} - component: {fileID: 197904236} + - component: {fileID: 197904237} m_Layer: 0 m_Name: Mangager m_TagString: Untagged @@ -3312,6 +3313,7 @@ MonoBehaviour: hely1: {fileID: 1620774317} hely2: {fileID: 921900544} valasztottErtek: 0 + dobott: 0 --- !u!114 &197904222 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3554,6 +3556,7 @@ MonoBehaviour: - {fileID: 1156037872} - {fileID: 193801832} betarazott_tolteny: 3 + toltenyszamlalo: 0 nyomozas_x: - {fileID: 120887879} - {fileID: 1573977806} @@ -3773,6 +3776,79 @@ MonoBehaviour: matavtaviranyito: 0 fustgranat: 0 lathatatlanOltozetAktivalva: 0 +--- !u!114 &197904237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197904216} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6423cb96f98604ea1be2455ae7cff97d, type: 3} + m_Name: + m_EditorClassIdentifier: + "energiafejleszt\xE9s": {fileID: 652887773} + "akciofejleszt\xE9s": {fileID: 767162772} + "harcfejleszt\xE9s": {fileID: 917471241} + "ujradobasfejleszt\xE9s": {fileID: 723782981} + "hackfejleszt\xE9s": {fileID: 1785481345} + kovetkezokor: {fileID: 1177305936} + betarazas: {fileID: 235549630} + nyomozas: {fileID: 83085749} + hackeles: {fileID: 191744299} + rolldice: {fileID: 1393612611} + test: {fileID: 401176105} + oneone: + - {fileID: 1326456196} + - {fileID: 144640423} + - {fileID: 833259107} + twoone: + - {fileID: 1201900458} + - {fileID: 605592371} + - {fileID: 1216668348} + threeone: + - {fileID: 1557522799} + - {fileID: 494324061} + - {fileID: 169295795} + onetwo: + - {fileID: 325852436} + - {fileID: 2139851218} + - {fileID: 1429282887} + twotwo: + - {fileID: 181786101} + - {fileID: 1323862075} + - {fileID: 2084459196} + threetwo: + - {fileID: 1677562173} + - {fileID: 1084869153} + - {fileID: 473458443} + onethree: + - {fileID: 280090609} + - {fileID: 1647177067} + - {fileID: 1995086240} + twothree: + - {fileID: 2107810768} + - {fileID: 2141320755} + - {fileID: 720969165} + threethree: + - {fileID: 1374738211} + - {fileID: 815573860} + - {fileID: 1962024232} + onefour: + - {fileID: 694600666} + - {fileID: 2026770335} + - {fileID: 1872052770} + twofour: + - {fileID: 981449535} + - {fileID: 716950397} + - {fileID: 1347432663} + threefour: + - {fileID: 939451652} + - {fileID: 1965172624} + - {fileID: 1054331718} + jatekosnyert: 0 + jatekosvesztett: 0 --- !u!1 &229807670 GameObject: m_ObjectHideFlags: 0 @@ -23994,7 +24070,7 @@ Transform: - {fileID: 462887942} - {fileID: 53063409} m_Father: {fileID: 1620267093} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1240172717 GameObject: @@ -25467,7 +25543,7 @@ Transform: - {fileID: 1131695912} - {fileID: 710452255} m_Father: {fileID: 1620267093} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1340209353 GameObject: @@ -32095,9 +32171,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1117282719} + - {fileID: 1228659130} - {fileID: 1339188195} - {fileID: 45666889} - - {fileID: 1228659130} m_Father: {fileID: 85536136} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -42381,47 +42457,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2141320753} m_CullTransparentMesh: 1 ---- !u!1 &2142951057 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2142951059} - - component: {fileID: 2142951058} - m_Layer: 0 - m_Name: jatekmanager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2142951058 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2142951057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6423cb96f98604ea1be2455ae7cff97d, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &2142951059 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2142951057} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.5465274, y: -1.4268839, z: -0.07916484} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Akciok.cs b/Assets/Scripts/Akciok.cs index 4af054a..a49f12d 100644 --- a/Assets/Scripts/Akciok.cs +++ b/Assets/Scripts/Akciok.cs @@ -13,6 +13,8 @@ public class Akciok : MonoBehaviour private int felhasznalt_tolteny = 0; public int betarazott_tolteny = 3; private Akciopont ap; + + public int toltenyszamlalo = 0; // //Nyomozashoz @@ -28,7 +30,7 @@ public class Akciok : MonoBehaviour }; - + // //Hack @@ -46,27 +48,35 @@ public class Akciok : MonoBehaviour private bool omega = false; // - private void Start() { + private void Start() + { ap = FindObjectOfType(); movement = FindObjectOfType(); upgrade = FindObjectOfType(); source = FindObjectOfType(); //kezdesnel karikazza be az elso harom adott toltenyt - for (int i = 0; i < tolteny_index; i++) { + for (int i = 0; i < tolteny_index; i++) + { toltenyek[i].text = "O"; } } - public void Betarazas(int betarazas) { - if (tolteny_index < 24 && ap.akciopont != 0) { - if(tolteny_index + betarazas > 23) { + public void Betarazas(int betarazas) + { + if (tolteny_index < 24 && ap.akciopont != 0) + { + if (tolteny_index + betarazas > 23) + { tolteny_index = 23; - } else { + } + else + { tolteny_index += betarazas; } //felhasznalt toltenytol megy hogy az ott levo x-et ne irja felul - for (int i = felhasznalt_tolteny; i < tolteny_index; i++) { + for (int i = felhasznalt_tolteny; i < tolteny_index; i++) + { toltenyek[i].text = "O"; } @@ -79,20 +89,29 @@ public class Akciok : MonoBehaviour } } - public bool Loves(int elhasznalt_toltenyek) { - if (felhasznalt_tolteny < betarazott_tolteny) { - if (felhasznalt_tolteny + elhasznalt_toltenyek > betarazott_tolteny) { + 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 false; - } else { + } + else + { felhasznalt_tolteny += elhasznalt_toltenyek; - for (int i = 0; i < felhasznalt_tolteny; i++) { + for (int i = 0; i < felhasznalt_tolteny; i++) + { toltenyek[i].text = "X"; } betarazott_tolteny -= elhasznalt_toltenyek; + toltenyszamlalo = toltenyszamlalo + elhasznalt_toltenyek; } return true; - } else { + } + else + { Debug.Log("Nincs eleg tolteny"); return false; } @@ -100,31 +119,41 @@ public class Akciok : MonoBehaviour //Nyomozas - public void Nyomozas() { - if (ap.akciopont <= 0) { + public void Nyomozas() + { + if (ap.akciopont <= 0) + { Debug.Log("nincs eleg akciopont"); return; } - + int atirandox = movement.jelenlegi_x - 1; int atirandoy = movement.jelenlegi_y - 1; - if (nyomozasok[atirandoy, atirandox] == "nyomozott") { + if (nyomozasok[atirandoy, atirandox] == "nyomozott") + { Debug.Log("Itt mar nyomoztal"); return; - } else { + } + else + { nyomozasok[atirandoy, atirandox] = "nyomozott"; } int counter = 0; //egy sorral feljebb megy - for (int i = 0; i < nyomozasok.GetLength(0); i++) { - for (int j = 0; j < nyomozasok.GetLength(1); j++) { - if (nyomozasok[i, j].Equals("nyomozott")) { + for (int i = 0; i < nyomozasok.GetLength(0); i++) + { + for (int j = 0; j < nyomozasok.GetLength(1); j++) + { + if (nyomozasok[i, j].Equals("nyomozott")) + { nyomozas_x[counter].text = "X"; counter++; - Debug.Log("counter: "+ counter); - } else if (nyomozasok[i,j].Equals("ures")) { + Debug.Log("counter: " + counter); + } + else if (nyomozasok[i, j].Equals("ures")) + { counter++; } } @@ -135,9 +164,11 @@ public class Akciok : MonoBehaviour NyomozasOszlopCheck(); Debug.Log("----------------"); - for (int i = 0; i < nyomozasok.GetLength(0); i++) { + for (int i = 0; i < nyomozasok.GetLength(0); i++) + { string sor = ""; - for (int j = 0; j < nyomozasok.GetLength(1); j++) { + for (int j = 0; j < nyomozasok.GetLength(1); j++) + { sor += nyomozasok[i, j] + " "; } Debug.Log(sor); @@ -145,12 +176,15 @@ public class Akciok : MonoBehaviour Debug.Log("----------------"); } - private void NyomozasOszlopCheck() { - int oszlop = movement.jelenlegi_x-1; + private void NyomozasOszlopCheck() + { + int oszlop = movement.jelenlegi_x - 1; int nyomozas_counter = 0; - for (int i = 0; i < 4; i++) { - if (nyomozasok[i, oszlop].Equals("nyomozott")) { + for (int i = 0; i < 4; i++) + { + if (nyomozasok[i, oszlop].Equals("nyomozott")) + { nyomozas_counter++; //Debug.Log(nyomozasok[i, oszlop]); } @@ -158,7 +192,8 @@ public class Akciok : MonoBehaviour Debug.Log("nyomozas counter: " + nyomozas_counter); - if(nyomozas_counter == 4) { + if (nyomozas_counter == 4) + { ap.akciopont += 2; Debug.Log("Ap novelve"); nyomozas_oszlop[oszlop].text = "X"; @@ -166,82 +201,111 @@ public class Akciok : MonoBehaviour } - public void Hack() { + public void Hack() + { int count = 0; int rand; - if(ap.akciopont < upgrade.hack[upgrade.getHackIndex()]) { //van e eleg akicopont + if (ap.akciopont < upgrade.hack[upgrade.getHackIndex()]) + { //van e eleg akicopont Debug.Log("nincs eleg ap a hackeleshez"); return; } int i2 = 0; - try { + try + { //egy sorban lett e ketszer nyomozva - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) + { //Debug.Log("Belep for"); - if (nyomozasok[movement.jelenlegi_y-1, i] == "nyomozott") { + if (nyomozasok[movement.jelenlegi_y - 1, i] == "nyomozott") + { count++; Debug.Log("count: " + count); - i2= i; + i2 = i; } } - }catch(IndexOutOfRangeException) { + } + catch (IndexOutOfRangeException) + { Debug.Log("hiba volt"); Debug.Log("i: " + i2 + " y" + movement.jelenlegi_y); } - + //forras helyenek bejelolese - if(count >= 2 && !hackelt_sorok.Contains(movement.jelenlegi_y)) { + if (count >= 2 && !hackelt_sorok.Contains(movement.jelenlegi_y)) + { Debug.Log("belep"); - if (movement.jelenlegi_y == 1){ + if (movement.jelenlegi_y == 1) + { elso_sor_text.text = "X"; - hackelt_sorok[movement.jelenlegi_y-1] = movement.jelenlegi_y; + hackelt_sorok[movement.jelenlegi_y - 1] = movement.jelenlegi_y; source.isNyitva = true; - }else { + } + else + { rand = UnityEngine.Random.Range(1, 7); Debug.Log("sorsolt szam: " + rand); - if(movement.jelenlegi_y == 2) { //alpha, omega - if(rand < 4) { + if (movement.jelenlegi_y == 2) + { //alpha, omega + if (rand < 4) + { masodik_sor[0].text = "X"; alpha = true; source.sor.Remove(3);//3. sor kiszedes source.sor.Remove(4);//4. sor kiszedes - } else { + } + else + { masodik_sor[1].text = "X"; omega = true; source.sor.Remove(1);//1. sor kiszedes source.sor.Remove(2);//2. sor kiszedes } - hackelt_sorok[movement.jelenlegi_y-1] = movement.jelenlegi_y; - } else if(movement.jelenlegi_y == 3) {//sor - if (rand < 4) { + hackelt_sorok[movement.jelenlegi_y - 1] = movement.jelenlegi_y; + } + else if (movement.jelenlegi_y == 3) + {//sor + if (rand < 4) + { harmadik_sor[0].text = "X"; source.sor.Remove(2);//2. sor kiszedes source.sor.Remove(4);//4. sor kiszedes - } else { + } + else + { harmadik_sor[1].text = "X"; source.sor.Remove(1);//2. sor kiszedes source.sor.Remove(3);//4. sor kiszedes } - hackelt_sorok[movement.jelenlegi_y-1] = movement.jelenlegi_y; - } else if(movement.jelenlegi_y == 4) { - if(rand < 3) { + hackelt_sorok[movement.jelenlegi_y - 1] = movement.jelenlegi_y; + } + else if (movement.jelenlegi_y == 4) + { + if (rand < 3) + { negyedik_sor[0].text = "X"; source.oszlop = 1; - }else if( rand < 5) { + } + else if (rand < 5) + { negyedik_sor[1].text = "X"; source.oszlop = 2; - } else { + } + else + { negyedik_sor[2].text = "X"; source.oszlop = 3; } - hackelt_sorok[movement.jelenlegi_y-1] = movement.jelenlegi_y; + hackelt_sorok[movement.jelenlegi_y - 1] = movement.jelenlegi_y; } } ap.akciopont -= upgrade.hack[upgrade.getHackIndex()]; //ap koltseg levonasa - } else { + } + else + { Debug.Log("itt mar hackeltel"); } diff --git a/Assets/Scripts/forras.cs b/Assets/Scripts/forras.cs deleted file mode 100644 index b64d728..0000000 --- a/Assets/Scripts/forras.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class forras : MonoBehaviour -{ - int hackcounter = 0; - private int[] sourcegenerate = new int[4]; - - // Start is called before the first frame update - void Start() - { - - - } - - // Update is called once per frame - void Update() - { - - - } - - public void Generate() - { - for (int i = 0; i < 2; i++) - { - if (hackcounter == 0) - { - int random = UnityEngine.Random.Range(0, 2); - sourcegenerate[1] = random; - //Debug.Log(sourcegenerate[0]); - hackcounter++; - } - if (hackcounter == 1) - { - int random = UnityEngine.Random.Range(0, 3); - sourcegenerate[2] = random; - //Debug.Log(sourcegenerate[1]); - hackcounter++; - } - if (hackcounter == 2) - { - int random = UnityEngine.Random.Range(0, 1); - sourcegenerate[3] = random; - //Debug.Log(sourcegenerate[2]); - hackcounter++; - } - if (hackcounter == 3) - { - hackcounter = 0; - break; - } - - } - for (int i = 0; i < sourcegenerate.Length; i++) - { - Debug.Log(sourcegenerate[i]); - } - - } -} diff --git a/Assets/Scripts/forras.cs.meta b/Assets/Scripts/forras.cs.meta deleted file mode 100644 index a0350fb..0000000 --- a/Assets/Scripts/forras.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bee9e4be02e78e64abdc9eb32bca8752 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index 75dbe84..a444ddd 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -60,7 +60,6 @@ public class jatekmanager : MonoBehaviour movement = FindObjectOfType(); turnManager = FindObjectOfType(); source = FindObjectOfType(); - } // Update is called once per frame @@ -84,11 +83,13 @@ public class jatekmanager : MonoBehaviour hackeles.SetActive(false); test.SetActive(false); - while (dice.dobott < upgrade.getUjradobasIndex() + 1 && dice.getLocked() != true) + + //ez rossz!!!! + /*while (dice.dobott < upgrade.getUjradobasIndex() + 1 && dice.getLocked() != true) { //eddig újradobhat - } + }*/ rolldice.SetActive(false); diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 0be598b..8424706 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,15 +15,15 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 28 - width: 1366 - height: 672 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Scene + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 - height: 672 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 652 - width: 1366 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 622 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 95 + controlID: 94 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1012 - height: 622 + width: 1421 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 96 + controlID: 95 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1012 - height: 387 + width: 1421 + height: 589 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 97 + controlID: 96 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,8 +187,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 191 - height: 387 + width: 268 + height: 589 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -211,10 +211,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 191 + x: 268 y: 0 - width: 821 - height: 387 + width: 1153 + height: 589 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -239,9 +239,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 387 - width: 1012 - height: 235 + y: 589 + width: 1421 + height: 358 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -265,12 +265,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1012 + x: 1421 y: 0 - width: 354 - height: 622 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 499 + height: 947 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 191 - y: 86 - width: 819 - height: 366 + x: 268 + y: 73 + width: 1151 + height: 568 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -310,7 +310,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 819, y: 345} + m_TargetSize: {x: 1151, y: 547} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -409.5 - m_HBaseRangeMax: 409.5 - m_VBaseRangeMin: -172.5 - m_VBaseRangeMax: 172.5 + m_HBaseRangeMin: -575.5 + m_HBaseRangeMax: 575.5 + m_VBaseRangeMin: -273.5 + m_VBaseRangeMax: 273.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -337,7 +337,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 819 - height: 345 + width: 1151 + height: 547 m_Scale: {x: 1, y: 1} - m_Translation: {x: 409.5, y: 172.5} + m_Translation: {x: 575.5, y: 273.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -409.5 - y: -172.5 - width: 819 - height: 345 + x: -575.5 + y: -273.5 + width: 1151 + height: 547 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 819, y: 366} + m_LastWindowPixelSize: {x: 1151, y: 568} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -389,9 +389,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 190 - height: 366 + y: 73 + width: 267 + height: 568 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -401,7 +401,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 28fbffff + m_ExpandedIDs: 18eaffffbaeaffff4aeeffff68eeffffe8f2ffff8ef3ffff22f7ffff44f7ffff2cfbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 191 - y: 86 - width: 819 - height: 366 + x: 268 + y: 73 + width: 1151 + height: 568 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -698,16 +698,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 0 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -10.620693, y: -3.3132205, z: -0.04804741} + m_Target: {x: -11.833951, y: -4.035131, z: 0.27219582} speed: 2 - m_Value: {x: -10.620693, y: -3.3132205, z: -0.04804741} + m_Value: {x: -11.833951, y: -4.035131, z: 0.27219582} 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: 7.797266 + m_Target: 10.312159 speed: 2 - m_Value: 7.797266 + m_Value: 10.312159 m_Ortho: m_Target: 1 speed: 2 @@ -806,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 473 - width: 1011 - height: 214 + y: 662 + width: 1420 + height: 337 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -830,18 +830,18 @@ MonoBehaviour: m_Globs: [] m_OriginalText: m_ViewMode: 1 - m_StartGridSize: 52 + m_StartGridSize: 66 m_LastFolders: - Assets/Scripts - m_LastFoldersGridSize: 52 - m_LastProjectPath: /home/tom/Documents/dev/find the source + m_LastFoldersGridSize: 66 + m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 8c780000 - m_LastClickedID: 30860 - m_ExpandedIDs: 000000007678000000ca9a3bffffff7f + m_SelectedIDs: 92780000 + m_LastClickedID: 30866 + m_ExpandedIDs: 00000000827800008478000086780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000076780000 + m_ExpandedIDs: 00000000827800008478000086780000 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 @@ -922,7 +922,7 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 52 + m_GridSize: 66 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 --- !u!114 &16 @@ -946,9 +946,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 473 - width: 1011 - height: 214 + y: 662 + width: 1420 + height: 337 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -973,10 +973,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1012 - y: 86 - width: 353 - height: 601 + x: 1421 + y: 73 + width: 498 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -988,7 +988,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 1505.795 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: