diff --git a/Assets/Scenes/EndlessRunnerTest.unity b/Assets/Scenes/EndlessRunnerTest.unity index 68b3f50..b6ee6a1 100644 --- a/Assets/Scenes/EndlessRunnerTest.unity +++ b/Assets/Scenes/EndlessRunnerTest.unity @@ -191,6 +191,7 @@ GameObject: - component: {fileID: 1201779183} - component: {fileID: 1201779182} - component: {fileID: 1201779181} + - component: {fileID: 1201779184} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -212,6 +213,7 @@ MonoBehaviour: m_EditorClassIdentifier: player: {fileID: 7398140401948337837} camera: {fileID: 1895677327} + xPostion: 0 --- !u!114 &1201779182 MonoBehaviour: m_ObjectHideFlags: 0 @@ -240,6 +242,21 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1201779184 +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: cb738793c052dd54597cff2d5ea33de3, type: 3} + m_Name: + m_EditorClassIdentifier: + rb: {fileID: 7917514869596290073} + jumpforce: 5 + sideMovement: 3 --- !u!1001 &1265567512 PrefabInstance: m_ObjectHideFlags: 0 @@ -324,7 +341,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.1550819, g: 0.24519156, b: 0.38679248, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -338,8 +355,8 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 + far clip plane: 200 + field of view: 70 orthographic: 0 orthographic size: 5 m_Depth: -1 @@ -364,14 +381,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895677325} - m_LocalRotation: {x: 0.2840022, y: -0.009203919, z: 0.0027263246, w: 0.9587756} - m_LocalPosition: {x: 0.01, y: 4.88, z: -22.19} + m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} + m_LocalPosition: {x: 0, y: 5.3, z: -22.87} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 33, y: -1.1, z: 0} + m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} --- !u!1 &1980041874 GameObject: m_ObjectHideFlags: 0 @@ -8987,7 +9004,6 @@ GameObject: - component: {fileID: 7917514869596290071} - component: {fileID: 7917514869596290073} - component: {fileID: 7917514869596290072} - - component: {fileID: 7917514869596290074} m_Layer: 0 m_Name: BobyWithRigifyAdvanced m_TagString: Untagged @@ -9695,20 +9711,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 116 m_CollisionDetection: 1 ---- !u!114 &7917514869596290074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7398140401948337837} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cb738793c052dd54597cff2d5ea33de3, type: 3} - m_Name: - m_EditorClassIdentifier: - rb: {fileID: 7917514869596290073} - jumpforce: 5 --- !u!4 &7986884067029569574 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CameraController.cs b/Assets/Scripts/CameraController.cs index 460701d..9304b11 100644 --- a/Assets/Scripts/CameraController.cs +++ b/Assets/Scripts/CameraController.cs @@ -7,14 +7,18 @@ public class CameraController : MonoBehaviour public GameObject player; public Camera camera; private Vector3 offset; + public float xPostion = 0; + + void Start(){ + offset.x = xPostion; + offset.y = camera.transform.position.y - player.transform.position.y; + offset.z = camera.transform.position.z - player.transform.position.z; - void Start() - { - offset = camera.transform.position - player.transform.position; } void LateUpdate() { - camera.transform.position = player.transform.position + offset; + if(player.transform.position.x != 3 || player.transform.position.x != -3) + camera.transform.position = player.transform.position + offset; } -} +} \ No newline at end of file diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 8b5c965..21e9422 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -5,8 +5,10 @@ using UnityEngine; public class PlayerController : MonoBehaviour { public Rigidbody rb; + private CameraController cc; //public float moveSpeed = 5f; public float jumpforce = 5f; + public float sideMovement = 3f; private Vector3 direction; private float horizontal, vertical, isJumping; private bool isOnGround; @@ -16,26 +18,16 @@ public class PlayerController : MonoBehaviour private Vector2 endTouchPosition; private void Awake() { - rb = GetComponent(); + cc = FindObjectOfType(); } - void Update() - { - /*horizontal = Input.GetAxis("Horizontal"); - vertical = Input.GetAxis("Vertical"); - isJumping = Input.GetAxis("Jump");*/ - + void Update(){ //jumping /*if (isJumping > 0 && isOnGround) { rb.AddForce(new Vector3(horizontal, jumpforce, vertical)); isOnGround = false; }*/ - /*direction = new Vector3(horizontal, 0,vertical); - rb.AddForce(direction * moveSpeed * Time.deltaTime);*/ - - - //new character controller with swipe lane changing if(Input.touchCount > 0 && Input.GetTouch(0).phase == TouchPhase.Began){ startTouchPosition = Input.GetTouch(0).position; @@ -61,10 +53,14 @@ public class PlayerController : MonoBehaviour } private void goLeft(){ - rb.transform.position = new Vector3(rb.transform.position.x + 5, rb.transform.position.y, rb.transform.position.z); + if(rb.transform.position.x == 3) return; //ne tudjon kimenni a savbol + cc.xPostion = -3; + rb.transform.position = new Vector3(rb.transform.position.x + sideMovement, rb.transform.position.y, rb.transform.position.z); } private void goRight(){ - rb.transform.position = new Vector3(rb.transform.position.x - 5, rb.transform.position.y, rb.transform.position.z); + if(rb.transform.position.x == -3) return; //ne tudjon kimenni a savbol + cc.xPostion = 3; + rb.transform.position = new Vector3(rb.transform.position.x - sideMovement, rb.transform.position.y, rb.transform.position.z); } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index b76b2da..f9fccc5 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: 69 + controlID: 5421 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -33,138 +33,57 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 13974, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Simulator + m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 443 - width: 1027 - height: 244 + x: 185 + y: 86 + width: 844 + height: 348 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Resources/Models/World Objects - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 81 - m_LastFolders: - - Assets/Resources/Models/World Objects - m_LastFoldersGridSize: 81 - m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9c640000 - m_LastClickedID: 25756 - m_ExpandedIDs: 00000000aa6200006c6400009e64000000ca9a3bffffff7f - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000aa620000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: 8afaffff - m_LastClickedInstanceID: -1398 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000745c0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 81 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 + m_SerializedViewNames: + - UnityEditor.GameView + m_SerializedViewValues: + - /home/tom/Documents/dev/zarodolgozat/ColorRunner/Library/PlayModeViewStates/3f2f31d0639f87e079498d2f248e8d06 + m_PlayModeViewName: Device Simulator + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 1} + m_TargetSize: {x: 1170, y: 2532} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 1 + m_UseMipMap: 0 + m_SimulatorState: + controlPanelVisible: 0 + controlPanelWidth: 0 + controlPanelFoldoutKeys: + - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin + controlPanelFoldoutValues: 01 + pluginNames: + - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin + pluginStates: + - '{}' + scale: 12 + fitToScreenEnabled: 1 + rotationDegree: 0 + highlightSafeAreaEnabled: 0 + friendlyName: Apple iPhone 13 Pro + networkReachability: 1 + systemLanguage: 10 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -179,17 +98,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 10} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1028 + width: 1031 height: 622 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 70 + controlID: 5391 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -209,12 +128,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1028 - height: 357 + width: 1031 + height: 369 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 30 + controlID: 5392 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -233,7 +152,7 @@ MonoBehaviour: x: 0 y: 0 width: 185 - height: 357 + height: 369 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -264,17 +183,17 @@ MonoBehaviour: x: 0 y: 86 width: 184 - height: 336 + height: 348 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 101} - m_SelectedIDs: 8afaffff - m_LastClickedID: -1398 - m_ExpandedIDs: 34fbffff745f0000ee600000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: aa93ffff34fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -290,7 +209,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -308,23 +227,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: SimulatorWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 185 y: 0 - width: 843 - height: 357 + width: 846 + height: 369 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 8} + m_ActualView: {fileID: 2} m_Panes: - {fileID: 8} - - {fileID: 9} - m_Selected: 0 - m_LastSelected: 1 + - {fileID: 2} + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -345,10 +264,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 185 - y: 86 - width: 841 - height: 336 + x: 186 + y: 19 + width: 844 + height: 348 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -408,6 +327,17 @@ MonoBehaviour: id: unity-transform-toolbar index: 0 layout: 2 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 - dockPosition: 0 containerId: overlay-container--right floating: 0 @@ -540,6 +470,28 @@ MonoBehaviour: id: Scene View/Particles index: 10 layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 @@ -550,9 +502,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -1.9369336, y: -15.716613, z: -0.014820366} + m_Target: {x: -7.426486, y: 5.868319, z: -15.661159} speed: 2 - m_Value: {x: -1.9369336, y: -15.716613, z: -0.014820304} + m_Value: {x: -7.426486, y: 5.868319, z: -15.661159} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -594,18 +546,18 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} + m_Size: {x: 0, y: 0} m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.048882835, y: -0.9429737, z: 0.16022764, w: 0.28767645} + m_Target: {x: 0.32373542, y: 0.18319961, z: -0.06404525, w: 0.9260414} speed: 2 - m_Value: {x: 0.048882358, y: -0.94296443, z: 0.16022608, w: 0.28767365} + m_Value: {x: 0.323732, y: 0.18319768, z: -0.06404457, w: 0.9260316} m_Size: - m_Target: 20.526875 + m_Target: 6.112072 speed: 2 - m_Value: 20.526833 + m_Value: 6.112072 m_Ortho: m_Target: 0 speed: 2 @@ -623,7 +575,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.40971902, y: 0.57869315, z: -0.41691157, w: -0.56871134} + m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -639,89 +591,24 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: + m_Children: [] + m_Position: serializedVersion: 2 - x: 185 - y: 86 - width: 841 - height: 336 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 841, y: 315} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -420.5 - m_HBaseRangeMax: 420.5 - m_VBaseRangeMin: -157.5 - m_VBaseRangeMax: 157.5 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 841 - height: 315 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 420.5, y: 157.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -420.5 - y: -157.5 - width: 841 - height: 315 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 841, y: 336} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} + x: 0 + y: 369 + width: 1031 + height: 253 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 10} + m_Panes: + - {fileID: 10} + - {fileID: 11} + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -731,24 +618,137 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] - m_Position: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: serializedVersion: 2 x: 0 - y: 357 - width: 1028 - height: 265 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 2} - m_Panes: - - {fileID: 2} - - {fileID: 11} - m_Selected: 0 - m_LastSelected: 1 + y: 455 + width: 1030 + height: 232 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Resources/Models/World Objects + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Resources/Models/World Objects + m_LastFoldersGridSize: -1 + m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: d65e0100 + m_LastClickedID: 89814 + m_ExpandedIDs: 000000005660000062600000c65e0100c85e010000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000005660000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -770,9 +770,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 443 - width: 1027 - height: 244 + y: 455 + width: 1030 + height: 232 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -792,9 +792,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1028 + x: 1031 y: 0 - width: 338 + width: 335 height: 622 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -823,9 +823,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1028 + x: 1031 y: 86 - width: 337 + width: 334 height: 601 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -834,7 +834,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 151 + m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index ca8aa13..966354b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -34,20 +34,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SimulatorWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 747 + x: 740 y: 0 - width: 296 + width: 291 height: 369 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 17} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 --- !u!114 &3 @@ -74,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 625 + controlID: 105 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -90,12 +90,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1043 + x: 1031 y: 0 - width: 323 + width: 335 height: 622 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -118,7 +118,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 154 + width: 186 height: 369 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -144,14 +144,14 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 369 - width: 1043 + width: 1031 height: 253 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - - {fileID: 18} + - {fileID: 17} m_Selected: 0 m_LastSelected: 1 --- !u!114 &7 @@ -203,7 +203,7 @@ MonoBehaviour: height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: Default + m_LastLoadedLayoutName: --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -244,12 +244,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1043 + width: 1031 height: 622 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 626 + controlID: 106 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -270,12 +270,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1043 + width: 1031 height: 369 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 627 + controlID: 107 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -291,9 +291,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 154 + x: 186 y: 0 - width: 593 + width: 554 height: 369 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -324,7 +324,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 455 - width: 1042 + width: 1030 height: 232 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -343,22 +343,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scripts m_LastFoldersGridSize: -1 m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: aa620000 - m_LastClickedID: 25258 - m_ExpandedIDs: 00000000aa62000000ca9a3bffffff7f + m_SelectedIDs: d2620000 + m_LastClickedID: 25298 + m_ExpandedIDs: 000000005660000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -386,7 +386,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000aa62000000ca9a3bffffff7f + m_ExpandedIDs: 0000000056600000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -413,7 +413,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -462,9 +462,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1043 + x: 1031 y: 86 - width: 322 + width: 334 height: 601 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -505,7 +505,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 86 - width: 153 + width: 185 height: 348 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -516,7 +516,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 34fbffff42fbffff + m_ExpandedIDs: 34fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -560,9 +560,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 154 + x: 186 y: 86 - width: 591 + width: 552 height: 348 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -798,9 +798,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -30.452957, y: -5.553322, z: 29.703247} + m_Target: {x: -38.368263, y: -20.28498, z: 42.83519} speed: 2 - m_Value: {x: -30.452957, y: -5.553322, z: 29.703247} + m_Value: {x: -38.368263, y: -20.28498, z: 42.83519} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -847,13 +847,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.19194184, y: -0.6900247, z: 0.1979049, w: 0.6692364} + m_Target: {x: 0.2438549, y: -0.4222767, z: 0.11905876, w: 0.8649058} speed: 2 - m_Value: {x: 0.19093592, y: -0.69031405, z: 0.1968677, w: 0.66951704} + m_Value: {x: 0.24385248, y: -0.42227253, z: 0.11905758, w: 0.8648972} m_Size: - m_Target: 73.56908 + m_Target: 69.6911 speed: 2 - m_Value: 73.56908 + m_Value: 69.6911 m_Ortho: m_Target: 0 speed: 2 @@ -879,98 +879,6 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 747 - y: 86 - width: 294 - height: 348 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 294, y: 327} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -147 - m_HBaseRangeMax: 147 - m_VBaseRangeMin: -163.5 - m_VBaseRangeMax: 163.5 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 294 - height: 327 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 147, y: 163.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -147 - y: -163.5 - width: 294 - height: 327 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 294, y: 348} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -998,3 +906,62 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 13974, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Simulator + m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 740 + y: 86 + width: 289 + height: 348 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: + - UnityEditor.GameView + m_SerializedViewValues: + - /home/tom/Documents/dev/zarodolgozat/ColorRunner/Library/PlayModeViewStates/ee028417846cb62ad8ae9a3a627eb326 + m_PlayModeViewName: Device Simulator + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 1} + m_TargetSize: {x: 1170, y: 2532} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_SimulatorState: + controlPanelVisible: 0 + controlPanelWidth: 0 + controlPanelFoldoutKeys: + - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin + controlPanelFoldoutValues: 01 + pluginNames: + - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin + pluginStates: + - '{}' + scale: 12 + fitToScreenEnabled: 1 + rotationDegree: 0 + highlightSafeAreaEnabled: 0 + friendlyName: Apple iPhone 13 Pro + networkReachability: 1 + systemLanguage: 10