diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 07d71c2..7f7ec91 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -2232,6 +2232,7 @@ GameObject: - component: {fileID: 197904221} - component: {fileID: 197904222} - component: {fileID: 197904223} + - component: {fileID: 197904224} m_Layer: 0 m_Name: Mangager m_TagString: Untagged @@ -2247,7 +2248,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 197904216} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -8.464, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2289,7 +2290,6 @@ MonoBehaviour: - {fileID: 21300000, guid: 8d8a82287846c3d4892b15d8ab640d68, type: 3} hely1: {fileID: 1620774317} hely2: {fileID: 921900544} - akcioponthely: {fileID: 961148287} valasztottErtek: 0 --- !u!114 &197904221 MonoBehaviour: @@ -2344,6 +2344,7 @@ MonoBehaviour: - {fileID: 309550011} - {fileID: 1511262093} - {fileID: 2032615727} + canUpgrade: 0 --- !u!114 &197904223 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2382,6 +2383,20 @@ MonoBehaviour: threefour: {fileID: 255844034} threefour_Collider: {fileID: 255844036} player: {fileID: 1559678231} +--- !u!114 &197904224 +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: 2ef63cfec7d47ea43a590e10973f1cad, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 1379644800} + akciopontok: 0 --- !u!1 &245385154 GameObject: m_ObjectHideFlags: 0 @@ -11590,12 +11605,13 @@ RectTransform: - {fileID: 723782982} - {fileID: 1785481346} - {fileID: 2003422501} + - {fileID: 1379644799} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -8.464, y: 0} m_SizeDelta: {x: 788.7806, y: 562} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &910984027 @@ -13530,7 +13546,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 969120049} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -8.464, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -18450,7 +18466,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1342387223} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -8.464, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -19300,6 +19316,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1375720665} m_CullTransparentMesh: 1 +--- !u!1 &1379644798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1379644799} + - component: {fileID: 1379644801} + - component: {fileID: 1379644800} + m_Layer: 5 + m_Name: AkciopontText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1379644799 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1379644798} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 891272366} + m_RootOrder: 18 + 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: 511.01, y: -68} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1379644800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1379644798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "Akci\xF3pontok: " + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1379644801 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1379644798} + m_CullTransparentMesh: 1 --- !u!1 &1387573553 GameObject: m_ObjectHideFlags: 0 @@ -29863,7 +30014,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123388911} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.45, y: 0.81, z: 0} + m_LocalPosition: {x: -12.914, y: 0.81, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scripts/Akciopont.cs b/Assets/Scripts/Akciopont.cs new file mode 100644 index 0000000..44ab072 --- /dev/null +++ b/Assets/Scripts/Akciopont.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; + +public class Akciopont : MonoBehaviour +{ + public TMP_Text text; + + public int akciopontok = 0; + + // Start is called before the first frame update + void Start() + { + text.text = "Akciópontok: "; + } + + // Update is called once per frame + void Update() + { + text.text = "Akciópontok: " + akciopontok; + } + + public void UpdateAkciopont(int number) { + akciopontok += number; + } +} diff --git a/Assets/Scripts/Akciopont.cs.meta b/Assets/Scripts/Akciopont.cs.meta new file mode 100644 index 0000000..79be3f1 --- /dev/null +++ b/Assets/Scripts/Akciopont.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2ef63cfec7d47ea43a590e10973f1cad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Dice.cs b/Assets/Scripts/Dice.cs index dde47e2..ee97882 100644 --- a/Assets/Scripts/Dice.cs +++ b/Assets/Scripts/Dice.cs @@ -5,7 +5,10 @@ public class Dice : MonoBehaviour { public Sprite[] diceSides = new Sprite[6]; public SpriteRenderer hely1; public SpriteRenderer hely2; - public SpriteRenderer akcioponthely; + //public SpriteRenderer akcioponthely; + + private Upgrade upgrade; + private Akciopont ap; private int[] diceResult = { 0, 0 }; public int valasztottErtek; //a jatekos altal valasztott dobott ertek helye @@ -16,26 +19,39 @@ public class Dice : MonoBehaviour { public int getValasztottErtek() { return valasztottErtek; } public void setValasztottErtek(int ujErtek) { valasztottErtek = ujErtek; } + private void Start() { + upgrade = FindObjectOfType(); + ap = FindObjectOfType(); + } + public void ertekValasztas(GameObject gomb) { if (diceResult[0] != 0 && diceResult[1] != 0 && !locked) { //megnezzuk hogy lett e mar dobva es nem valasztott meg a jatekos if (gomb.name == "dice1btn") { valasztottErtek = diceResult[0]; + if (diceResult[0] < diceResult[1]) { + upgrade.canUpgrade = true; + } //a valasztott szam atirasa az akcio mezobe - akcioponthely.sprite = diceSides[valasztottErtek-1]; - akcioponthely.size = new Vector2(38, 38); + /*akcioponthely.sprite = diceSides[valasztottErtek-1]; + akcioponthely.size = new Vector2(38, 38);*/ locked = true; } else if (gomb.name == "dice2btn") { valasztottErtek = diceResult[1]; - - //a valasztott szam atirasa az akcio mezobe - akcioponthely.sprite = diceSides[valasztottErtek-1]; - akcioponthely.size = new Vector2(38, 38); + if (diceResult[1] < diceResult[0]) { + upgrade.canUpgrade = true; + } + //a valasztott szam atirasa az akcio mezobe + /*akcioponthely.sprite = diceSides[valasztottErtek-1]; + akcioponthely.size = new Vector2(38, 38); + */ locked = true; } + + ap.UpdateAkciopont(getValasztottErtek() + upgrade.akcio[upgrade.getAkcioIndex()]); } Debug.Log("valasztott ertek: " + valasztottErtek + "locked status: " + locked); diff --git a/Assets/Scripts/Upgrade.cs b/Assets/Scripts/Upgrade.cs index 2bd3e0a..c82dd58 100644 --- a/Assets/Scripts/Upgrade.cs +++ b/Assets/Scripts/Upgrade.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using TMPro; +using System; public class Upgrade : MonoBehaviour { @@ -18,6 +19,8 @@ public class Upgrade : MonoBehaviour public TMP_Text[] ujradobastext; public TMP_Text[] hacktext; + public bool canUpgrade = false; + private int energia_index, akcio_index, harc_index, ujradobas_index, hack_index = 0; //nem lehet nagyobb 4-nel | hack 3-nal public int getEnergiaIndex() { return energia_index; } @@ -27,42 +30,57 @@ public class Upgrade : MonoBehaviour public int getHackIndex() { return hack_index; } public void upgradeEnergia() { - if(energia_index < 4) { - energiatext[energia_index].text = "X"; - energia_index++; + if (canUpgrade) { + if (energia_index < 4) { + energiatext[energia_index].text = "X"; + energia_index++; + } + Debug.Log("energia_i: " + energia_index); + canUpgrade = false; } - Debug.Log("energia_i: " + energia_index); } public void upgradeAkcio() { - if (akcio_index < 4) { - akciotext[akcio_index].text = "X"; - akcio_index++; + if (canUpgrade) { + if (akcio_index < 4) { + akciotext[akcio_index].text = "X"; + akcio_index++; + } + Debug.Log("akcio_i: " + akcio_index); + canUpgrade = false; } - Debug.Log("akcio_i: " + akcio_index); } public void upgradeHarc() { - if (harc_index < 4) { - harctext[harc_index].text = "X"; - harc_index++; + if (canUpgrade) { + if (harc_index < 4) { + harctext[harc_index].text = "X"; + harc_index++; + } + Debug.Log("harc_i: " + harc_index); + canUpgrade = false; } - Debug.Log("harc_i: " + harc_index); } public void upgradeUjradobas() { - if (ujradobas_index < 4) { - ujradobastext[ujradobas_index].text = "X"; - ujradobas_index++; + if (canUpgrade) { + if (ujradobas_index < 4) { + ujradobastext[ujradobas_index].text = "X"; + ujradobas_index++; + } + Debug.Log("ujradobas_i: " + ujradobas_index); + canUpgrade = false; } - Debug.Log("ujradobas_i: " + ujradobas_index); } public void upgradeHack() { - if (hack_index < 3) { - hacktext[hack_index].text = "X"; - hack_index++; + if (canUpgrade) { + if (hack_index < 3) { + hacktext[hack_index].text = "X"; + hack_index++; + } + Debug.Log("hack_i: " + hack_index); + canUpgrade = false; } - Debug.Log("hack_i: " + hack_index); } } diff --git a/Assets/Scripts/movement.cs b/Assets/Scripts/movement.cs index ed00bd7..df538d8 100644 --- a/Assets/Scripts/movement.cs +++ b/Assets/Scripts/movement.cs @@ -2,7 +2,6 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; -using UnityEngine.EventSystems; using Unity.Mathematics; public class movement : MonoBehaviour { @@ -82,6 +81,10 @@ public class movement : MonoBehaviour { player.transform.position = oneone.transform.position; } + private void kezdoHelyMeghatarzoas() { + + } + // Update is called once per frame public void Update() { diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..cfaebd7 --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 957aa26..05505a2 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -8,8 +8,14 @@ EditorUserSettings: RecentlyUsedSceneGuid-0: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 + UnityRemoteCompression: + value: 337f73 + flags: 0 + UnityRemoteDevice: + value: 530104565d04580b405e5c7244770b43464749097d70766108 + flags: 0 UnityRemoteResolution: - value: 2d5e460b0459 + value: 275e4308165c135e flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 3372f0d..4ab3ead 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: 683 + controlID: 6607 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,8 +45,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 234 - y: 73 + x: 235 + y: 19 width: 790 height: 376 m_ViewDataDictionary: {fileID: 0} @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 684 + controlID: 6608 --- !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: 619 + controlID: 6586 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -186,8 +186,8 @@ MonoBehaviour: y: 0 width: 234 height: 397 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -223,10 +223,10 @@ MonoBehaviour: m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 336} + scrollPos: {x: 0, y: 93} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 1afbffff345f0000565f00003c6300009c630000a6630000aa630000e863000004650000dc660000e0660000 + m_ExpandedIDs: 28fbffff4a5f000012620000dc630000d0660000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -2.3090425, y: 1.6650894, z: 0.008210685} + m_Target: {x: 4.7735643, y: 0.8400539, z: -0.17494826} speed: 2 - m_Value: {x: -2.3090425, y: 1.6650894, z: 0.008210685} + m_Value: {x: 4.7735643, y: 0.8400539, z: -0.17494826} 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: 6.763249 + m_Target: 11.998038 speed: 2 - m_Value: 6.763249 + m_Value: 11.998038 m_Ortho: m_Target: 1 speed: 2 @@ -661,7 +661,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 685 + controlID: 6609 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -679,10 +679,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 522 + width: 554 height: 238 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 11} m_Panes: - {fileID: 11} @@ -710,7 +710,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 470 - width: 521 + width: 553 height: 217 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -742,9 +742,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 6e670000 - m_LastClickedID: 26478 - m_ExpandedIDs: 000000006267000000ca9a3bffffff7f + m_SelectedIDs: 62670000 + m_LastClickedID: 26466 + m_ExpandedIDs: 000000005867000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -772,7 +772,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000006267000000ca9a3bffffff7f + m_ExpandedIDs: 000000005867000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -797,9 +797,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 34600000 - m_LastClickedInstanceID: 24628 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: a05f0000 + m_LastClickedInstanceID: 24480 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -843,12 +843,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 522 + x: 554 y: 0 - width: 504 + width: 472 height: 238 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -874,9 +874,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 522 + x: 554 y: 470 - width: 502 + width: 470 height: 217 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -901,8 +901,8 @@ MonoBehaviour: y: 0 width: 340 height: 635 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -942,7 +942,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 24628 + m_LastInspectedObjectInstanceID: 24480 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index c5a6d09..bf33f87 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 2662 + controlID: 6786 --- !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: 2638 + controlID: 6787 --- !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: 2639 + controlID: 6788 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,8 +189,8 @@ MonoBehaviour: y: 0 width: 234 height: 397 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -247,7 +247,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 2578 + controlID: 6812 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -265,7 +265,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 522 + width: 562 height: 238 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -289,12 +289,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 522 + x: 562 y: 0 - width: 504 + width: 464 height: 238 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -319,8 +319,8 @@ MonoBehaviour: y: 0 width: 340 height: 635 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -448,10 +448,10 @@ MonoBehaviour: m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 1afbffff345f0000565f00003c6300009c630000a6630000aa630000e863000004650000dc660000 + scrollPos: {x: 0, y: 93} + m_SelectedIDs: a0f4ffff + m_LastClickedID: -2912 + m_ExpandedIDs: 28fbffff4a5f000012620000dc630000d0660000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -755,9 +755,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 10.508165, y: 0.48396677, z: -0.0034403764} + m_Target: {x: 0.5346609, y: -1.3819388, z: -0.08190441} speed: 2 - m_Value: {x: 10.508165, y: 0.48396677, z: -0.0034403764} + m_Value: {x: 0.5346609, y: -1.3819388, z: -0.08190441} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -808,9 +808,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 9.203847 + m_Target: 7.4146304 speed: 2 - m_Value: 9.203847 + m_Value: 7.4146304 m_Ortho: m_Target: 1 speed: 2 @@ -857,7 +857,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 470 - width: 521 + width: 561 height: 217 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -876,13 +876,13 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 55 m_LastFolders: - - Assets + - Assets/Scripts m_LastFoldersGridSize: 55 m_LastProjectPath: C:\dev\find the source m_LockTracker: @@ -891,7 +891,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 62670000 m_LastClickedID: 26466 - m_ExpandedIDs: 000000006267000000ca9a3bffffff7f + m_ExpandedIDs: 000000005867000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -919,7 +919,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000006267000000ca9a3bffffff7f + m_ExpandedIDs: 000000005867000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -995,9 +995,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 522 + x: 562 y: 470 - width: 502 + width: 462 height: 217 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: