From a5e42e8969e8a7ec1df63453a8c6ec36bc6b9ae6 Mon Sep 17 00:00:00 2001 From: Dani-24 <79161140+Dani-24@users.noreply.github.com> Date: Mon, 5 Jun 2023 06:20:12 +0200 Subject: [PATCH] BUILD --- .../ProjectSettings/ProjectSettings.asset | 4 +- .../UserSettings/Layouts/default-2021.dwlt | 280 +++++++++++++----- 2 files changed, 204 insertions(+), 80 deletions(-) diff --git a/VR Room Project/ProjectSettings/ProjectSettings.asset b/VR Room Project/ProjectSettings/ProjectSettings.asset index 10c6a3d..dd81acb 100644 --- a/VR Room Project/ProjectSettings/ProjectSettings.asset +++ b/VR Room Project/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: XaviXaviAlbertDani - productName: "El desafio del aprendiz m\xE1gico" + companyName: Los Luises + productName: "El Desaf\xEDo del Aprendiz de Mago" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} diff --git a/VR Room Project/UserSettings/Layouts/default-2021.dwlt b/VR Room Project/UserSettings/Layouts/default-2021.dwlt index ee3789a..8248c2c 100644 --- a/VR Room Project/UserSettings/Layouts/default-2021.dwlt +++ b/VR Room Project/UserSettings/Layouts/default-2021.dwlt @@ -1,6 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 +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: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 390 + y: 124 + width: 640 + height: 601 + m_ShowMode: 0 + m_Title: Build Settings + m_RootView: {fileID: 4} + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + m_Maximized: 0 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -19,12 +43,62 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Project - m_RootView: {fileID: 7} + m_Title: Scene + m_RootView: {fileID: 10} m_MinSize: {x: 875, y: 350} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &2 +--- !u!114 &3 +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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: BuildPlayerWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 640 + height: 601 + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 640 + height: 601 + m_MinSize: {x: 640, y: 601} + m_MaxSize: {x: 4000, y: 4021} + vertical: 0 + controlID: 14642 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -43,14 +117,14 @@ MonoBehaviour: y: 0 width: 125 height: 689 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 21} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 25} m_Panes: - - {fileID: 21} + - {fileID: 25} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &3 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -63,8 +137,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 4} + - {fileID: 13} + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 @@ -74,8 +148,8 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 136 ---- !u!114 &4 + controlID: 154 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -96,13 +170,13 @@ MonoBehaviour: height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 22} m_Panes: + - {fileID: 22} - {fileID: 18} - - {fileID: 14} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &5 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -123,12 +197,12 @@ MonoBehaviour: height: 689 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 23} m_Panes: - - {fileID: 19} + - {fileID: 23} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &6 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -149,15 +223,15 @@ MonoBehaviour: height: 258 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 21} m_Panes: + - {fileID: 21} + - {fileID: 20} + - {fileID: 26} - {fileID: 17} - - {fileID: 16} - - {fileID: 22} - - {fileID: 13} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &7 + m_LastSelected: 2 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -170,9 +244,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 3} - - {fileID: 9} + - {fileID: 11} + - {fileID: 6} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 @@ -185,7 +259,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &8 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -207,7 +281,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &9 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -228,7 +302,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &10 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -241,8 +315,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 6} + - {fileID: 14} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 @@ -252,8 +326,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 137 ---- !u!114 &11 + controlID: 155 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,9 +340,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 8} + - {fileID: 15} - {fileID: 5} - - {fileID: 12} - - {fileID: 2} m_Position: serializedVersion: 2 x: 0 @@ -278,8 +352,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 106 ---- !u!114 &12 + controlID: 156 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -300,13 +374,63 @@ MonoBehaviour: height: 689 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 24} m_Panes: - - {fileID: 20} - - {fileID: 15} + - {fileID: 24} + - {fileID: 19} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &13 +--- !u!114 &16 +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: 12043, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 640, y: 580} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Build Settings + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 390 + y: 124 + width: 640 + height: 580 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + 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: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -354,7 +478,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 6} + m_ClientGUIView: {fileID: 9} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -482,7 +606,7 @@ MonoBehaviour: m_ShowReferencedBuses: 1 m_ShowBusConnections: 0 m_ShowBusConnectionsOfSelection: 0 ---- !u!114 &14 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -510,7 +634,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &15 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -591,7 +715,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &16 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -612,17 +736,17 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 691 + y: 762 width: 1546 - height: 308 + height: 237 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 114488 ---- !u!114 &17 + m_LastSelectedObjectID: -45012 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -663,22 +787,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Models/potions m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets + - Assets/Models/potions m_LastFoldersGridSize: 96 - m_LastProjectPath: D:\y\UNIS\3o\s2\vr\VR-Game\VR Room Project + m_LastProjectPath: C:\Users\danit\Desktop\Github\VR-Game\VR Room Project m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: b0630000 - m_LastClickedID: 25520 - m_ExpandedIDs: 00000000b0630000b2630000b4630000b6630000b8630000ba630000bc630000be630000c0630000c2630000c4630000c6630000c8630000ca630000626400006464000066640000946400006289020064890200ffffff7f + scrollPos: {x: 0, y: 71} + m_SelectedIDs: 9eb90000 + m_LastClickedID: 47518 + m_ExpandedIDs: 00000000b6660000b8660000ba660000bc660000be660000c0660000c2660000c4660000c6660000c8660000ca660000cc660000ce660000d0660000d2660000d4660000d6660000d8660000da660000dc660000de660000e0660000e2660000e4660000e6660000e8660000ea660000ec660000ee660000f0660000f26600007467000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -706,7 +830,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000b0630000b2630000b4630000b6630000b8630000ba630000bc630000be630000c0630000c2630000c4630000c6630000c8630000ca630000 + m_ExpandedIDs: 00000000b6660000b8660000ba660000bc660000be660000c0660000c2660000c4660000c6660000c8660000ca660000cc660000ce660000d0660000d2660000d4660000d6660000d8660000da660000dc660000de660000e0660000e2660000e4660000e6660000e8660000ea660000ec660000ee660000f0660000f2660000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -733,7 +857,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000fad70000e6930000d6890000249800001e980000c29d000028640000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -750,7 +874,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 12} + m_ClientGUIView: {fileID: 15} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -762,7 +886,7 @@ MonoBehaviour: m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &18 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -803,7 +927,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &19 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -833,10 +957,10 @@ MonoBehaviour: m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 9} + scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 1ecdfeffbedafeffe2dafeffacdbfeffaadcfeffd8defeffd2b5ffff14e8ffff32f6ffff3ef6ffff42f6ffff7ef6ffff98faffff765a00007e5a0000505b0000a85b00004ac001007cc10100 + m_ExpandedIDs: 18fefeff70fefeff4a08ffff2c50fffff2f6ffffd0f7ffff42faffff46faffff4afaffffdafaffffdefaffff30fbffffac580000fa58000044590000c6590000f8590000705c0000725c0000745c0000765c0000785c00007a5c00007c5c00007e5c0000805c0000825c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -852,7 +976,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -860,7 +984,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &20 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -937,7 +1061,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -1078,16 +1202,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 0 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 0 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.72021997, y: -1.0321877, z: 1.4548548} + m_Target: {x: -12.739617, y: 2.3588634, z: 10.075496} speed: 2 - m_Value: {x: 0.72021997, y: -1.0321877, z: 1.4548548} + m_Value: {x: -12.739617, y: 2.3588634, z: 10.075496} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1134,13 +1258,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.31739464, y: 0.18921074, z: -0.063853174, w: 0.92794573} + m_Target: {x: -0.03641961, y: -0.81449866, z: 0.051362757, w: -0.5768145} speed: 2 - m_Value: {x: 0.31712514, y: 0.18905008, z: -0.06379896, w: 0.9271578} + m_Value: {x: -0.036340937, y: -0.81532735, z: 0.05141508, w: -0.57556695} m_Size: - m_Target: 1.2247449 + m_Target: 1.0340639 speed: 2 - m_Value: 1.2247449 + m_Value: 0.98953485 m_Ortho: m_Target: 0 speed: 2 @@ -1165,7 +1289,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &21 +--- !u!114 &25 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1257,7 +1381,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: -1 m_RenderTexture: {fileID: 0} ---- !u!114 &22 +--- !u!114 &26 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1278,9 +1402,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 691 + y: 762 width: 1546 - height: 308 + height: 237 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default