From dedeb7567f2660c96cccbdfc89b81589ce84f42d Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Mon, 20 Dec 2021 16:43:13 +0100 Subject: [PATCH] ghdx --- Assets/Prefabs/UI/HomeSceneBtn.prefab | 2 +- Assets/Scenes/HomeScene.unity | 122 ++++++---- Assets/Scripts/HomeMenu/HomeSceneBtnScript.cs | 8 +- Packages/manifest.json | 1 + Packages/packages-lock.json | 26 ++ ProjectSettings/ProjectSettings.asset | 5 +- UserSettings/Layouts/default-2021.dwlt | 228 ++++++------------ 7 files changed, 188 insertions(+), 204 deletions(-) diff --git a/Assets/Prefabs/UI/HomeSceneBtn.prefab b/Assets/Prefabs/UI/HomeSceneBtn.prefab index 3d568a0..3377d62 100644 --- a/Assets/Prefabs/UI/HomeSceneBtn.prefab +++ b/Assets/Prefabs/UI/HomeSceneBtn.prefab @@ -348,7 +348,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e69f5ca575cd164aa893c1f9673916d, type: 3} m_Name: m_EditorClassIdentifier: - onHoverColor: {r: 1, g: 1, b: 1, a: 0.05882353} + onHoverColor: {r: 1, g: 1, b: 1, a: 0.019607844} onPressedColor: {r: 0, g: 0, b: 0, a: 0} hoverBgTransitionTime: 0.4 exitBgTransitionTime: 0.2 diff --git a/Assets/Scenes/HomeScene.unity b/Assets/Scenes/HomeScene.unity index 0de1759..cf37b7e 100644 --- a/Assets/Scenes/HomeScene.unity +++ b/Assets/Scenes/HomeScene.unity @@ -233,17 +233,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} m_PrefabInstance: {fileID: 2114949036} m_PrefabAsset: {fileID: 0} ---- !u!114 &83946255 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6292287315077470204, guid: a973691757099224ca132b32daabf67c, type: 3} - m_PrefabInstance: {fileID: 2114949036} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &295798164 GameObject: m_ObjectHideFlags: 0 @@ -1027,6 +1016,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} m_PrefabInstance: {fileID: 2146567966} m_PrefabAsset: {fileID: 0} +--- !u!114 &873701842 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1952951606010838921, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} + m_PrefabInstance: {fileID: 2146567966} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &908221431 PrefabInstance: m_ObjectHideFlags: 0 @@ -1157,17 +1157,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} m_PrefabInstance: {fileID: 908221431} m_PrefabAsset: {fileID: 0} ---- !u!114 &908221434 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6292287315077470204, guid: a973691757099224ca132b32daabf67c, type: 3} - m_PrefabInstance: {fileID: 908221431} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &958699927 GameObject: m_ObjectHideFlags: 0 @@ -1179,6 +1168,7 @@ GameObject: - component: {fileID: 958699930} - component: {fileID: 958699929} - component: {fileID: 958699928} + - component: {fileID: 958699931} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1252,6 +1242,39 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &958699931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958699927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!224 &979232035 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8580211107013450537, guid: 39cebc5bdea8db94c8b7d687886df440, type: 3} @@ -1306,8 +1329,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 110.20001, y: -111.17679} - m_SizeDelta: {x: 125.3295, y: 186.0593} + m_AnchoredPosition: {x: 110.20001, y: -109.80578} + m_SizeDelta: {x: 125.3295, y: 168.6933} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &996072823 MonoBehaviour: @@ -1669,6 +1692,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} m_PrefabInstance: {fileID: 1952951604882001357} m_PrefabAsset: {fileID: 0} +--- !u!114 &1128837700 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1952951606010838921, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} + m_PrefabInstance: {fileID: 1952951604882001357} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1209917631 PrefabInstance: m_ObjectHideFlags: 0 @@ -2319,13 +2353,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62a9b64eb5d37bb43a7f4ff101582b6f, type: 3} m_Name: m_EditorClassIdentifier: - MainPanel: {fileID: 1223089883} + MainPanel: {fileID: 295798164} JoinPanel: {fileID: 1361029236} HostPanel: {fileID: 1813956223} OptionsPanel: {fileID: 1975475002} - JoinBtn: {fileID: 908221434} - HostBtn: {fileID: 83946255} - OptionsBtn: {fileID: 1647088504} + JoinBtn: {fileID: 1128837700} + HostBtn: {fileID: 873701842} + OptionsBtn: {fileID: 1843465437} --- !u!224 &1638486199 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} @@ -2336,17 +2370,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} m_PrefabInstance: {fileID: 382539318} m_PrefabAsset: {fileID: 0} ---- !u!114 &1647088504 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6292287315077470204, guid: a973691757099224ca132b32daabf67c, type: 3} - m_PrefabInstance: {fileID: 382539318} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &1719615135 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2454942472495841689, guid: a973691757099224ca132b32daabf67c, type: 3} @@ -2472,6 +2495,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} m_PrefabInstance: {fileID: 1956000183} m_PrefabAsset: {fileID: 0} +--- !u!114 &1843465437 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1952951606010838921, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} + m_PrefabInstance: {fileID: 1956000183} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1849653969 GameObject: m_ObjectHideFlags: 0 @@ -2708,7 +2742,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_AnchoredPosition.y - value: 99.1 + value: 46.1 objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3517,7 +3551,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 0.000001847744 objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_SizeDelta.y @@ -3557,7 +3591,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_AnchoredPosition.y - value: 124.1 + value: 71.100006 objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3614,7 +3648,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 0.000001847744 objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_SizeDelta.y @@ -3654,7 +3688,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_AnchoredPosition.y - value: 150 + value: 97 objectReference: {fileID: 0} - target: {fileID: 1952951606010838927, guid: a6fdd5e6eafd484449b4f79000059d6b, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Scripts/HomeMenu/HomeSceneBtnScript.cs b/Assets/Scripts/HomeMenu/HomeSceneBtnScript.cs index ecaa7a5..f447fc8 100644 --- a/Assets/Scripts/HomeMenu/HomeSceneBtnScript.cs +++ b/Assets/Scripts/HomeMenu/HomeSceneBtnScript.cs @@ -3,7 +3,7 @@ using UnityEngine.UI; using UnityEngine.EventSystems; -public class HomeSceneBtnScript : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler +public class HomeSceneBtnScript : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler { [SerializeField] Color onHoverColor; [SerializeField] Color onPressedColor; @@ -73,4 +73,10 @@ public class HomeSceneBtnScript : MonoBehaviour, IPointerEnterHandler, IPointerE { isHovering = false; } + + public void OnPointerClick(PointerEventData eventData) + { + isHovering = false; + } + } diff --git a/Packages/manifest.json b/Packages/manifest.json index 2145a3d..154877e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -11,6 +11,7 @@ "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.3", + "com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview", "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 d2dbfdf..52e4cae 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -137,6 +137,22 @@ "com.unity.searcher": "4.9.1" } }, + "com.unity.sysroot": { + "version": "0.1.19-preview", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "0.1.14-preview", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "0.1.18-preview" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.29", "depth": 0, @@ -169,6 +185,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "0.1.21-preview", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "0.1.19-preview", + "com.unity.sysroot.linux-x86_64": "0.1.14-preview" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 44fb51c..06141df 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -42,8 +42,8 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 768 + defaultScreenWidth: 1920 + defaultScreenHeight: 1080 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 @@ -706,4 +706,3 @@ PlayerSettings: playerDataPath: forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 - uploadClearedTextureDataAfterCreationFromScript: 1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index fa5a1d1..b646774 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: -1920 + x: 0 y: 43 width: 1920 - height: 1037 + height: 989 m_ShowMode: 4 - m_Title: Game + m_Title: Scene m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -45,7 +45,7 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 1037 + height: 989 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -90,7 +90,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1017 + y: 969 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} @@ -115,11 +115,11 @@ MonoBehaviour: x: 0 y: 30 width: 1920 - height: 987 + height: 939 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 68 + controlID: 91 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,11 +140,11 @@ MonoBehaviour: x: 0 y: 0 width: 1574 - height: 987 + height: 939 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 69 + controlID: 100 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,11 +165,11 @@ MonoBehaviour: x: 0 y: 0 width: 1574 - height: 701 + height: 626 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 70 + controlID: 101 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 274 - height: 701 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 364 + height: 626 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -211,19 +211,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 274 + x: 364 y: 0 - width: 1300 - height: 701 + width: 1210 + height: 626 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - - {fileID: 15} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 2 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,15 +239,15 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 701 + y: 626 width: 1574 - height: 286 + height: 313 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 15} m_Panes: + - {fileID: 15} - {fileID: 16} - - {fileID: 17} m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 @@ -269,12 +268,12 @@ MonoBehaviour: x: 1574 y: 0 width: 346 - height: 987 + height: 939 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 18} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 @@ -297,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1646 + x: 364 y: 73 - width: 1298 - height: 680 + width: 1208 + height: 605 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -311,7 +310,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1172, y: 659} + m_TargetSize: {x: 1038, y: 584} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -326,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -586 - m_HBaseRangeMax: 586 - m_VBaseRangeMin: -329.5 - m_VBaseRangeMax: 329.5 + m_HBaseRangeMin: -519 + m_HBaseRangeMax: 519 + m_VBaseRangeMin: -292 + m_VBaseRangeMax: 292 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -338,7 +337,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -347,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1298 - height: 659 + width: 1208 + height: 584 m_Scale: {x: 1, y: 1} - m_Translation: {x: 649, y: 329.5} + m_Translation: {x: 604, y: 292} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -649 - y: -329.5 - width: 1298 - height: 659 + x: -604 + y: -292 + width: 1208 + height: 584 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1298, y: 680} + m_LastWindowPixelSize: {x: 1208, y: 605} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -389,10 +388,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1920 + x: 0 y: 73 - width: 273 - height: 680 + width: 363 + height: 605 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -400,9 +399,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ec50ffff - m_LastClickedID: -44820 - m_ExpandedIDs: cce6ffff1cf2fffff4faffff066d0000366d0000 + m_SelectedIDs: 44f9ffff + m_LastClickedID: -1724 + m_ExpandedIDs: f6faffffe66c0000206d00002a6d00005e6d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -427,87 +426,6 @@ MonoBehaviour: m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 --- !u!114 &14 -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: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 328.80002 - y: 73.6 - width: 318 - height: 418 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - - {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} - m_ValueSerializationHelper: - - e00: 0.70260465 - e01: 0 - e02: 0 - e03: -189.3735 - e10: 0 - e11: 0.70260465 - e12: 0 - e13: 63.08463 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.6782804 - e01: 0 - e02: 0 - e03: -240.35721 - e10: 0 - e11: 0.6782804 - e12: 0 - e13: 92.776474 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: bcfd120671431f84097ebc1045370f76, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 0 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -527,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1646 + x: 364 y: 73 - width: 1298 - height: 680 + width: 1208 + height: 605 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -743,9 +661,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 306.8799, y: 148.71523, z: 89.39089} + m_Target: {x: 796.63916, y: 351.2813, z: 104.907814} speed: 2 - m_Value: {x: 306.8799, y: 148.71523, z: 89.39089} + m_Value: {x: 772.13995, y: 346.71594, z: 105.16953} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -796,9 +714,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 374.17828 + m_Target: 607.76526 speed: 2 - m_Value: 374.17828 + m_Value: 581.59357 m_Ortho: m_Target: 1 speed: 2 @@ -823,7 +741,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -843,10 +761,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1920 - y: 774 + x: 0 + y: 699 width: 1573 - height: 265 + height: 292 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -864,22 +782,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs/UI + - Assets/Scripts/HomeMenu m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs/UI + - Assets/Scripts/HomeMenu m_LastFoldersGridSize: -1 m_LastProjectPath: M:\Programs\Unity\PROJECTS\defrain m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 91} - m_SelectedIDs: 24820000 - m_LastClickedID: 33316 - m_ExpandedIDs: 0000000002730000047300001c73000000ca9a3b + scrollPos: {x: 0, y: 144} + m_SelectedIDs: 80730000 + m_LastClickedID: 29568 + m_ExpandedIDs: 000000005c7300005e7300007673000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -907,7 +825,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000000273000004730000 + m_ExpandedIDs: 000000005c7300005e730000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -963,7 +881,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &17 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -991,7 +909,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &18 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1011,10 +929,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -346 + x: 1574 y: 73 width: 345 - height: 966 + height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default