diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/1324ea5d-0e0f-4d8a-983e-851ea450d6d1.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/1324ea5d-0e0f-4d8a-983e-851ea450d6d1.vsidx new file mode 100644 index 0000000..2d3be79 Binary files /dev/null and b/.vs/CultivationOfBrewing-2/FileContentIndex/1324ea5d-0e0f-4d8a-983e-851ea450d6d1.vsidx differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/68f9701e-ae39-4e0a-b927-b4ac05f9f58c.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/68f9701e-ae39-4e0a-b927-b4ac05f9f58c.vsidx new file mode 100644 index 0000000..e6b7cc9 Binary files /dev/null and b/.vs/CultivationOfBrewing-2/FileContentIndex/68f9701e-ae39-4e0a-b927-b4ac05f9f58c.vsidx differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/a681960d-3e27-497b-b541-5f35dbeedea6.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/a681960d-3e27-497b-b541-5f35dbeedea6.vsidx new file mode 100644 index 0000000..ccceb39 Binary files /dev/null and b/.vs/CultivationOfBrewing-2/FileContentIndex/a681960d-3e27-497b-b541-5f35dbeedea6.vsidx differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/f9924540-3a66-4bbb-8a6d-1ce18925cbe9.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/f9924540-3a66-4bbb-8a6d-1ce18925cbe9.vsidx new file mode 100644 index 0000000..d84894d Binary files /dev/null and b/.vs/CultivationOfBrewing-2/FileContentIndex/f9924540-3a66-4bbb-8a6d-1ce18925cbe9.vsidx differ diff --git a/Assets/Resources/UI/UI_Panel/UI_BGPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_BGPanel.prefab index 61861fc..819302c 100644 --- a/Assets/Resources/UI/UI_Panel/UI_BGPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_BGPanel.prefab @@ -125,7 +125,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1df768ec42d684f4e9ff258c3d9b9751, type: 3} + m_Sprite: {fileID: 21300000, guid: 35e6277db608d86409a6fcb87ff3388e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab index f3d5832..4b34f78 100644 --- a/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab @@ -155,7 +155,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1515,7 +1515,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2812,7 +2812,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -3103,7 +3103,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -3447,7 +3447,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5100,7 +5100,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5391,7 +5391,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5547,7 +5547,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5703,7 +5703,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -6151,8 +6151,6 @@ MonoBehaviour: rawImage: {fileID: 0} ToptextMeshProUGUI: {fileID: 7422747128085603084} ContentTextMeshProUGUI: {fileID: 3961857557312585488} - player: {fileID: 0} - controller: {fileID: 0} --- !u!1 &3236435773730427489 GameObject: m_ObjectHideFlags: 0 @@ -6531,7 +6529,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -6822,7 +6820,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -7731,7 +7729,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -8342,7 +8340,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -8956,7 +8954,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -10592,7 +10590,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -11640,7 +11638,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -13065,7 +13063,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -13474,7 +13472,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -14013,7 +14011,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7670305815933267634} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -15278,7 +15276,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -15434,7 +15432,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -15834,7 +15832,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -15990,7 +15988,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Resources/UI/UI_Panel/UI_TaskListPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_TaskListPanel.prefab index 5990b09..e4c7acf 100644 --- a/Assets/Resources/UI/UI_Panel/UI_TaskListPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_TaskListPanel.prefab @@ -139,7 +139,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &402120147 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/HQB/SorghumController.cs b/Assets/Scripts/HQB/SorghumController.cs index 638af7d..aa78270 100644 --- a/Assets/Scripts/HQB/SorghumController.cs +++ b/Assets/Scripts/HQB/SorghumController.cs @@ -54,13 +54,15 @@ public class SorghumController : PermanentTriggerBase { targetHD.SetActive(true); targetSD.SetActive(false); - GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (p) => { p.Init(); }); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Top); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Top, (p) => { p.Init(); }); } else { targetHD.SetActive(false); targetSD.SetActive(true); - GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (p) => { p.Init(); }); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Top); + 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 fa3983f..ed74d0c 100644 --- a/Assets/Scripts/Project/Manager/GameManager.cs +++ b/Assets/Scripts/Project/Manager/GameManager.cs @@ -285,7 +285,8 @@ public class GameManager : SingletonAutoMono } UIMgr.ShowPanel(E_UI_Layer.Bot); - UIMgr.ShowPanel(E_UI_Layer.System, (panel) => { panel.Init(); }); + + UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => { panel.Init(); }); // StartCoroutine(AsyncFinalLoadScene()); //显示UI菜单列表 diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_BGPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_BGPanel.cs index 271933f..ee4b19e 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_BGPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_BGPanel.cs @@ -4,4 +4,16 @@ using UnityEngine; public class UI_BGPanel : BasePanel { + protected override void Awake() + { + base.Awake(); + } + public override void ShowMe() + { + base.ShowMe(); + } + public override void HideMe() + { + base.HideMe(); + } } \ No newline at end of file diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs index eef6ecc..2bdec98 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs @@ -84,6 +84,7 @@ public class UI_GraphicRextualPanel : BasePanel { case "returnBtn": GameManager.UIMgr.HidePanel(); + GameManager.UIMgr.HidePanel(); //LiveSceneManger.Instance.TipBtn.gameObject.SetActive(true); break; } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index c24dd7c..443794e 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: 43816 + controlID: 91578 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -48,9 +48,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2560 - y: 173 - width: 923 - height: 826 + y: 867 + width: 908 + height: 132 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -98,23 +98,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 923 - height: 805 - m_Scale: {x: 0.48072916, y: 0.48072916} - m_Translation: {x: 461.5, y: 402.5} + width: 908 + height: 111 + m_Scale: {x: 0.10277778, y: 0.10277778} + m_Translation: {x: 454, y: 55.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -837.2698 - width: 1920 - height: 1674.5396 + x: -4417.2974 + y: -540 + width: 8834.595 + height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.48072916 - m_LastWindowPixelSize: {x: 923, y: 826} + m_defaultScale: 0.10277778 + m_LastWindowPixelSize: {x: 908, y: 132} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 924 + width: 909 height: 947 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 43817 + controlID: 91579 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,8 +162,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 924 - height: 100 + width: 909 + height: 794 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} @@ -193,8 +193,8 @@ MonoBehaviour: serializedVersion: 2 x: 2560 y: 73 - width: 923 - height: 79 + width: 908 + height: 773 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -216,7 +216,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -141, y: 149} - snapOffsetDelta: {x: 0, y: -96} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 @@ -430,9 +430,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 838.88055, y: 573.6164, z: 4.1104965} + m_Target: {x: 1222.8156, y: 798.74176, z: 5.2066345} speed: 2 - m_Value: {x: 838.88055, y: 573.6164, z: 4.1104965} + m_Value: {x: 1222.8156, y: 798.74176, z: 5.2066345} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -483,9 +483,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 690.4049 + m_Target: 580.7887 speed: 2 - m_Value: 690.4049 + m_Value: 580.7887 m_Ortho: m_Target: 1 speed: 2 @@ -503,7 +503,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.09552764, y: -0.87091833, z: 0.21914774, w: 0.429361} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -526,9 +526,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 100 - width: 924 - height: 847 + y: 794 + width: 909 + height: 153 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -551,9 +551,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 924 + x: 909 y: 0 - width: 297 + width: 353 height: 947 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -582,9 +582,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3484 + x: 3469 y: 73 - width: 295 + width: 351 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -594,23 +594,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: c887eeffd487eeffde87eeffeaaeeffff0aeefff7ebdf0ff94bdf0fff8c0f0ff00c1f0ff0ec1f0fffe30f5ff1231f5ffa232f5ffcc35f5ffd435f5ffd835f5ffe235f5ff5e37f5ffbc43f5ff745df6ff2868f6ff1a6bf6ff4e7ff7ffb0abf8ff44cef9ff54cff9ffe6d1f9ff82e2f9ff52e3f9fff058feff645ffeff987bfefffabdffffc2c4ffff30fbfffff4fffffff8d3020046d602004ad60200ced602008ae0020092e00200 + m_SelectedIDs: bc8adfff + m_LastClickedID: -2127172 + m_ExpandedIDs: 848cdfff908cdfff9a8cdfff4af4dfff50f4dfffce5de1ffd25de1ffd65de1ffda5de1ffe45de1ff5ce6e2ff3aebe2ff3eebe2ff42ebe2ff46ebe2ff50ebe2ff8c13e3ff7222e3ff42b4e4ff880de6ffac0de6fff429e6ff042be6ffe430e6ffc49de6ffd49ee6ff72a4e6ff0e8be8ff1e8ce8ff2a91e8ff3291e8ff3691e8ff4091e8ffe0dee9ff2ce0e9fffae1e9ff02e2e9ff06e2e9ff10e2e9ff8048eaff8648eaffe464ebffe864ebffec64ebfff064ebfffa64ebffb00decffc00decffd00decffd80decff2e0eecff340eecffda24edffe224edfff024edffc887eeffd487eeffde87eeffeaaeeffff0aeefff7ebdf0ff94bdf0fff8c0f0ff00c1f0ff0ec1f0fffe30f5ff1231f5ffa232f5ffcc35f5ffd435f5ffd835f5ffe235f5ff5e37f5ffbc43f5ff745df6ff2868f6ff1a6bf6ff4e7ff7ffb0abf8ff44cef9ff54cff9ffe6d1f9ff82e2f9ff52e3f9fff058feff645ffeff987bfefffabdffffc2c4ffff30fbfffff4fffffff8d3020046d602004ad60200ced602008ae0020092e002008ea8030092a8030096a8030000aa030004aa030008aa0300 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Content - m_OriginalName: Content + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -1107392 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 7} m_SearchString: @@ -635,9 +635,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1221 + x: 1262 y: 0 - width: 314 + width: 315 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: 3781 + x: 3822 y: 73 - width: 312 + width: 313 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -701,7 +701,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 3c670200 m_LastClickedID: 157500 - m_ExpandedIDs: ffffffff0000000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e740000407400004274000046740000487400004a7400004c7400004e740000507400005274000056740000587400005a7400005c7400005e7400006074000062740000667400001c7900000a7a0000 + m_ExpandedIDs: ffffffff0000000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e740000207400002474000026740000287400002a7400002c7400002e740000307400003274000034740000367400003a7400003c7400003e740000407400004274000046740000487400004a7400004c7400004e740000507400005274000056740000587400005c7400005e740000607400006274000066740000f6770000b4780000cc780000e87800001c79000056790000e2790000ec790000ee7900000a7a0000b4f50200bef502008ea3030050a50300f0a50300f2a50300ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -726,10 +726,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 3632} - m_SelectedIDs: + scrollPos: {x: 0, y: 3416} + m_SelectedIDs: bc8adfff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff0000000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e74000020740000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e740000407400004274000046740000487400004a7400004c7400004e740000507400005274000056740000587400005a7400005c7400005e7400006074000062740000667400001c7900000a7a0000 + m_ExpandedIDs: ffffffff0000000006740000087400000a7400000c7400000e74000010740000127400001474000016740000187400001a7400001c7400001e740000207400002474000026740000287400002a7400002c7400002e740000307400003274000034740000367400003a7400003c7400003e740000407400004274000046740000487400004a7400004c7400004e740000507400005274000056740000587400005c7400005e740000607400006274000066740000f6770000b4780000cc780000e87800001c79000056790000e2790000ec790000ee7900000a7a0000b4f50200bef502008ea3030050a50300f0a50300f2a50300ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -754,8 +754,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: bc8adfff + m_LastClickedInstanceID: -2127172 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -800,9 +800,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1535 + x: 1577 y: 0 - width: 385 + width: 343 height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -831,9 +831,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 4095 + x: 4137 y: 73 - width: 384 + width: 342 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -843,7 +843,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -221 + m_CachedPref: 245 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1