diff --git a/.vs/CultivationOfBrewing-2/v17/.suo b/.vs/CultivationOfBrewing-2/v17/.suo index 29c0847..bd54248 100644 Binary files a/.vs/CultivationOfBrewing-2/v17/.suo and b/.vs/CultivationOfBrewing-2/v17/.suo differ diff --git a/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png b/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png index 7ba5abf..3c62ad0 100644 Binary files a/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png and b/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png differ diff --git a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity index 98a487b..b6a2c58 100644 --- a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity +++ b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity @@ -2326,6 +2326,10 @@ PrefabInstance: propertyPath: m_Layer value: 12 objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c2856bfa3d81f92498566f93928c119a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2968176957616119868, guid: c2856bfa3d81f92498566f93928c119a, type: 3} propertyPath: m_Name value: "\u7A57" @@ -5808,7 +5812,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1135868956} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.2677359, z: 0.80145013} + m_LocalPosition: {x: -0.01, y: 0.079, z: 0.743} m_LocalScale: {x: 0.88070804, y: 0.88070816, z: 0.88070816} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6872,15 +6876,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 1037398675} - distance: 5 - xSpeed: 10 - ySpeed: 10 + distance: 1 + xSpeed: 100 + ySpeed: 100 scrollSpeed: 1 yMinLimit: -20 yMaxLimit: 80 - distanceMin: 0.5 - distanceMax: 15 - smoothTime: 2 + distanceMin: 1 + distanceMax: 5 + smoothTime: 15 rotationYAxis: 0 rotationXAxis: 0 velocityX: 0 @@ -8011,15 +8015,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 1505325485} - distance: 5 - xSpeed: 10 - ySpeed: 10 + distance: 1 + xSpeed: 100 + ySpeed: 100 scrollSpeed: 1 yMinLimit: -20 yMaxLimit: 80 - distanceMin: 0.5 - distanceMax: 15 - smoothTime: 2 + distanceMin: 1 + distanceMax: 5 + smoothTime: 15 rotationYAxis: 0 rotationXAxis: 0 velocityX: 0 diff --git a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab index 96bc3ee..04e2018 100644 --- a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab @@ -2087,7 +2087,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6890361338012026168 RectTransform: m_ObjectHideFlags: 0 @@ -2136,7 +2136,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c690750a2bdfd846b732a727903f291, type: 3} + m_Sprite: {fileID: 21300000, guid: 79f9b1d682f470f40ab600dade2c369d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab index cd89b4d..ced7859 100644 --- a/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab @@ -11320,7 +11320,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -11729,7 +11729,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &455025718827277910 RectTransform: m_ObjectHideFlags: 0 @@ -13599,14 +13599,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + 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: 21300000, guid: 35e6277db608d86409a6fcb87ff3388e, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scripts/HQB/SorghumController.cs b/Assets/Scripts/HQB/SorghumController.cs index 19e0336..eebd985 100644 --- a/Assets/Scripts/HQB/SorghumController.cs +++ b/Assets/Scripts/HQB/SorghumController.cs @@ -95,14 +95,14 @@ public class SorghumController : PermanentTriggerBase { targetHD.SetActive(true); targetSD.SetActive(false); - GameManager.UIMgr.ShowPanel(E_UI_Layer.Top); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot); GameManager.UIMgr.ShowPanel(E_UI_Layer.Top, (p) => { p.Init(); }); } else { targetHD.SetActive(false); targetSD.SetActive(true); - GameManager.UIMgr.ShowPanel(E_UI_Layer.Top); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot); GameManager.UIMgr.ShowPanel(E_UI_Layer.Top, (p) => { p.Init(); }); } } diff --git a/Assets/Scripts/Project/Manager/GameManager.cs b/Assets/Scripts/Project/Manager/GameManager.cs index c0c0dd0..c3b3b9a 100644 --- a/Assets/Scripts/Project/Manager/GameManager.cs +++ b/Assets/Scripts/Project/Manager/GameManager.cs @@ -291,14 +291,14 @@ public class GameManager : SingletonAutoMono UIMgr.ShowPanel(E_UI_Layer.Bot); - UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => { panel.Init(); }); // StartCoroutine(AsyncFinalLoadScene()); //显示UI菜单列表 if (NetMgr.operationType != "3") { //UIMgr.ShowPanel(E_UI_Layer.Mid); - UIMgr.ShowPanel(E_UI_Layer.Mid, panel => { panel.Init();}); + UIMgr.ShowPanel(E_UI_Layer.Top, panel => { panel.Init(); }); + UIMgr.ShowPanel(E_UI_Layer.Top, (panel) => { panel.Init(); }); //加载场景 /显示UI ScenesMgr.LoadSceneAsyn("02_MenuScene", () => { @@ -367,19 +367,19 @@ public class GameManager : SingletonAutoMono }); } -//#if UNITY_EDITOR -// void OnGUI() -// { -// // 设置GUI样式（可选） -// GUIStyle style = new GUIStyle(); -// style.fontSize = 20; -// style.normal.textColor = Color.red; + //#if UNITY_EDITOR + // void OnGUI() + // { + // // 设置GUI样式（可选） + // GUIStyle style = new GUIStyle(); + // style.fontSize = 20; + // style.normal.textColor = Color.red; -// // 在屏幕上绘制调试信息 -// GUILayout.Label(" " + SecurityCheck.instance.debugStr + "\n " + SecurityCheck.instance.read + "/" + SecurityCheck.instance.total, style); -// GUILayout.Label(" " + debugInfo, style); -// } -//#endif + // // 在屏幕上绘制调试信息 + // GUILayout.Label(" " + SecurityCheck.instance.debugStr + "\n " + SecurityCheck.instance.read + "/" + SecurityCheck.instance.total, style); + // GUILayout.Label(" " + debugInfo, style); + // } + //#endif /// /// 学习调用 diff --git a/Assets/Scripts/Project/Manager/OfficeManager.cs b/Assets/Scripts/Project/Manager/OfficeManager.cs index dcc5898..d041f6e 100644 --- a/Assets/Scripts/Project/Manager/OfficeManager.cs +++ b/Assets/Scripts/Project/Manager/OfficeManager.cs @@ -75,7 +75,7 @@ public class OfficeManager : SingletonMono { if (!GameManager.UIMgr.GetPanel()) { - GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => + GameManager.UIMgr.ShowPanel(E_UI_Layer.Top, (panel) => { panel.Init(GameManager.ProcessMgr.subProcessId); }); diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_FaultSelectionRegistrationPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_FaultSelectionRegistrationPanel.cs index 63e2770..e24a674 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_FaultSelectionRegistrationPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_FaultSelectionRegistrationPanel.cs @@ -238,7 +238,7 @@ public class UI_FaultSelectionRegistrationPanel : BasePanel }); break; case "RetrunBtn": - GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, panel => { panel.Init(); }); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Top, panel => { panel.Init(); }); GameManager.UIMgr.HidePanel(); break; } diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs index 608a0d7..a789a40 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs @@ -330,7 +330,7 @@ public class UI_MenuBar : BasePanel } break; case "FaultRegBtn"://PPT - GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot); GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => { GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectModePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectModePanel.cs index 8faec64..6dc26ba 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectModePanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectModePanel.cs @@ -52,7 +52,7 @@ public class UI_SelectModePanel : BasePanel break; case "Practical assessment_Btn": Debug.Log("加载实操考核"); - GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => + GameManager.UIMgr.ShowPanel(E_UI_Layer.Top, (panel) => { GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchMode); panel.Init(); diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 96ed1bb..35d9b88 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,31 +6,31 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 01070d5f560c5e0d5f0f5c7240735b4444164a2c2e7a7f3579784e63e4b06d61 - flags: 0 - RecentlyUsedSceneGuid-1: value: 54090c025006080809565e7249740e444015492f297f7565287d1b65b7b2323a flags: 0 - RecentlyUsedSceneGuid-2: + RecentlyUsedSceneGuid-1: value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a flags: 0 - RecentlyUsedSceneGuid-3: - value: 020207045d025c580b565f2047225c44424e4d7d2a2a74317b7f1e6ae7b26260 + RecentlyUsedSceneGuid-2: + value: 5b52575304530d5e585e5926147108444415417c2e707132752b4e60e0e6673b flags: 0 - RecentlyUsedSceneGuid-4: + RecentlyUsedSceneGuid-3: value: 5401015552000c5f5d0d0a7b12725d4443161c7c7c7023677f2c4e6bb5e3303a flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-4: value: 505457525c055d0d5b0d5c7344265c444e4e4d7c7c7a22322b7e4e32e7b7316d flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-5: value: 0653525e54025c0a550f547040750b44424e1a2c7d782464757e1c62e3e56d6e flags: 0 + RecentlyUsedSceneGuid-6: + value: 01570d5103070a5e540f5a7514710d4442164078292e70362e70486bb2e6633e + flags: 0 RecentlyUsedSceneGuid-7: - value: 055302565656080e0f575d2346260644404e192c757c22357d794e65e3b9373e + value: 020207045d025c580b565f2047225c44424e4d7d2a2a74317b7f1e6ae7b26260 flags: 0 RecentlyUsedSceneGuid-8: - value: 5b52575304530d5e585e5926147108444415417c2e707132752b4e60e0e6673b + value: 055302565656080e0f575d2346260644404e192c757c22357d794e65e3b9373e flags: 0 RecentlyUsedSceneGuid-9: value: 020355555607505e0e0b097b4821594412161a7f2f2b24672b701c65b1e5353c diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index e9cbf23..9c9afc0 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: 284 + controlID: 26583 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -48,9 +48,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 744 - width: 1209 - height: 615 + y: 923 + width: 1267 + height: 436 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -62,7 +62,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1209, y: 594} + m_TargetSize: {x: 1920, y: 1080} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -71,16 +71,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -604.5 - m_HBaseRangeMax: 604.5 - m_VBaseRangeMin: -297 - m_VBaseRangeMax: 297 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -98,23 +98,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1209 - height: 594 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 604.5, y: 297} + width: 1267 + height: 415 + m_Scale: {x: 0.38425925, y: 0.38425925} + m_Translation: {x: 633.5, y: 207.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -604.5 - y: -297 - width: 1209 - height: 594 + x: -1648.6266 + y: -540 + width: 3297.2532 + height: 1080 m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1209, y: 615} + m_defaultScale: 0.38425925 + m_LastWindowPixelSize: {x: 1267, y: 436} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -128,7 +128,7 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1210 + width: 1268 height: 1307 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 285 + controlID: 26584 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,8 +162,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1210 - height: 671 + width: 1268 + height: 850 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} @@ -193,8 +193,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 1209 - height: 650 + width: 1267 + height: 829 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -248,7 +248,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 @@ -270,7 +270,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: 67.5, y: 9} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -425,14 +425,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: 0, y: 0, z: 0} + m_Target: {x: 764.72015, y: 782.3851, z: 5.64842} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: 764.72015, y: 782.3851, z: 5.64842} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -458,8 +458,16 @@ MonoBehaviour: 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: 0, y: 0} + m_Size: {x: 1, y: 1} yGrid: + m_Fade: + m_Target: 0 + speed: 2 + 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: 1 speed: 2 @@ -467,29 +475,21 @@ MonoBehaviour: 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 - speed: 2 - 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: 0, y: 0} m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10 + m_Target: 536.5591 speed: 2 - m_Value: 10 + m_Value: 536.5591 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 @@ -503,7 +503,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewRotation: {x: 0.33691344, y: 0.25151747, z: -0.09390435, w: 0.90244687} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -518,19 +518,19 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 671 - width: 1210 - height: 636 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + y: 850 + width: 1268 + height: 457 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -551,9 +551,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1210 + x: 1268 y: 0 - width: 411 + width: 352 height: 1307 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -582,9 +582,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1210 + x: 1268 y: 73 - width: 409 + width: 350 height: 1286 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -596,7 +596,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: + m_ExpandedIDs: 14e87afe18e87afe1ce87afe20e87afe2ae87afe821f7bfe881f7bfe32237bfe8ea38cfeb6aa8cfebaaa8cfebeaa8cfec2aa8cfeccaa8cfec0be8cfe80449efe84449efe96449efe58cdaffe5ccdaffe60cdaffe64cdaffe6ecdaffebad3d2febed3d2fec2d3d2fec6d3d2fed0d3d2fe72d9d2fe76d9d2fe84d9d2feecddd2fe22e0d2fe26e0d2fe2ae0d2fe34e0d2fec6eaf5fec2edf5fec6edf5fecaedf5feceedf5fed8edf5fed67c07ffda7c07ffde7c07ffe27c07ffec7c07ff1e7e07ffd88f07ff009b07ffd41919ffd81c19ffdc1c19ffe01c19ffea1c19ff1c1e19ff762e19fff03019ffa6da2affc2dd2afff2de2afff6f02aff868e3cff36933cffa2ab3cffbcab3cff84b03cffb6b03cff0cb13cff76b13cff747f3dff2a893dff68144fff36b660ff3cb660ff1e3772ff2c3772ffee3872ff4c4a72ffda05a7ffe805a7ff484aa7ffb6f8beffe6f8beff42f9beff4cf9beffb0fbbeffca00bfff8203bfff9003bfff3e5feeff485feeff7e5feeffa45feeffae5feeff7268eeff2a69eeff8c6deeffcc80fdffd680fdffcc52ffffe657ffff3c67fffff4fffffff07a0100528501005c860100228e0100ac540200b4540200ca5502005c5b0200d45d020024630200086502001065020014650200266602002c690200506a0200626b0200c26d020022730200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -612,7 +612,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 7} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -635,7 +635,7 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1621 + x: 1620 y: 0 width: 367 height: 1307 @@ -666,7 +666,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1621 + x: 1620 y: 73 width: 365 height: 1286 @@ -686,12 +686,12 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Resources/UI/UI_Panel m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 m_ViewMode: 0 - m_StartGridSize: 64 + m_StartGridSize: 16 m_LastFolders: - Assets m_LastFoldersGridSize: -1 @@ -702,7 +702,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 8a740000 m_LastClickedID: 29834 - m_ExpandedIDs: ffffffff000000008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c740000a2740000a4740000aa740000ae740000b0740000b2740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000ce740000d0740000d2740000d4740000d8740000dc740000de740000e2740000e8740000ea740000ec740000ee740000f2740000f4740000f674000002750000047500000675000000ca9a3bffffff7f + m_ExpandedIDs: ffffffff0000000082700000887000008a7000008c7000008e70000090700000947000009670000098700000a4700000a6700000a8700000ae700000b0700000b2700000e4700000e6700000e8700000ea700000f2700000c0f10000e48101009e970100a0970100a2970100b697010062980100649801007498010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -727,10 +727,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} + scrollPos: {x: 0, y: 2264} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000 + m_ExpandedIDs: ffffffff0000000082700000887000008a7000008c7000008e70000090700000947000009670000098700000a4700000a6700000a8700000ae700000b0700000b2700000e4700000e6700000e8700000ea700000f2700000c0f10000e48101009e970100a0970100a2970100b697010062980100649801007498010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -746,7 +746,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 9} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -757,8 +757,8 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: 62980100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -774,7 +774,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 @@ -783,7 +783,7 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 + m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 --- !u!114 &11 @@ -801,12 +801,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1988 + x: 1987 y: 0 - width: 572 + width: 573 height: 1307 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -832,9 +832,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1988 + x: 1987 y: 73 - width: 571 + width: 572 height: 1286 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 2d115b1..21343f2 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ