diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/25e4d604-0634-41ee-b82f-f1007b54275d.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/25e4d604-0634-41ee-b82f-f1007b54275d.vsidx new file mode 100644 index 0000000..998a464 Binary files /dev/null and b/.vs/CultivationOfBrewing-2/FileContentIndex/25e4d604-0634-41ee-b82f-f1007b54275d.vsidx differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/7abfa31d-5f8a-4f2b-b12e-afba0b7c76fb.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/3f086063-6aa3-40d5-b40e-9d1971984be8.vsidx similarity index 90% rename from .vs/CultivationOfBrewing-2/FileContentIndex/7abfa31d-5f8a-4f2b-b12e-afba0b7c76fb.vsidx rename to .vs/CultivationOfBrewing-2/FileContentIndex/3f086063-6aa3-40d5-b40e-9d1971984be8.vsidx index 6affa12..6f85415 100644 Binary files a/.vs/CultivationOfBrewing-2/FileContentIndex/7abfa31d-5f8a-4f2b-b12e-afba0b7c76fb.vsidx and b/.vs/CultivationOfBrewing-2/FileContentIndex/3f086063-6aa3-40d5-b40e-9d1971984be8.vsidx differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/730026f4-108e-4c9d-a9d5-a6d86468c863.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/730026f4-108e-4c9d-a9d5-a6d86468c863.vsidx deleted file mode 100644 index 030ca01..0000000 Binary files a/.vs/CultivationOfBrewing-2/FileContentIndex/730026f4-108e-4c9d-a9d5-a6d86468c863.vsidx and /dev/null differ diff --git a/.vs/CultivationOfBrewing-2/v17/.suo b/.vs/CultivationOfBrewing-2/v17/.suo index bbdacd8..c4d2e5d 100644 Binary files a/.vs/CultivationOfBrewing-2/v17/.suo and b/.vs/CultivationOfBrewing-2/v17/.suo differ diff --git a/Assets/Resources/UI/UIPanel/UI_BGPanel.prefab b/Assets/Resources/UI/UIPanel/UI_BGPanel.prefab index 8d6d37f..8a742b6 100644 --- a/Assets/Resources/UI/UIPanel/UI_BGPanel.prefab +++ b/Assets/Resources/UI/UIPanel/UI_BGPanel.prefab @@ -85,6 +85,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1033102996319418637} + - component: {fileID: -8906246659687236814} m_Layer: 5 m_Name: UI_BGPanel m_TagString: Untagged @@ -113,3 +114,15 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &-8906246659687236814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8746754952583787311} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 82663abe045fcec4e9531a2e71ce21ae, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/TestScenes/LiveScene.unity b/Assets/Scenes/TestScenes/LiveScene.unity index c216fc0..3ae36f4 100644 --- a/Assets/Scenes/TestScenes/LiveScene.unity +++ b/Assets/Scenes/TestScenes/LiveScene.unity @@ -123,6 +123,119 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &21729059 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6891240044807485107, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &21729063 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21729059} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -4713564960810325214, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &27274056 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2503464620565150026, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &27274060 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 27274056} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -2043587208728863738, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &56550367 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2127725726883632429, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &56550371 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56550367} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2146966834713944380, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &375585820 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6899577238814941973, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &375585824 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375585820} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 3417751804086596371, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &428320893 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -1143188817105336646, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} + m_PrefabInstance: {fileID: 510572955} + m_PrefabAsset: {fileID: 0} +--- !u!65 &428320896 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 428320893} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.0087109655, y: 0.0071867015, z: 0.018801335} + m_Center: {x: -0.0003028686, y: -0.00047591137, z: 0.008520696} +--- !u!1 &479279932 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -3569136676398138436, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &479279936 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 479279932} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -6495506971221757245, guid: 543377e480fab384db837fbf32857c2e, type: 3} --- !u!1001 &510572955 PrefabInstance: m_ObjectHideFlags: 0 @@ -174,12 +287,35 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -1143188817105336646, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} propertyPath: m_Name value: "\u6559\u5E08\uFF08\u5E26\u4F38\u624B\u52A8\u753B\uFF09" objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3} +--- !u!1 &529537040 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9187321579145288681, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &529537044 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 529537040} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -6024898228448900963, guid: 543377e480fab384db837fbf32857c2e, type: 3} --- !u!1001 &590408329 PrefabInstance: m_ObjectHideFlags: 0 @@ -240,6 +376,44 @@ PrefabInstance: - {fileID: 8259647949277795141, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} - {fileID: 2399593117623680743, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3} +--- !u!1 &643240520 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -91414122131138103, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &643240522 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643240520} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 1268371127622009216, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &930017688 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1762762565325161054, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &930017692 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930017688} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -1160307367571568844, guid: 543377e480fab384db837fbf32857c2e, type: 3} --- !u!1 &1036008132 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7750243065391104274, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3} @@ -390,6 +564,82 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3} +--- !u!1 &1428740213 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -7293492892796047212, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1428740217 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1428740213} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 3247484560037672690, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &1580293549 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -4441870212160870084, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1580293553 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1580293549} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -4886929517496684665, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &1597163595 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7422468867304708052, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1597163599 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1597163595} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5782805542738625266, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &1615457773 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8139612734896520039, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1615457777 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1615457773} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 8342827997910653767, guid: 543377e480fab384db837fbf32857c2e, type: 3} --- !u!1 &1730488779 GameObject: m_ObjectHideFlags: 0 @@ -484,71 +734,60 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1890439607 +--- !u!1 &1932622561 stripped GameObject: + m_CorrespondingSourceObject: {fileID: 1140031800660271567, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1932622565 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1890439610} - - component: {fileID: 1890439609} - - component: {fileID: 1890439608} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1890439608 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890439607} + m_GameObject: {fileID: 1932622561} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &1890439609 -MonoBehaviour: + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4294646285635927834, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &1934357924 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7594183528745302569, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1934357928 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890439607} + m_GameObject: {fileID: 1934357924} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &1890439610 -Transform: + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2808267537293584687, guid: 543377e480fab384db837fbf32857c2e, type: 3} +--- !u!1 &1972658360 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5773434232050848186, guid: 543377e480fab384db837fbf32857c2e, type: 3} + m_PrefabInstance: {fileID: 1119316674} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1972658364 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1890439607} - 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: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1972658360} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 8273280461326571602, guid: 543377e480fab384db837fbf32857c2e, type: 3} diff --git a/Assets/Scripts/Bootstrap.cs b/Assets/Scripts/Bootstrap.cs index fc5ae98..41a4129 100644 --- a/Assets/Scripts/Bootstrap.cs +++ b/Assets/Scripts/Bootstrap.cs @@ -26,6 +26,7 @@ public class Bootstrap : SingletonMono eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); scenesManager.LoadSceneAsyn("MenuScene", () => { + uiManager.ShowPanel(this, E_UI_Layer.Top, (panel) => { uiManager.ShowPanel(this, E_UI_Layer.Mid, (panel) => @@ -40,4 +41,9 @@ public class Bootstrap : SingletonMono }); }); } + + // Update is called once per frame + void Update() + { + } } diff --git a/Assets/Scripts/UI/UIPanel/UI_TipsForPracticePanel.cs b/Assets/Scripts/UI/UIPanel/UI_TipsForPracticePanel.cs index 3ba16e8..c62cc36 100644 --- a/Assets/Scripts/UI/UIPanel/UI_TipsForPracticePanel.cs +++ b/Assets/Scripts/UI/UIPanel/UI_TipsForPracticePanel.cs @@ -1,6 +1,8 @@ using System.Collections; using System.Collections.Generic; +using System.Diagnostics.Tracing; using UnityEngine; +using UnityEngine.SceneManagement; public class UI_TipsForPracticePanel : BasePanel { @@ -21,16 +23,19 @@ public class UI_TipsForPracticePanel : BasePanel switch (btnName) { case "Button": - Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.System, (panel) => + Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.System, (panel) => { - //Bootstrap.Instance.uiManager.ShowPanel(this, E_UI_Layer.Bot, (panel) => - //{ - // Debug.Log("加载理论学习面板"); - // Bootstrap.Instance.uiManager.HidePanel(); - // Bootstrap.Instance.uiManager.HidePanel(); - //}); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); + Bootstrap.Instance.scenesManager.LoadSceneAsyn("LiveScene", () => + { + Bootstrap.Instance.uiManager.HidePanel(); + Bootstrap.Instance.uiManager.HidePanel(); + Debug.Log("UI_SelectModePanel"); + }); + Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f); }); + break; } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 7dd99f4..c96b0ff 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 42478 + controlID: 69472 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -48,9 +48,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2560 - y: 585 - width: 1050 - height: 414 + y: 650 + width: 1049 + height: 349 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -89,7 +89,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -98,23 +98,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1050 - height: 393 - m_Scale: {x: 0.3638889, y: 0.3638889} - m_Translation: {x: 525, y: 196.5} + width: 1049 + height: 328 + m_Scale: {x: 0.3037037, y: 0.3037037} + m_Translation: {x: 524.5, y: 164} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1442.748 + x: -1727.0122 y: -540 - width: 2885.496 + width: 3454.0244 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.3638889 - m_LastWindowPixelSize: {x: 1050, y: 414} + m_defaultScale: 0.3037037 + m_LastWindowPixelSize: {x: 1049, y: 349} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1051 + width: 1050 height: 947 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 42479 + controlID: 69473 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,10 +162,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1051 - height: 512 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 1050 + height: 577 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 5} m_Panes: - {fileID: 5} @@ -193,8 +193,8 @@ MonoBehaviour: serializedVersion: 2 x: 2560 y: 73 - width: 1050 - height: 491 + width: 1049 + height: 556 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -430,9 +430,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 6.5974827, y: 3.2819297, z: -138.52733} + m_Target: {x: -7.688795, y: 8.9125805, z: -137.75139} speed: 2 - m_Value: {x: 6.5974827, y: 3.2819297, z: -138.52733} + m_Value: {x: -7.688795, y: 8.9125805, z: -137.75139} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -479,13 +479,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.031766064, y: -0.92547786, z: 0.100243986, w: 0.36395088} + m_Target: {x: -0.054680634, y: -0.9271373, z: 0.12492761, w: -0.34907627} speed: 2 - m_Value: {x: -0.03176563, y: 0.92546517, z: -0.100242615, w: -0.3639459} + m_Value: {x: -0.054679688, y: -0.9271213, z: 0.12492545, w: -0.34907025} m_Size: - m_Target: 1.0966064 + m_Target: 1.4565976 speed: 2 - m_Value: 1.0966064 + m_Value: 1.4565976 m_Ortho: m_Target: 0 speed: 2 @@ -503,7 +503,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.031766064, y: -0.92547786, z: 0.100243986, w: 0.36395088} + m_LastSceneViewRotation: {x: -0.054680634, y: -0.9271373, z: 0.12492761, w: -0.34907627} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -526,9 +526,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 512 - width: 1051 - height: 435 + y: 577 + width: 1050 + height: 370 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -551,7 +551,7 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1051 + x: 1050 y: 0 width: 230 height: 947 @@ -582,7 +582,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3611 + x: 3610 y: 73 width: 228 height: 926 @@ -596,7 +596,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 8c6ffeffce86feffd086feffd286feffd486feff3487feff3687feff3887feff3a87feff3c87feffd887feffcc8ffeff1a90feff0aa8feff16a8feff20a8feff92c0feffaac7feff52c9feff30f7feff34f7feff3ef7feff46f7feff52f7fefff829fffffc29ffff062affff0e2affff1a2afffff2b0fffff4b0fffff6b0fffff8b0fffffab0fffffcb0ffff00b1ffff02b1ffff04b1ffff06b1ffff0ab1ffff0eb1ffff10b1ffff12b1ffff16b1ffff18b1ffff1ab1ffff1cb1ffff1eb1ffff22b1ffff2cb1ffff2eb1ffff30b1ffff32b1ffff34b1ffff36b1ffff3ab1ffff3cb1ffff3eb1ffff40b1ffff42b1ffff44b1ffff46b1ffff48b1ffff4ab1ffff4cb1ffff50b1ffff52b1ffffe6b1ffffe2b8ffff32b9ffff82b9ffffd2b9ffff3ebaffff8ac1ffff70edffffccedffff1ceeffff6ceeffffbceeffff0cefffff5cefffff22f1ffff72f1ffff3ef6ffff38fbfffff4ffffff + m_ExpandedIDs: acdffdff3ee2fdff0ce5fdffeef8fdffe002feff9a27feff9428feff9828feff9a28feff8c6ffeffce86feffd086feffd286feffd486feff3487feff3687feff3887feff3a87feff3c87feffd887feffcc8ffeff1a90feff0aa8feff16a8feff20a8feff92c0feffaac7feff52c9feff30f7feff34f7feff3ef7feff46f7feff52f7fefff829fffffc29ffff062affff0e2affff1a2afffff2b0fffff4b0fffff6b0fffff8b0fffffab0fffffcb0ffff00b1ffff02b1ffff04b1ffff06b1ffff0ab1ffff0eb1ffff10b1ffff12b1ffff16b1ffff18b1ffff1ab1ffff1cb1ffff1eb1ffff22b1ffff2cb1ffff2eb1ffff30b1ffff32b1ffff34b1ffff36b1ffff3ab1ffff3cb1ffff3eb1ffff40b1ffff42b1ffff44b1ffff46b1ffff48b1ffff4ab1ffff4cb1ffff50b1ffff52b1ffffe6b1ffffe2b8ffff32b9ffff82b9ffffd2b9ffff3ebaffff8ac1ffff70edffffccedffff1ceeffff6ceeffffbceeffff0cefffff5cefffff22f1ffff72f1ffff3ef6ffff38fbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -635,9 +635,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1281 + x: 1280 y: 0 - width: 198 + width: 297 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -666,9 +666,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3841 + x: 3840 y: 73 - width: 196 + width: 295 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -686,7 +686,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/ArtRes/Animation/Loading + - Assets/Resources/UI/UIPanel m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 @@ -701,7 +701,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 42780000 m_LastClickedID: 30786 - m_ExpandedIDs: 20bdfeffffffffff00000000ce590000d2590000d4590000d6590000d8590000da590000dc590000de590000e0590000e2590000e4590000e6590000e85900000c5a00002c5a0000325a00007a650000a6670000606c0000626c00006e6c0000766c00007a6d0000806d0000f46d0000386e0000ce720000d8720000e4720000e6720000aa730000ac730000b0730000b8730000ba730000c0730000c2730000c4730000c8730000da730000248d0000049100004a980000049a0000bc9b000072a10000cea2000014a400001ce000001ee000009ae800009ce80000 + m_ExpandedIDs: 20bdfeffffffffff00000000ce590000d2590000d4590000d6590000d8590000da590000dc590000de590000e0590000e2590000e4590000e6590000e85900000c5a00002c5a0000325a00007a650000a6670000606c0000626c00006e6c0000766c00007a6d0000806d0000f46d0000386e0000ce720000d8720000e4720000e6720000aa730000ac730000b0730000b8730000ba730000c0730000c2730000c8730000da730000248d0000049100004a980000049a0000bc9b000072a10000cea2000014a400001ce000001ee000009ae800009ce80000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -726,10 +726,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 1380} + scrollPos: {x: 0, y: 592} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 20bdfeffffffffff00000000ce590000d2590000d4590000d6590000d8590000da590000dc590000de590000e0590000e2590000e4590000e6590000e85900000c5a00002c5a0000325a00007a650000a6670000606c0000626c00006e6c0000766c00007a6d0000806d0000f46d0000386e0000ce720000d8720000e4720000e6720000aa730000ac730000b0730000b8730000ba730000c0730000c2730000c4730000c8730000da730000248d0000049100004a980000049a0000bc9b000072a10000cea2000014a400001ce000001ee000009ae800009ce80000 + m_ExpandedIDs: 20bdfeffffffffff00000000ce590000d2590000d4590000d6590000d8590000da590000dc590000de590000e0590000e2590000e4590000e6590000e85900000c5a00002c5a0000325a00007a650000a6670000606c0000626c00006e6c0000766c00007a6d0000806d0000f46d0000386e0000ce720000d8720000e4720000e6720000aa730000ac730000b0730000b8730000ba730000c0730000c2730000c8730000da730000248d0000049100004a980000049a0000bc9b000072a10000cea2000014a400001ce000001ee000009ae800009ce80000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -756,7 +756,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: m_RenameOverlay: m_UserAcceptedRename: 0 @@ -773,7 +773,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 9} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -800,12 +800,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1479 + x: 1577 y: 0 - width: 441 + width: 343 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -832,9 +832,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 4039 + x: 4137 y: 73 - width: 440 + width: 342 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -844,7 +844,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 611 + m_CachedPref: 275 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1