From 0bc93bd0906af171ee279a82de95afba3dd19387 Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Tue, 24 Jan 2023 17:07:33 +0100 Subject: [PATCH] helyszinaktivalas, targyak update --- Assets/Scenes/Jatek.unity | 22 ++++ Assets/Scripts/Targyak.cs | 28 ++-- Assets/Scripts/helyszinaktivalas.cs | 91 ++++++------- Packages/manifest.json | 5 +- Packages/packages-lock.json | 58 +++++--- ProjectSettings/ProjectVersion.txt | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 124 +++++++++--------- UserSettings/Layouts/default-2021.dwlt | 114 ++++++++-------- 8 files changed, 252 insertions(+), 194 deletions(-) diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 0e9379c..d23b753 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -3253,6 +3253,7 @@ GameObject: - component: {fileID: 197904233} - component: {fileID: 197904234} - component: {fileID: 197904235} + - component: {fileID: 197904236} m_Layer: 0 m_Name: Mangager m_TagString: Untagged @@ -3750,7 +3751,28 @@ MonoBehaviour: - {fileID: 753661018} - {fileID: 1240172719} canKill: 0 + canShoot: 0 maincamera: {fileID: 519420031} +--- !u!114 &197904236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197904216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2595afc692aed134ab895e537a2c9f73, type: 3} + m_Name: + m_EditorClassIdentifier: + targy_szamlalo: 0 + adrenalinloket: 0 + hackercsatlakozo: 0 + lathatatlanoltozet: 0 + droidgepagyu: 0 + matavtaviranyito: 0 + fustgranat: 0 + lathatatlanOltozetAktivalva: 0 --- !u!1 &229807670 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Targyak.cs b/Assets/Scripts/Targyak.cs index fe401a8..d8c487b 100644 --- a/Assets/Scripts/Targyak.cs +++ b/Assets/Scripts/Targyak.cs @@ -19,6 +19,7 @@ public class Targyak : MonoBehaviour public int matavtaviranyito = 0; public int fustgranat = 0; public bool lathatatlanOltozetAktivalva = false; + private int randomszam; private void Start() { akciok = FindObjectOfType(); @@ -31,7 +32,14 @@ public class Targyak : MonoBehaviour public void RandomTargy() { - int randomszam = UnityEngine.Random.Range(0, 5); + string[] elerheto_targyak = {"Adrenalinloket", "Hacker csatlakozo", "Lathatatlan oltozet", "Droid agyu", "Matav taviranyito", "Alomhozo fustgranat"} ; + + do{ + randomszam = UnityEngine.Random.Range(0, elerheto_targyak.Length); + }while(!elerheto_targyak[randomszam].Equals("")); + + elerheto_targyak[randomszam] = ""; + if (randomszam == 0) { adrenalinloket++; @@ -65,38 +73,38 @@ public class Targyak : MonoBehaviour } public void AdrenalinLoket() { - targy_szamlalo++; + } - public void HackerCsatlakozo() { + public void HackerCsatlakozo() { //kesz //+2 tolteny akciok.Betarazas(2); //+1 elet elet.Eletplusz(); //+1 akcio akciopont.akciopont++; - targy_szamlalo++; + } - public void LathatatlanOltozek() { + public void LathatatlanOltozek() { //kesz //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++; + public void DroidGepagyu() { //kesz + //ugynok cucc ugynok.canKill = true; //barhol meg tud olni ha kattint } public void MatavTaviranyito() { - targy_szamlalo++; + } public void FustGranat() { energia.granatAktivalva = true; - targy_szamlalo++; + } } diff --git a/Assets/Scripts/helyszinaktivalas.cs b/Assets/Scripts/helyszinaktivalas.cs index 1852883..ac8ffbe 100644 --- a/Assets/Scripts/helyszinaktivalas.cs +++ b/Assets/Scripts/helyszinaktivalas.cs @@ -9,20 +9,14 @@ public class helyszinaktivalas : MonoBehaviour private Elet elet; private Akciok akciok; private Targyak targyak; - private Dice dice; private Upgrade upgrade; private Akciopont akciopont; private movement movement; private Ugynok ugynok; - - bool canUpgrade = false; - private int diceResult; - public Sprite[] diceSides = new Sprite[6]; - public SpriteRenderer hely1; + private Energia energia; void Start() { - dice = FindObjectOfType(); akciopont = FindObjectOfType(); movement = FindObjectOfType(); upgrade = FindObjectOfType(); @@ -30,100 +24,107 @@ public class helyszinaktivalas : MonoBehaviour akciok = FindObjectOfType(); elet = FindObjectOfType(); ugynok = FindObjectOfType(); + energia = FindObjectOfType(); } public void HelyszinAktivalas() { - //1-es mez� + //1-es mez� kesz if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 1) { //ugynokcsapat oles barhol tolteny nelkul ugynok.canKill = true; //megolhetunk egy csapatot + akciopont.UpdateAkciopont(-1); + energia.csokkenEnergia(1); + } //2-es mez� -- K�SZ if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 1) { - canUpgrade = true; + upgrade.canUpgrade = true; akciopont.akciopont++; + energia.csokkenEnergia(2); } - //3-es mez� -- K�SZ + //3-es mez� if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 1) { - movement.helyreTeleport(); + movement.helyreTeleport(); //hogy teleportal + energia.csokkenEnergia(1); } - //4-es mez� + //4-es mez� kesz if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 2) { //kapsz egy t�rgyat + targyak.RandomTargy(); + targyak.targy_szamlalo++; + akciopont.UpdateAkciopont(-1); + energia.csokkenEnergia(1); } - //5-es mez� + //5-es mez� kesz if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 2) { - /*diceResult = RollDice(); - hely1.sprite = diceSides[diceResult - 1]; - hely1.size = new Vector2(38, 38); - targyak.targy_szamlalo++;*/ + ///dobj paros +3 ap paratlan -1 energia + int eredmeny = UnityEngine.Random.Range(1,7); + Debug.Log("Dobas eredmeny: " + eredmeny); + if(eredmeny % 2 == 0) + akciopont.UpdateAkciopont(3); //+3ap + else + energia.csokkenEnergia(1); + + akciopont.UpdateAkciopont(-1); } - //6-es mez� + //6-es mez� kesz if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 2) { - //+1 akci� + //+1 akcio + akciopont.UpdateAkciopont(1); } //7-es mez� -- K�SZ if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 3) { //1 fejleszt�s ingyen - canUpgrade = true; - akciopont.akciopont++; + upgrade.canUpgrade = true; + akciopont.UpdateAkciopont(-2); } - //8-es mez� + //8-es mez� kesz if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 3) { - /*diceResult = RollDice(); - hely1.sprite = diceSides[diceResult - 1]; - hely1.size = new Vector2(38, 38); - targyak.targy_szamlalo++;*/ - + //2 kocka dobas egyik +ap masik -energia + int eredmeny1 = UnityEngine.Random.Range(1,7); //+ap + int eredmeny2 = UnityEngine.Random.Range(1,7); //-energia + Debug.Log("Dobas eredmeny elso: "+eredmeny1+ " masodik: " + eredmeny2); + akciopont.UpdateAkciopont(eredmeny1); + energia.csokkenEnergia(eredmeny2); } //9-es mez� -- K�SZ if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 3) { targyak.RandomTargy(); targyak.targy_szamlalo++; + akciopont.UpdateAkciopont(-2); } //10-es mez� -- K�SZ ? if (movement.jelenlegi_x == 1 && movement.jelenlegi_y == 4) { //+4 t�lt�ny akciok.Betarazas(4); + akciopont.UpdateAkciopont(-1); } - //11-es mez� + //11-es mez� kesz if (movement.jelenlegi_x == 2 && movement.jelenlegi_y == 4) { //Dobj! Megkapod a t�rgyat. - - /* diceResult = RollDice(); - hely1.sprite = diceSides[diceResult - 1]; - hely1.size = new Vector2(38, 38); - targyak.targy_szamlalo++;*/ + targyak.RandomTargy(); + targyak.targy_szamlalo++; + energia.csokkenEnergia(1); } //12-es mez� -- K�SZ if (movement.jelenlegi_x == 3 && movement.jelenlegi_y == 4) { - //+1 �let + //+1 elet elet.Eletplusz(); + akciopont.UpdateAkciopont(-1); } } - - - /*private int RollDice() - { - int randomDiceSide = UnityEngine.Random.Range(0, 5); - int finalSide = randomDiceSide + 1; - - Debug.Log(finalSide); - - return finalSide; - }*/ } diff --git a/Packages/manifest.json b/Packages/manifest.json index a25f00e..132b888 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,14 @@ { "dependencies": { - "com.unity.collab-proxy": "1.17.6", + "com.unity.collab-proxy": "1.17.7", "com.unity.feature.2d": "1.0.0", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", - "com.unity.render-pipelines.universal": "12.1.7", + "com.unity.render-pipelines.universal": "12.1.8", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", + "com.unity.toolchain.linux-x86_64": "2.0.4", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.8", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 30961a6..6105e8c 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "7.0.8", + "version": "7.0.9", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.5", + "com.unity.2d.common": "6.0.6", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -13,7 +13,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "6.0.5", + "version": "6.0.6", "depth": 2, "source": "registry", "dependencies": { @@ -32,7 +32,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.pixel-perfect": { - "version": "5.0.1", + "version": "5.0.3", "depth": 1, "source": "registry", "dependencies": {}, @@ -86,7 +86,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.7.3", + "version": "1.8.2", "depth": 1, "source": "registry", "dependencies": { @@ -95,7 +95,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.17.6", + "version": "1.17.7", "depth": 0, "source": "registry", "dependencies": { @@ -115,8 +115,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "7.0.8", - "com.unity.2d.pixel-perfect": "5.0.1", + "com.unity.2d.animation": "7.0.9", + "com.unity.2d.pixel-perfect": "5.0.3", "com.unity.2d.psdimporter": "6.0.6", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.spriteshape": "7.0.6", @@ -155,7 +155,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.7", + "version": "12.1.8", "depth": 1, "source": "builtin", "dependencies": { @@ -165,14 +165,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "12.1.7", + "version": "12.1.8", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.7.3", - "com.unity.render-pipelines.core": "12.1.7", - "com.unity.shadergraph": "12.1.7" + "com.unity.burst": "1.8.2", + "com.unity.render-pipelines.core": "12.1.8", + "com.unity.shadergraph": "12.1.8" } }, "com.unity.searcher": { @@ -183,7 +183,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.4.3", + "version": "1.6.0", "depth": 1, "source": "registry", "dependencies": { @@ -194,14 +194,30 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.7", + "version": "12.1.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.7", + "com.unity.render-pipelines.core": "12.1.8", "com.unity.searcher": "4.9.1" } }, + "com.unity.sysroot": { + "version": "2.0.5", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.5" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 0, @@ -234,6 +250,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.linux-x86_64": { + "version": "2.0.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.5", + "com.unity.sysroot.linux-x86_64": "2.0.4" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b868996..3643b02 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.12f1 -m_EditorVersionWithRevision: 2021.3.12f1 (8af3c3e441b1) +m_EditorVersion: 2021.3.16f1 +m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f) diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 259a51c..5803feb 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -20,11 +20,11 @@ MonoBehaviour: x: 0 y: 30 width: 1366 - height: 635 + height: 622 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 96 + controlID: 83 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,9 +46,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 191 - y: 73 + y: 86 width: 819 - height: 351 + height: 366 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: 819, y: 330} + m_TargetSize: {x: 819, y: 345} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -76,8 +76,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -409.5 m_HBaseRangeMax: 409.5 - m_VBaseRangeMin: -165 - m_VBaseRangeMax: 165 + m_VBaseRangeMin: -172.5 + m_VBaseRangeMax: 172.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -96,9 +96,9 @@ MonoBehaviour: x: 0 y: 21 width: 819 - height: 330 + height: 345 m_Scale: {x: 1, y: 1} - m_Translation: {x: 409.5, y: 165} + m_Translation: {x: 409.5, y: 172.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -106,12 +106,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -409.5 - y: -165 + y: -172.5 width: 819 - height: 330 + height: 345 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 819, y: 351} + m_LastWindowPixelSize: {x: 819, y: 366} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -137,11 +137,11 @@ MonoBehaviour: x: 0 y: 0 width: 1012 - height: 635 + height: 622 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 97 + controlID: 84 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,11 +162,11 @@ MonoBehaviour: x: 0 y: 0 width: 1012 - height: 372 + height: 387 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 98 + controlID: 85 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,9 +185,9 @@ MonoBehaviour: x: 0 y: 0 width: 191 - height: 372 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + height: 387 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -214,9 +214,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 + y: 86 width: 190 - height: 351 + height: 366 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: 18fbffff + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -268,9 +268,9 @@ MonoBehaviour: x: 191 y: 0 width: 821 - height: 372 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + height: 387 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} @@ -298,9 +298,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 191 - y: 73 + y: 86 width: 819 - height: 351 + height: 366 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -6.6550636, y: 2.4831932, z: -0.021597017} + m_Target: {x: -11.670631, y: -3.049128, z: -0.05244342} speed: 2 - m_Value: {x: -6.6550636, y: 2.4831932, z: -0.021597017} + m_Value: {x: -11.670631, y: -3.049128, z: -0.05244342} 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: 8.307541 + m_Target: 8.236867 speed: 2 - m_Value: 8.307541 + m_Value: 8.236867 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: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 372 + y: 387 width: 1012 - height: 263 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 10} + height: 235 + 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 @@ -685,9 +685,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 445 + y: 473 width: 1011 - height: 242 + height: 214 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -705,22 +705,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 + - Assets/Scripts + m_LastFoldersGridSize: 52 + m_LastProjectPath: /home/tom/Documents/dev/find the source m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 40780000 - m_LastClickedID: 30784 - m_ExpandedIDs: 000000004078000000ca9a3bffffff7f + m_SelectedIDs: 8c780000 + m_LastClickedID: 30860 + m_ExpandedIDs: 000000007678000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -748,7 +748,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000040780000 + m_ExpandedIDs: 0000000076780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -773,8 +773,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 686c0000 + m_LastClickedInstanceID: 27752 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: @@ -800,8 +800,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 88 + m_ScrollPosition: {x: 0, y: 16} + m_GridSize: 52 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 --- !u!114 &11 @@ -825,9 +825,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 628 - width: 1421 - height: 371 + y: 473 + width: 1011 + height: 214 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -850,7 +850,7 @@ MonoBehaviour: x: 1012 y: 0 width: 354 - height: 635 + height: 622 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} @@ -879,9 +879,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1012 - y: 73 + y: 86 width: 353 - height: 614 + height: 601 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -892,8 +892,8 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: 27752 + m_LastVerticalScrollValue: 139 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 85472d8..0be598b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -8,22 +8,22 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 + y: 28 width: 1366 - height: 685 + height: 672 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Scene m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,7 +45,7 @@ MonoBehaviour: x: 0 y: 0 width: 1366 - height: 685 + height: 672 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -90,7 +90,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 665 + y: 652 width: 1366 height: 20 m_MinSize: {x: 0, y: 0} @@ -115,11 +115,11 @@ MonoBehaviour: x: 0 y: 30 width: 1366 - height: 635 + height: 622 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 51 + controlID: 95 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,11 +140,11 @@ MonoBehaviour: x: 0 y: 0 width: 1012 - height: 635 + height: 622 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 52 + controlID: 96 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,11 +165,11 @@ MonoBehaviour: x: 0 y: 0 width: 1012 - height: 395 + height: 387 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 53 + controlID: 97 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,7 +188,7 @@ MonoBehaviour: x: 0 y: 0 width: 191 - height: 395 + height: 387 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -206,7 +206,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -214,15 +214,15 @@ MonoBehaviour: x: 191 y: 0 width: 821 - height: 395 + height: 387 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -239,9 +239,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 395 + y: 387 width: 1012 - height: 240 + height: 235 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -268,7 +268,7 @@ MonoBehaviour: x: 1012 y: 0 width: 354 - height: 635 + height: 622 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -297,9 +297,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 191 - y: 73 + y: 86 width: 819 - height: 374 + height: 366 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -310,11 +310,11 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 819, y: 353} + m_TargetSize: {x: 819, y: 345} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 1 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -327,8 +327,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -409.5 m_HBaseRangeMax: 409.5 - m_VBaseRangeMin: -176.5 - m_VBaseRangeMax: 176.5 + m_VBaseRangeMin: -172.5 + m_VBaseRangeMax: 172.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -347,9 +347,9 @@ MonoBehaviour: x: 0 y: 21 width: 819 - height: 353 + height: 345 m_Scale: {x: 1, y: 1} - m_Translation: {x: 409.5, y: 176.5} + m_Translation: {x: 409.5, y: 172.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -357,12 +357,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -409.5 - y: -176.5 + y: -172.5 width: 819 - height: 353 + height: 345 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 819, y: 374} + m_LastWindowPixelSize: {x: 819, y: 366} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -389,9 +389,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 + y: 86 width: 190 - height: 374 + height: 366 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: 22fbffff + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -446,9 +446,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 191 - y: 73 + y: 86 width: 819 - height: 374 + height: 366 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -705,9 +705,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -18.220608, y: -1.7600883, z: -0.04389826} + m_Target: {x: -10.620693, y: -3.3132205, z: -0.04804741} speed: 2 - m_Value: {x: -18.220608, y: -1.7600883, z: -0.04389826} + m_Value: {x: -10.620693, y: -3.3132205, z: -0.04804741} 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.584696 + m_Target: 7.797266 speed: 2 - m_Value: 6.584696 + m_Value: 7.797266 m_Ortho: m_Target: 1 speed: 2 @@ -806,9 +806,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 468 + y: 473 width: 1011 - height: 219 + height: 214 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -834,14 +834,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts m_LastFoldersGridSize: 52 - m_LastProjectPath: C:\dev\find the source + m_LastProjectPath: /home/tom/Documents/dev/find the source m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4c780000 - m_LastClickedID: 30796 - m_ExpandedIDs: 000000003678000000ca9a3bffffff7f + m_SelectedIDs: 8c780000 + m_LastClickedID: 30860 + m_ExpandedIDs: 000000007678000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -869,7 +869,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000036780000 + m_ExpandedIDs: 0000000076780000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -896,7 +896,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -921,7 +921,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 11} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 52 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 193 @@ -946,9 +946,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 628 - width: 1421 - height: 371 + y: 473 + width: 1011 + height: 214 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -974,9 +974,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1012 - y: 73 + y: 86 width: 353 - height: 614 + height: 601 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: 0 + m_LastVerticalScrollValue: 1505.795 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: