diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 7608716..7d8ce60 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -264,19 +264,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 16285952} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 197904220} - m_TargetAssemblyTypeName: Dice, Assembly-CSharp - m_MethodName: setAdrenalinMegerosites - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &16285952 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3446,8 +3434,26 @@ MonoBehaviour: - {fileID: 21300000, guid: 8d8a82287846c3d4892b15d8ab640d68, type: 3} hely1: {fileID: 1620774317} hely2: {fileID: 921900544} + diceResult: 0000000000000000 + ujertek: valasztottErtek: 0 + adrenalinMegerosites: 0 adrenalinHasznalat: {fileID: 274472943} + confirm: {fileID: 1617719567} + cancel: {fileID: 0} + colliders: + - {fileID: 987029841} + - {fileID: 1580358512} + - {fileID: 829877509} + - {fileID: 146512458} + - {fileID: 1872854} + - {fileID: 1173707738} + - {fileID: 711095008} + - {fileID: 1541045931} + - {fileID: 365563088} + - {fileID: 53063410} + - {fileID: 710452256} + - {fileID: 255844036} dobott: 0 --- !u!114 &197904222 MonoBehaviour: @@ -3907,6 +3913,8 @@ MonoBehaviour: kocka2ertek: {fileID: 762817987} ujertek1: 0 ujertek2: 0 + confirmNewValue: {fileID: 815764584} + cancelNewValue: {fileID: 628297615} targy_szamlalo: 0 adrenalinloket: 0 hackercsatlakozo: 0 @@ -11386,7 +11394,7 @@ GameObject: - component: {fileID: 628297616} - component: {fileID: 628297615} m_Layer: 5 - m_Name: deaktivateInput2 + m_Name: cancelNewValue m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -11410,8 +11418,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 163.36, y: 0} - m_SizeDelta: {x: 51.11, y: 30} + m_AnchoredPosition: {x: 180, y: -42} + m_SizeDelta: {x: 82.68, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &628297615 MonoBehaviour: @@ -11456,19 +11464,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 628297616} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 197904236} - m_TargetAssemblyTypeName: Targyak, Assembly-CSharp - m_MethodName: deactivateInput2 - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &628297616 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13984,11 +13980,11 @@ RectTransform: m_Children: - {fileID: 1345558467} m_Father: {fileID: 891272366} - m_RootOrder: 29 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -42} m_SizeDelta: {x: 250, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &762817987 @@ -15333,7 +15329,7 @@ GameObject: - component: {fileID: 815764585} - component: {fileID: 815764584} m_Layer: 5 - m_Name: deaktivateInput1 + m_Name: confirmNewValue m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -15353,12 +15349,12 @@ RectTransform: m_Children: - {fileID: 1188450186} m_Father: {fileID: 891272366} - m_RootOrder: 28 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 163.36, y: 0} - m_SizeDelta: {x: 51.11, y: 30} + m_AnchoredPosition: {x: 180, y: 0} + m_SizeDelta: {x: 82.68, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &815764584 MonoBehaviour: @@ -15403,19 +15399,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 815764585} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 197904236} - m_TargetAssemblyTypeName: Targyak, Assembly-CSharp - m_MethodName: deactivateInput1 - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &815764585 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17105,8 +17089,8 @@ RectTransform: - {fileID: 83085750} - {fileID: 191744300} - {fileID: 1569152954} - - {fileID: 815764583} - {fileID: 762817986} + - {fileID: 815764583} - {fileID: 628297614} - {fileID: 274472944} m_Father: {fileID: 0} @@ -28682,7 +28666,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 197904220} m_TargetAssemblyTypeName: Dice, Assembly-CSharp - m_MethodName: renderDice + m_MethodName: CallRenderDice m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -33757,19 +33741,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1617719568} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 197904220} - m_TargetAssemblyTypeName: Dice, Assembly-CSharp - m_MethodName: setAdrenalinMegerosites - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 + m_Calls: [] --- !u!114 &1617719568 MonoBehaviour: m_ObjectHideFlags: 0 @@ -38086,7 +38058,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: OK + m_text: cancel m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Scripts/Akciopont.cs b/Assets/Scripts/Akciopont.cs index 20abfa0..3a7d695 100644 --- a/Assets/Scripts/Akciopont.cs +++ b/Assets/Scripts/Akciopont.cs @@ -12,13 +12,13 @@ public class Akciopont : MonoBehaviour // Start is called before the first frame update void Start() { - text.text = "Akciópontok: "; + text.text = "Akciopontok: "; } // Update is called once per frame void Update() { - text.text = "Akciópontok: " + akciopont; + text.text = "Akciopontok: " + akciopont; } public void UpdateAkciopont(int number) { diff --git a/Assets/Scripts/Dice.cs b/Assets/Scripts/Dice.cs index f87d5b0..43d5473 100644 --- a/Assets/Scripts/Dice.cs +++ b/Assets/Scripts/Dice.cs @@ -1,6 +1,7 @@ using System.Collections; using TMPro; using UnityEngine; +using UnityEngine.UI; public class Dice : MonoBehaviour { public Sprite[] diceSides = new Sprite[6]; @@ -12,12 +13,18 @@ public class Dice : MonoBehaviour { private Energia energiasav; private Targyak targyak; - private int[] diceResult = { 0, 0 }; + public int[] diceResult = { 0, 0 }; + public int[] ujertek; public int valasztottErtek; //a jatekos altal valasztott dobott ertek helye private bool locked = false; //ne lehessen ujra kivalasztani a masikat ha mar tortent egy valasztas - private bool adrenalinMegerosites = false; + public bool adrenalinMegerosites = false; public GameObject adrenalinHasznalat; + public Button confirm; + public Button cancel; + + + public BoxCollider2D[] colliders; //getters setters public int[] getDices() { return diceResult; } @@ -73,40 +80,49 @@ public class Dice : MonoBehaviour { return finalSide; } - public void renderDice() { + public void CallRenderDice() => StartCoroutine(renderDice()); + + public IEnumerator renderDice() { do { diceResult[0] = RollDice(); diceResult[1] = RollDice(); - - /*if(targyak.adrenalinloket > 0) { - //text aktivalasa kerdesre hogy akarja e hasznalni a targyat - adrenalinHasznalat.SetActive(true); - //ha igen gomb -> valtozo igaz, targy fv meghivas, deaktivalas - if (adrenalinMegerosites) { - int[] ujertek = targyak.AdrenalinLoket(); - diceResult[0] = ujertek[0]; - diceResult[1] = ujertek[1]; - } - //deaktivalas - adrenalinHasznalat.gameObject.SetActive(false); - adrenalinMegerosites = false; - }*/ } while (diceResult[0] == diceResult[1]); + //lassa a jatekos mit dobott + hely1.sprite = diceSides[diceResult[0]-1]; + hely1.size = new Vector2(38, 38); + + hely2.sprite = diceSides[diceResult[1]-1]; + hely2.size = new Vector2(38, 38); + if(targyak.adrenalinloket > 0) { - Debug.Log("belep"); + //helyszin collider kikapcsolas a gomb miatt + HelyszinKiBekapcs(true); //text aktivalasa kerdesre hogy akarja e hasznalni a targyat - adrenalinHasznalat.SetActive(true); + adrenalinHasznalat.gameObject.SetActive(true); //ha igen gomb -> valtozo igaz, targy fv meghivas, deaktivalas //VARNIA KELL A GOMBRA + var waitForButton = new WaitForUIButtons(confirm, cancel); + yield return waitForButton.Reset(); + + if(waitForButton.PressedButton == confirm){ + adrenalinMegerosites = true; + }else{ + adrenalinMegerosites = false; + } + + adrenalinHasznalat.gameObject.SetActive(false); + if (adrenalinMegerosites) { - int[] ujertek = targyak.AdrenalinLoket(); + Debug.Log("belep"); + targyak.CallAdrenalinLoket(); diceResult[0] = ujertek[0]; diceResult[1] = ujertek[1]; } //deaktivalas - adrenalinHasznalat.gameObject.SetActive(false); + Debug.Log("belep2"); adrenalinMegerosites = false; + HelyszinKiBekapcs(false); } @@ -119,6 +135,29 @@ public class Dice : MonoBehaviour { } + public void HelyszinKiBekapcs(bool kikapcsolas){ + if(kikapcsolas) + foreach(var item in colliders) + item.gameObject.SetActive(false); + else + foreach(var item in colliders) + item.gameObject.SetActive(true); + } + + public IEnumerator waitbutton(){ + Debug.Log("belep wait"); + var waitForButton = new WaitForUIButtons(confirm, cancel); + yield return waitForButton.Reset(); + + if(waitForButton.PressedButton == confirm){ + adrenalinMegerosites = true; + }else{ + adrenalinMegerosites = false; + } + + adrenalinHasznalat.gameObject.SetActive(false); + } + public void setAdrenalinMegerosites(bool adrenalinMegerosites) { this.adrenalinMegerosites = adrenalinMegerosites; } diff --git a/Assets/Scripts/Targyak.cs b/Assets/Scripts/Targyak.cs index 178e39d..1aba397 100644 --- a/Assets/Scripts/Targyak.cs +++ b/Assets/Scripts/Targyak.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using TMPro; using UnityEngine; +using UnityEngine.UI; public class Targyak : MonoBehaviour { @@ -17,6 +18,8 @@ public class Targyak : MonoBehaviour public TMP_InputField kocka2ertek; public int ujertek1; public int ujertek2; + public Button confirmNewValue; + public Button cancelNewValue; public int targy_szamlalo = 0; public int adrenalinloket = 0; @@ -86,26 +89,45 @@ public class Targyak : MonoBehaviour adrenalinloket = 1; } - public int[] AdrenalinLoket() { - //kocka1ertek.text = dice.getDices()[0].ToString(); //maradjon uresen es jelenjen meg kepen a kocka ertekek, hogy while-al varakoztatni lehessen? - //kocka2ertek.text = dice.getDices()[1].ToString(); + public void CallAdrenalinLoket() => StartCoroutine(AdrenalinLoket()); + + public IEnumerator AdrenalinLoket() { + Debug.Log("nefefs"); + kocka1ertek.text = dice.getDices()[0].ToString(); //maradjon uresen es jelenjen meg kepen a kocka ertekek, hogy while-al varakoztatni lehessen? + kocka2ertek.text = dice.getDices()[1].ToString(); + kocka1ertek.gameObject.SetActive(true); //aktivalja az input mezot hogy meg lehessen adni az uj erteket - kocka2ertek.gameObject.SetActive(true); - //ITT IS VARNI KELL? - + kocka2ertek.gameObject.SetActive(true); + + confirmNewValue.gameObject.SetActive(true);//aktivalja a gombot hozza + cancelNewValue.gameObject.SetActive(true); + ujertek1 = int.Parse(kocka1ertek.text); ujertek2 = int.Parse(kocka2ertek.text); //hogy tunik el az elozo? || egymas melle kerul a ket input vagy gomb ami deaktivalja a inputot - int[] eredmeny = {ujertek1, ujertek2}; - return eredmeny; + + //VARNIA KELL A GOMBRA + var waitForButton = new WaitForUIButtons(confirmNewValue, cancelNewValue); + yield return waitForButton.Reset(); + + if(waitForButton.PressedButton == confirmNewValue){ + deactivateInputOk(true); + dice.ujertek[0] = ujertek1; //csak akkor adja at ha leokezta + dice.ujertek[1] = ujertek2; + }else{ + deactivateInputOk(false); + } } - public void deactivateInput1() { + public void deactivateInputOk(bool targyelvesztes) { kocka1ertek.gameObject.SetActive(false); + kocka2ertek.gameObject.SetActive(false); + confirmNewValue.gameObject.SetActive(false);//deaktivalja a gombot hozza + cancelNewValue.gameObject.SetActive(false); + if(targyelvesztes) + adrenalinloket = 0; //targy elvesztese } - public void deactivateInput2(){ - kocka2ertek.gameObject.SetActive(false); - } + public void HackerCsatlakozo() { //kesz //+2 tolteny diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 712a5d7..7d1fc46 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 28 - width: 1366 - height: 672 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Console m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -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: 84 + controlID: 39 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1011 - height: 622 + width: 1421 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 85 + controlID: 40 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1011 - height: 377 + width: 1421 + height: 574 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 86 + controlID: 41 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 221 - height: 377 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 311 + height: 574 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -211,12 +211,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 221 + x: 311 y: 0 - width: 790 - height: 377 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 1110 + height: 574 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -233,23 +233,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 377 - width: 1011 - height: 245 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} + y: 574 + width: 1421 + height: 373 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -265,12 +265,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1011 + x: 1421 y: 0 - width: 355 - 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: 221 - y: 86 - width: 788 - height: 356 + x: 311 + y: 73 + width: 1108 + height: 553 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: 788, y: 335} + m_TargetSize: {x: 1108, y: 532} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -394 - m_HBaseRangeMax: 394 - m_VBaseRangeMin: -167.5 - m_VBaseRangeMax: 167.5 + m_HBaseRangeMin: -554 + m_HBaseRangeMax: 554 + m_VBaseRangeMin: -266 + m_VBaseRangeMax: 266 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: 788 - height: 335 + width: 1108 + height: 532 m_Scale: {x: 1, y: 1} - m_Translation: {x: 394, y: 167.5} + m_Translation: {x: 554, y: 266} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -394 - y: -167.5 - width: 788 - height: 335 + x: -554 + y: -266 + width: 1108 + height: 532 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 788, y: 356} + m_LastWindowPixelSize: {x: 1108, y: 553} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -389,19 +389,19 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 86 - width: 220 - height: 356 + y: 73 + width: 310 + height: 553 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 28fbffff + scrollPos: {x: 0, y: 32} + m_SelectedIDs: a86e0000 + m_LastClickedID: 28328 + m_ExpandedIDs: 1cfbffffca6b0000fe6b0000fe6c0000786d0000b66e00001c700000a8710000c47100005072000062720000b47200003c73000082740000cc74000062750000a0750000da750000e275000024770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 221 - y: 86 - width: 788 - height: 356 + x: 311 + y: 73 + width: 1108 + height: 553 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: -2.9889002, y: 0.2662518, z: 0.06300003} + m_Target: {x: 1.3503404, y: -0.2882778, z: -0.13493726} speed: 2 - m_Value: {x: -2.9889002, y: 0.2662518, z: 0.06300003} + m_Value: {x: 1.3503404, y: -0.2882778, z: -0.13493726} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -758,9 +758,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.8079257 + m_Target: 14.579869 speed: 2 - m_Value: 6.8079257 + m_Value: 14.579869 m_Ortho: m_Target: 1 speed: 2 @@ -806,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 463 - width: 1010 - height: 224 + y: 647 + width: 1420 + height: 352 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -834,14 +834,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts m_LastFoldersGridSize: 66 - m_LastProjectPath: /home/tom/Documents/dev/find the source + m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3a790000 - m_LastClickedID: 31034 - m_ExpandedIDs: 000000001679000000ca9a3b + m_SelectedIDs: 48790000 + m_LastClickedID: 31048 + m_ExpandedIDs: 0000000028790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000016790000 + m_ExpandedIDs: 0000000028790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -894,8 +894,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: fc2d0000 + m_LastClickedInstanceID: 11772 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: @@ -921,7 +921,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 129} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 66 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 @@ -946,9 +946,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 463 - width: 1010 - height: 224 + y: 647 + width: 1420 + height: 352 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -973,10 +973,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1011 - y: 86 - width: 354 - height: 601 + x: 1421 + y: 73 + width: 498 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default