diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index e3b6010..3179e8f 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -128,6 +128,37 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 97320e10a4ea94a5085e5bf6fd4a2921, type: 3} m_PrefabInstance: {fileID: 379976419} m_PrefabAsset: {fileID: 0} +--- !u!1 &245074209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 245074210} + m_Layer: 0 + m_Name: BobbyFollowTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &245074210 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 245074209} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.02, y: 9.84, z: 8.78} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7917514869596290071} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &261353086 GameObject: m_ObjectHideFlags: 0 @@ -815,7 +846,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601898925} - m_LocalRotation: {x: 0.045581307, y: -0.70516795, z: 0.045520637, w: 0.7061079} + m_LocalRotation: {x: 0.045581304, y: -0.70516795, z: 0.045520633, w: 0.7061079} m_LocalPosition: {x: 2.27, y: 4.16525, z: 3.82} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -959,6 +990,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1201779188} + m_TargetAssemblyTypeName: jatekmanager, Assembly-CSharp + m_MethodName: ChangeToSettings + 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 --- !u!114 &644899050 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1106,6 +1149,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1201779188} + m_TargetAssemblyTypeName: jatekmanager, Assembly-CSharp + m_MethodName: ChangeToGame + 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 --- !u!114 &645543795 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1376,6 +1431,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1201779188} + m_TargetAssemblyTypeName: jatekmanager, Assembly-CSharp + m_MethodName: ChangeToShop + 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 --- !u!114 &835649275 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1934,6 +2001,7 @@ GameObject: - component: {fileID: 1201779185} - component: {fileID: 1201779186} - component: {fileID: 1201779187} + - component: {fileID: 1201779188} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -2057,6 +2125,24 @@ MonoBehaviour: playButton: {fileID: 645543792} cameraTransform: {fileID: 0} cameraTransformOriginal: {x: 0, y: 0, z: 0} +--- !u!114 &1201779188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1201779180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a1faa9a1ba58437f92f33c86f8a89a4, type: 3} + m_Name: + m_EditorClassIdentifier: + State: 0 + playButton: {fileID: 645543792} + garazs: {fileID: 1876191122} + homeGomb: {fileID: 1543880549} + settingsGomb: {fileID: 644899047} + shopGomb: {fileID: 835649272} --- !u!1 &1219467652 GameObject: m_ObjectHideFlags: 0 @@ -2330,8 +2416,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1513686735} - m_LocalRotation: {x: 0.21786386, y: -0.00015033508, z: 0.000033558692, w: 0.9759792} - m_LocalPosition: {x: -0.25, y: 5.77, z: 3.49} + m_LocalRotation: {x: 0.22590086, y: 0.0030496058, z: -0.0007071928, w: 0.9741453} + m_LocalPosition: {x: -0.28647116, y: 6.2664723, z: 2.6748314} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2358,7 +2444,7 @@ MonoBehaviour: m_Priority: 10 m_StandbyUpdate: 2 m_LookAt: {fileID: 1731748927} - m_Follow: {fileID: 0} + m_Follow: {fileID: 245074210} m_Lens: FieldOfView: 70 OrthographicSize: 5 @@ -2474,6 +2560,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1201779188} + m_TargetAssemblyTypeName: jatekmanager, Assembly-CSharp + m_MethodName: ChangeToHome + 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 --- !u!114 &1543880552 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3189,6 +3287,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1835842688} m_Mesh: {fileID: 2212009239438826721, guid: 15f50b6494f632e40bdc081ecf2a2ad4, type: 3} +--- !u!1 &1876191122 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 97320e10a4ea94a5085e5bf6fd4a2921, type: 3} + m_PrefabInstance: {fileID: 379976419} + m_PrefabAsset: {fileID: 0} --- !u!1 &1895677325 GameObject: m_ObjectHideFlags: 0 @@ -3257,8 +3360,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895677325} - m_LocalRotation: {x: 0.21786386, y: -0.00015033508, z: 0.000033558692, w: 0.9759792} - m_LocalPosition: {x: 0.026471168, y: 4.573528, z: -22.794832} + m_LocalRotation: {x: 0.0010953929, y: 0.9979507, z: -0.061456818, w: 0.017787255} + m_LocalPosition: {x: -0.15911984, y: 2.9687777, z: -12.856641} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10867,6 +10970,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4391698887412137587, guid: d73ae45b499e5f74ba3e0d287b87893c, type: 3} + propertyPath: m_LocalPosition.x + value: 1.06 + objectReference: {fileID: 0} + - target: {fileID: 4391698887412137587, guid: d73ae45b499e5f74ba3e0d287b87893c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5176207908013364664, guid: d73ae45b499e5f74ba3e0d287b87893c, type: 3} propertyPath: m_TagString value: Floor @@ -13101,6 +13212,7 @@ Transform: - {fileID: 4837085586104442566} - {fileID: 481417098} - {fileID: 1731748927} + - {fileID: 245074210} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/WallCollision.cs b/Assets/Scripts/WallCollision.cs index 924039e..27125ad 100644 --- a/Assets/Scripts/WallCollision.cs +++ b/Assets/Scripts/WallCollision.cs @@ -5,15 +5,19 @@ using UnityEditor; public class WallCollision : MonoBehaviour { + jatekmanager jatekmanager; + private void OnTriggerEnter(Collider other) { if(other.gameObject.tag == "Player"){ + Debug.Log("neki ment a falnak"); - - #if UNITY_EDITOR + jatekmanager.UpdateGameState(jatekmanager.GameState.Meghaltal); + /*#if UNITY_EDITOR EditorApplication.isPlaying = false; #else Application.Quit(); - #endif + #endif*/ + } } } diff --git a/Assets/Scripts/jatekmanager.cs b/Assets/Scripts/jatekmanager.cs index b308d6a..63d0d4d 100644 --- a/Assets/Scripts/jatekmanager.cs +++ b/Assets/Scripts/jatekmanager.cs @@ -10,10 +10,18 @@ using UnityEngine.UI; public class jatekmanager : MonoBehaviour { + //gamestate-s cuccok public static jatekmanager Instance; public GameState State; public static event Action OnGameStateChanged; + //gameobjectek,gombok,scriptek + public GameObject playButton; + public GameObject garazs; + public GameObject homeGomb; + public GameObject settingsGomb; + public GameObject shopGomb; + private void Awake() { Instance = this; @@ -62,29 +70,82 @@ public class jatekmanager : MonoBehaviour Meghaltal } + public void ChangeToHome() + { + UpdateGameState(GameState.Home); + homeGomb.SetActive(true); + settingsGomb.SetActive(true); + shopGomb.SetActive(true); + } + private async void HandleHome() { + StartCoroutine(TimerHome()); + GetComponent().enabled = false; + GetComponent().enabled = false; + garazs.SetActive(true); + } + IEnumerator TimerHome() + { + yield return new WaitForSecondsRealtime(2); + playButton.SetActive(true); + } + + public void ChangeToSettings() + { + UpdateGameState(GameState.Settings); } private async void HandleSettings() { + playButton.SetActive(false); + } + public void ChangeToShop() + { + UpdateGameState(GameState.Shop); } private async void HandleShop() { + playButton.SetActive(false); + } + public void ChangeToGame() + { + UpdateGameState(GameState.Game); + homeGomb.SetActive(false); + settingsGomb.SetActive(false); + shopGomb.SetActive(false); + } + + IEnumerator TimerGame() + { + yield return new WaitForSecondsRealtime(1); + garazs.SetActive(false); } private async void HandleGame() { + playButton.SetActive(false); + StartCoroutine(TimerGame()); + GetComponent ().enabled = true; + GetComponent ().enabled = true; + } + public void ChangeToMeghaltal() + { + UpdateGameState(GameState.Meghaltal); } private async void HandleMeghaltal() { - + playButton.SetActive(false); + homeGomb.SetActive(true); + GetComponent().enabled = false; + GetComponent().enabled = false; + garazs.SetActive(true); } diff --git a/Assets/Scripts/playbutton.cs b/Assets/Scripts/playbutton.cs deleted file mode 100644 index 6bdd5a4..0000000 --- a/Assets/Scripts/playbutton.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Cinemachine; - -public class playbutton : MonoBehaviour -{ - public CinemachineVirtualCamera currentCamera; - public CinemachineTrackedDolly cinemachineTrackedDolly; - public CinemachinePathBase.PositionUnits m_PositionUnits; - - public CinemachineTrackedDolly dolly; - - public CinemachineSmoothPath smoothPath; - public CinemachinePath utvonal; - public float pathPosition = 0.0f; - public float speed = 0.2f; - public float pathLength; - public GameObject playButton; - public Transform cameraTransform; - public Vector3 cameraTransformOriginal; - - - private void Start() - { - //CinemachineVirtualCamera.GetComponent; - pathPosition = 0.0f; - cinemachineTrackedDolly = currentCamera.GetCinemachineComponent(); - pathLength = utvonal.MaxPos; - } - - - - public void PlayButton() - { - playButton.SetActive(false); - if (pathPosition < pathLength) - { - pathPosition += speed; - cinemachineTrackedDolly.m_PathPosition = pathPosition; - //smoothPath.m_PathPosition = pathPosition; - } - } -} diff --git a/Assets/Scripts/playbutton.cs.meta b/Assets/Scripts/playbutton.cs.meta deleted file mode 100644 index 005012b..0000000 --- a/Assets/Scripts/playbutton.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 87ae71cc7940e4650b0424d51e2b8e28 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index b39b9b4..550c47f 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: 43 - width: 1920 - height: 997 + y: 65 + width: 1470 + height: 816 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Simulator m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -39,12 +39,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 871 + x: 565 y: 0 - width: 456 - height: 629 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 451 + height: 590 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -70,8 +70,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1470 + height: 816 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -95,7 +95,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1470 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -116,8 +116,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 796 + width: 1470 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1470 + height: 766 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 16 + controlID: 56 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1327 - height: 947 + width: 1016 + height: 766 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 17 + controlID: 57 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -191,12 +191,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1327 - height: 629 + width: 1016 + height: 590 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 18 + controlID: 58 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -214,10 +214,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 186 - height: 629 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 142.5 + height: 590 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -238,12 +238,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 186 + x: 142.5 y: 0 - width: 685 - height: 629 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 422.5 + height: 590 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -265,9 +265,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 629 - width: 1327 - height: 318 + y: 590 + width: 1016 + height: 176 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -290,10 +290,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1327 + x: 1016 y: 0 - width: 593 - height: 947 + width: 454 + height: 766 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -318,14 +318,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 185 - height: 608 + y: 95 + width: 141.5 + height: 569 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -335,7 +335,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 4c36ffffe267ffff4068ffff466effffd27fffff3080ffff3886ffffbef8ffff34fbffffa2f2000054f40000d65b0100 + m_ExpandedIDs: 1ef5ffff34f5ffff4af5ffff60f5ffff86f5ffff1afbffff5a5c0000665c00003c610000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -375,14 +375,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 186 - y: 73 - width: 683 - height: 608 + x: 142.5 + y: 95 + width: 420.5 + height: 569 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -392,8 +392,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -101, y: -26} + snapOffset: {x: -101, y: -26} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -617,9 +617,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 646.07245, y: 1493.4817, z: 53.950325} + m_Target: {x: -0.58353513, y: -6.1749535, z: 24.107718} speed: 2 - m_Value: {x: 646.07245, y: 1493.4817, z: 53.950325} + m_Value: {x: -0.58353513, y: -6.1749535, z: 24.107718} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -666,13 +666,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.113753475, y: -0.00000011450476, z: 0.000000050034828, w: 0.99350965} + m_Target: {x: 0.55635643, y: -0.07579251, z: 0.051050954, w: 0.8258953} speed: 2 - m_Value: {x: 0.11375341, y: -0.00000011450469, z: 0.0000000500348, w: 0.99350905} + m_Value: {x: 0.5563603, y: -0.07579303, z: 0.051051307, w: 0.82590103} m_Size: - m_Target: 1399.2793 + m_Target: 5.806654 speed: 2 - m_Value: 1399.2793 + m_Value: 5.806654 m_Ortho: m_Target: 0 speed: 2 @@ -713,14 +713,14 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 702 - width: 1326 - height: 297 + y: 685 + width: 1015 + height: 155 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -746,14 +746,14 @@ MonoBehaviour: m_LastFolders: - Assets/Scripts m_LastFoldersGridSize: -1 - m_LastProjectPath: E:\dev\zarodolgozat\ColorBall + m_LastProjectPath: /Users/bance/Documents/GitHub/PuzzleColorBall m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: ba650000 - m_LastClickedID: 26042 - m_ExpandedIDs: 00000000a8650000b66500007e7d0000807d0000 + scrollPos: {x: 0, y: 73} + m_SelectedIDs: 246c0000 + m_LastClickedID: 27684 + m_ExpandedIDs: 00000000046c0000066c0000086c00000a6c00000c6c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -781,7 +781,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000a8650000 + m_ExpandedIDs: 00000000046c0000066c0000086c00000a6c00000c6c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -825,7 +825,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -833,7 +833,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 89} m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 @@ -853,7 +853,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -881,14 +881,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1327 - y: 73 - width: 592 - height: 926 + x: 1016 + y: 95 + width: 453 + height: 745 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -922,14 +922,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Simulator - m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 871 - y: 73 - width: 454 - height: 608 + x: 565 + y: 95 + width: 449 + height: 569 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -958,7 +958,7 @@ MonoBehaviour: - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin pluginStates: - '{}' - scale: 22 + scale: 20 fitToScreenEnabled: 1 rotationDegree: 0 highlightSafeAreaEnabled: 0