From dc62dddb112f3e9e76e80b797c614d583e20f972 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Thu, 16 Dec 2021 21:57:14 +0100 Subject: [PATCH] updated to 2021.2.7f had to updated because of Lobby-System Merge --- Packages/manifest.json | 8 +- Packages/packages-lock.json | 20 +-- ProjectSettings/ProjectVersion.txt | 4 +- UserSettings/Layouts/default-2021.dwlt | 208 ++++++++++++------------- 4 files changed, 120 insertions(+), 120 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 62ec3b6..2145a3d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,15 +2,15 @@ "dependencies": { "com.hwaet.projectcloner": "https://github.com/hwaet/UnityProjectCloner.git", "com.unity.animation.rigging": "1.1.1", - "com.unity.collab-proxy": "1.15.1", + "com.unity.collab-proxy": "1.15.4", "com.unity.ide.rider": "3.0.7", "com.unity.ide.visualstudio": "2.0.12", "com.unity.ide.vscode": "1.2.4", - "com.unity.postprocessing": "3.1.1", - "com.unity.render-pipelines.universal": "12.1.1", + "com.unity.postprocessing": "3.2.0", + "com.unity.render-pipelines.universal": "12.1.2", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.2", + "com.unity.timeline": "1.6.3", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.6", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 290a57e..d2dbfdf 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -27,7 +27,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.15.1", + "version": "1.15.4", "depth": 0, "source": "registry", "dependencies": { @@ -69,7 +69,7 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.4", + "version": "1.2.5", "depth": 1, "source": "registry", "dependencies": {}, @@ -83,7 +83,7 @@ "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.1.1", + "version": "3.2.0", "depth": 0, "source": "registry", "dependencies": { @@ -92,7 +92,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.1", + "version": "12.1.2", "depth": 1, "source": "builtin", "dependencies": { @@ -102,14 +102,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "12.1.1", + "version": "12.1.2", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.5.0", - "com.unity.render-pipelines.core": "12.1.1", - "com.unity.shadergraph": "12.1.1" + "com.unity.render-pipelines.core": "12.1.2", + "com.unity.shadergraph": "12.1.2" } }, "com.unity.searcher": { @@ -129,11 +129,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.1", + "version": "12.1.2", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.1", + "com.unity.render-pipelines.core": "12.1.2", "com.unity.searcher": "4.9.1" } }, @@ -158,7 +158,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.2", + "version": "1.6.3", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d1f16a3..bbae793 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.2.3f1 -m_EditorVersionWithRevision: 2021.2.3f1 (32358a8527b4) +m_EditorVersion: 2021.2.7f1 +m_EditorVersionWithRevision: 2021.2.7f1 (6bd9e232123f) diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 0fc03cf..f84973a 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43 - width: 2560 - height: 1357 + x: -5 + y: 84 + width: 1920 + height: 989 m_ShowMode: 4 m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 - height: 1357 + width: 1920 + height: 989 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: 2560 + width: 1920 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: 1337 - width: 2560 + y: 969 + width: 1920 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: 2560 - height: 1307 + width: 1920 + height: 939 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 39 + controlID: 107 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2099 - height: 1307 + width: 1574 + height: 939 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 40 + controlID: 108 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2099 - height: 929 + width: 1574 + height: 667 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 41 + controlID: 109 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,8 +188,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 230 - height: 929 + width: 172 + height: 667 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} @@ -212,12 +212,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 230 + x: 172 y: 0 - width: 971 - height: 929 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 728 + height: 667 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 17} @@ -239,10 +239,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1201 + x: 900 y: 0 - width: 898 - height: 929 + width: 674 + height: 667 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 15} @@ -268,13 +268,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 929 - width: 2099 - height: 378 + y: 667 + width: 1574 + height: 272 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 61 + controlID: 118 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -292,8 +292,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1201 - height: 378 + width: 901 + height: 272 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 19} @@ -316,10 +316,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1201 + x: 901 y: 0 - width: 898 - height: 378 + width: 673 + height: 272 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} @@ -342,10 +342,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 2099 + x: 1574 y: 0 - width: 461 - height: 1307 + width: 346 + height: 939 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 21} @@ -373,10 +373,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1201 - y: 73 - width: 896 - height: 908 + x: 895 + y: 114 + width: 672 + height: 646 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -387,7 +387,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 896, y: 887} + m_TargetSize: {x: 672, y: 625} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -402,10 +402,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -448 - m_HBaseRangeMax: 448 - m_VBaseRangeMin: -443.5 - m_VBaseRangeMax: 443.5 + m_HBaseRangeMin: -336 + m_HBaseRangeMax: 336 + m_VBaseRangeMin: -312.5 + m_VBaseRangeMax: 312.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -423,23 +423,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 896 - height: 887 + width: 672 + height: 625 m_Scale: {x: 1, y: 1} - m_Translation: {x: 448, y: 443.5} + m_Translation: {x: 336, y: 312.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -448 - y: -443.5 - width: 896 - height: 887 + x: -336 + y: -312.5 + width: 672 + height: 625 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 896, y: 908} + m_LastWindowPixelSize: {x: 672, y: 646} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -466,9 +466,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 229 - height: 908 + y: 19 + width: 171 + height: 646 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -476,9 +476,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 66480000 m_LastClickedID: 0 - m_ExpandedIDs: baf8ffff + m_ExpandedIDs: 78dbffff42deffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -603,10 +603,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 230 - y: 73 - width: 969 - height: 908 + x: 167 + y: 114 + width: 726 + height: 646 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -814,14 +814,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -78.60157, y: -36.421288, z: -33.39213} + m_Target: {x: 283.3556, y: 233.02687, z: 82.1845} speed: 2 - m_Value: {x: -78.60157, y: -36.421288, z: -33.39213} + m_Value: {x: 283.3556, y: 233.02687, z: 82.1845} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -831,7 +831,7 @@ MonoBehaviour: m_DoValidateTrueMetals: 0 m_ExposureSliderValue: 0 m_SceneViewState: - m_AlwaysRefresh: 1 + m_AlwaysRefresh: 0 showFog: 1 showSkybox: 1 showFlares: 1 @@ -850,17 +850,17 @@ MonoBehaviour: m_Size: {x: 1, y: 1} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + 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} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 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} @@ -868,17 +868,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.11389863, y: -0.81114566, z: 0.16859324, w: 0.54827297} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0.11390107, y: -0.81116307, z: 0.16859686, w: 0.5482847} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 55.953186 + m_Target: 281.4821 speed: 2 - m_Value: 55.953186 + m_Value: 281.4821 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -892,7 +892,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.11389863, y: -0.81114566, z: 0.16859324, w: 0.54827297} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -920,17 +920,16 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 1002 - width: 1200 - height: 357 + y: 19 + width: 900 + height: 251 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_SearchFilter: m_NameFilter: - m_ClassNames: - - Prefab + m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] m_VersionControlStates: [] @@ -940,22 +939,23 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/Player + - Assets/Scenes m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\.Downloads\Unity\Projects\defrain + m_LastProjectPath: M:\Programs\Unity\PROJECTS\defrain m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 04ca9a3b - m_LastClickedID: 1000000004 - m_ExpandedIDs: 000000000c7600000e7600001076000000ca9a3b + scrollPos: {x: 0, y: 25} + m_SelectedIDs: 3a9f0000 + m_LastClickedID: 40762 + m_ExpandedIDs: 00000000209f0000229f000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -983,7 +983,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000000c7600000e76000010760000 + m_ExpandedIDs: 00000000209f0000229f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1010,7 +1010,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e6000003665000060600000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1059,10 +1059,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1201 - y: 1002 - width: 896 - height: 357 + x: 902 + y: 19 + width: 671 + height: 251 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1087,10 +1087,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2099 - y: 73 - width: 460 - height: 1286 + x: 1575 + y: 19 + width: 345 + height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default