From 6a06e21a968d1004fe35ffdeb1bc88af0e82babb Mon Sep 17 00:00:00 2001 From: Janis M Date: Tue, 21 Dec 2021 10:24:41 +0100 Subject: [PATCH] u --- Assets/Scenes/HomeScene.unity | 95 ++++++++++++-- ProjectSettings/ProjectSettings.asset | 2 +- UserSettings/Layouts/default-2021.dwlt | 170 ++++++++++++------------- 3 files changed, 172 insertions(+), 95 deletions(-) diff --git a/Assets/Scenes/HomeScene.unity b/Assets/Scenes/HomeScene.unity index cf37b7e..3790671 100644 --- a/Assets/Scenes/HomeScene.unity +++ b/Assets/Scenes/HomeScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.18028331, g: 0.2257133, b: 0.3069217, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -233,6 +233,82 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} m_PrefabInstance: {fileID: 2114949036} m_PrefabAsset: {fileID: 0} +--- !u!1 &161875076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 161875077} + - component: {fileID: 161875079} + - component: {fileID: 161875078} + m_Layer: 5 + m_Name: HostMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &161875077 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161875076} + 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: 1535827566} + m_RootOrder: 1 + 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: 0, y: 0} + m_SizeDelta: {x: 400, y: 450} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &161875078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161875076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &161875079 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161875076} + m_CullTransparentMesh: 1 --- !u!1 &295798164 GameObject: m_ObjectHideFlags: 0 @@ -250,7 +326,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &295798165 RectTransform: m_ObjectHideFlags: 0 @@ -1843,7 +1919,7 @@ RectTransform: - {fileID: 83946253} - {fileID: 1647088502} m_Father: {fileID: 1535827566} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -2054,7 +2130,7 @@ GameObject: - component: {fileID: 1361029239} - component: {fileID: 1361029238} m_Layer: 5 - m_Name: JoinMenu + m_Name: oldJoinMenu m_TagString: MenuPanel m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2079,7 +2155,7 @@ RectTransform: - {fileID: 1955114749} - {fileID: 1719615135} m_Father: {fileID: 1535827566} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -2291,6 +2367,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 295798165} + - {fileID: 161875077} - {fileID: 1223089884} - {fileID: 1361029237} - {fileID: 1813956224} @@ -2409,7 +2486,7 @@ GameObject: - component: {fileID: 1813956226} - component: {fileID: 1813956225} m_Layer: 5 - m_Name: HostMenu + m_Name: oldHostMenu m_TagString: MenuPanel m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2433,7 +2510,7 @@ RectTransform: - {fileID: 341462650} - {fileID: 1785160360} m_Father: {fileID: 1535827566} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -2906,7 +2983,7 @@ GameObject: - component: {fileID: 1975475005} - component: {fileID: 1975475004} m_Layer: 5 - m_Name: OptionsMenu + m_Name: oldOptionsMenu m_TagString: MenuPanel m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2927,7 +3004,7 @@ RectTransform: - {fileID: 1638486199} - {fileID: 1849653970} m_Father: {fileID: 1535827566} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 06141df..96a83f6 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -99,7 +99,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 3 + fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index b646774..8ce3165 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: 989 + y: 43.2 + width: 1536 + height: 772.8 m_ShowMode: 4 - m_Title: Scene + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 989 + width: 1536 + height: 773 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1536 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 969 - width: 1920 + y: 753 + width: 1536 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 939 + width: 1536 + height: 723 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 91 + controlID: 88 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1574 - height: 939 + width: 1259 + height: 723 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 100 + controlID: 89 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1574 - height: 626 + width: 1259 + height: 482 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 101 + controlID: 90 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 364 - height: 626 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 291 + height: 482 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -211,10 +211,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 364 + x: 291 y: 0 - width: 1210 - height: 626 + width: 968 + height: 482 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -239,9 +239,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 626 - width: 1574 - height: 313 + y: 482 + width: 1259 + height: 241 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -265,10 +265,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1574 + x: 1259 y: 0 - width: 346 - height: 939 + width: 277 + height: 723 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -292,14 +292,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 364 - y: 73 - width: 1208 - height: 605 + x: 291.2 + y: 73.6 + width: 966 + height: 461 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -310,7 +310,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1038, y: 584} + m_TargetSize: {x: 782, y: 440} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -519 - m_HBaseRangeMax: 519 - m_VBaseRangeMin: -292 - m_VBaseRangeMax: 292 + m_HBaseRangeMin: -312.80002 + m_HBaseRangeMax: 312.80002 + m_VBaseRangeMin: -176 + m_VBaseRangeMax: 176 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1208 - height: 584 + width: 966 + height: 440 m_Scale: {x: 1, y: 1} - m_Translation: {x: 604, y: 292} + m_Translation: {x: 483, y: 220} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -604 - y: -292 - width: 1208 - height: 584 + x: -483 + y: -220 + width: 966 + height: 440 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1208, y: 605} + m_LastWindowPixelSize: {x: 1207.5, y: 576.25} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -384,14 +384,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: 363 - height: 605 + y: 73.6 + width: 290 + height: 461 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -399,9 +399,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 44f9ffff - m_LastClickedID: -1724 - m_ExpandedIDs: f6faffffe66c0000206d00002a6d00005e6d0000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 60cefffface1ffff64e2ffffcce2fffffce3ffffe4e5ffff6eecffff24edffff26f0ffff6cf1ffff54f3ffffa2faffffc09600003e970000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -441,14 +441,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: 364 - y: 73 - width: 1208 - height: 605 + x: 291.2 + y: 73.6 + width: 966 + height: 461 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -459,7 +459,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -100, y: -26} - snapOffsetDelta: {x: -1, y: 0} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -661,9 +661,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 796.63916, y: 351.2813, z: 104.907814} + m_Target: {x: 348.675, y: 199.9411, z: 1.4964427} speed: 2 - m_Value: {x: 772.13995, y: 346.71594, z: 105.16953} + m_Value: {x: 348.675, y: 199.9411, z: 1.4964427} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -712,11 +712,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: -0, y: 0, z: -0, w: -1} m_Size: - m_Target: 607.76526 + m_Target: 300.39212 speed: 2 - m_Value: 581.59357 + m_Value: 300.39212 m_Ortho: m_Target: 1 speed: 2 @@ -757,14 +757,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: 699 - width: 1573 - height: 292 + y: 555.2 + width: 1258 + height: 220 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -782,22 +782,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/HomeMenu + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/HomeMenu + - Assets m_LastFoldersGridSize: -1 - m_LastProjectPath: M:\Programs\Unity\PROJECTS\defrain + m_LastProjectPath: C:\Users\Janis\Unity Projects\defrain m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 144} - m_SelectedIDs: 80730000 - m_LastClickedID: 29568 - m_ExpandedIDs: 000000005c7300005e7300007673000000ca9a3b + scrollPos: {x: 0, y: 79} + m_SelectedIDs: 88730000 + m_LastClickedID: 29576 + m_ExpandedIDs: 00000000887300008a7300008c73000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -825,7 +825,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005c7300005e730000 + m_ExpandedIDs: 00000000887300008a7300008c730000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -897,7 +897,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 @@ -925,14 +925,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: 1574 - y: 73 - width: 345 - height: 918 + x: 1259.2001 + y: 73.6 + width: 276 + height: 702 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default