From 7da02fd3ce4582bc4b8844896e156d6268e0d27d Mon Sep 17 00:00:00 2001 From: huqibin <762612145@qq.com> Date: Fri, 30 May 2025 16:24:29 +0800 Subject: [PATCH] =?UTF-8?q?UI=E5=91=88=E7=8E=B0Title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab | 8 ++++---- Assets/Scripts/HQB/SorghumController.cs | 4 ++-- Assets/Scripts/Project/Manager/GameManager.cs | 4 ++-- Assets/Scripts/Project/Manager/OfficeManager.cs | 2 +- .../UI/UI_Panel/UI_FaultSelectionRegistrationPanel.cs | 2 +- Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs | 2 +- Assets/Scripts/Project/UI/UI_Panel/UI_SelectModePanel.cs | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab index 4d4a45f..841f827 100644 --- a/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab @@ -11750,7 +11750,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -12144,7 +12144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &455025718827277910 RectTransform: m_ObjectHideFlags: 0 @@ -14149,14 +14149,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} 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: 0} + m_Sprite: {fileID: 21300000, guid: 35e6277db608d86409a6fcb87ff3388e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scripts/HQB/SorghumController.cs b/Assets/Scripts/HQB/SorghumController.cs index eebd985..19e0336 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.Bot); + 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.Bot); + 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 c3b3b9a..f87c2aa 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.Top, panel => { panel.Init(); }); - UIMgr.ShowPanel(E_UI_Layer.Top, (panel) => { panel.Init(); }); + UIMgr.ShowPanel(E_UI_Layer.Mid, panel => { panel.Init();}); //加载场景 /显示UI ScenesMgr.LoadSceneAsyn("02_MenuScene", () => { diff --git a/Assets/Scripts/Project/Manager/OfficeManager.cs b/Assets/Scripts/Project/Manager/OfficeManager.cs index d041f6e..dcc5898 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.Top, (panel) => + GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (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 e24a674..63e2770 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.Top, panel => { panel.Init(); }); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, 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 a789a40..608a0d7 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.Bot); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid); 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 6dc26ba..8faec64 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.Top, (panel) => + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => { GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchMode); panel.Init();