diff --git a/.idea/.idea.HALLUCINATE/.idea/workspace.xml b/.idea/.idea.HALLUCINATE/.idea/workspace.xml index 37859ebc..55273759 100644 --- a/.idea/.idea.HALLUCINATE/.idea/workspace.xml +++ b/.idea/.idea.HALLUCINATE/.idea/workspace.xml @@ -6,18 +6,9 @@ - - - - - - - - - - + diff --git a/Assets/Scove/UIScaleTest.unity b/Assets/Scove/UIScaleTest.unity index bf4c3ab5..a48f8d6b 100644 --- a/Assets/Scove/UIScaleTest.unity +++ b/Assets/Scove/UIScaleTest.unity @@ -485,36 +485,34 @@ MonoBehaviour: - screenName: MainMenu document: {fileID: 2003742651} isOverlay: 0 - customCursor: {fileID: 0} isActive: 0 - screenName: Lobby document: {fileID: 1471116802} isOverlay: 0 - customCursor: {fileID: 0} isActive: 1 - screenName: Lounge document: {fileID: 257796814} isOverlay: 0 - customCursor: {fileID: 0} isActive: 0 - screenName: HUD document: {fileID: 1136953559} isOverlay: 0 - customCursor: {fileID: 0} isActive: 0 - screenName: Settings document: {fileID: 1582124357} isOverlay: 1 - customCursor: {fileID: 0} isActive: 0 - screenName: Profile document: {fileID: 666657092} isOverlay: 0 - customCursor: {fileID: 0} isActive: 0 initialScreen: MainMenu + trailSprite: {fileID: 21300000, guid: b9c4a623634019648b505c6122243b00, type: 3} + trailFadeSpeed: 3 + trailCount: 15 focusRadius: 300 globalOpacity: 1 + isMainMenuActive: 0 --- !u!4 &1183887570 Transform: m_ObjectHideFlags: 0 @@ -890,9 +888,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 691980524acfc544f9660cfc35ce3616, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::UI.MainMenuController + transitionDuration: 0.5 + idleTimeout: 5 pulseSpeed: 2 pulseAmount: 0.1 - transitionDuration: 0.5 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/MainMenuController.cs b/Assets/Scripts/UI/MainMenuController.cs index 9087f4b0..60298337 100644 --- a/Assets/Scripts/UI/MainMenuController.cs +++ b/Assets/Scripts/UI/MainMenuController.cs @@ -33,12 +33,23 @@ namespace UI _ribbon = _root.Q("menu-ribbon"); _logoPlaceholder = _root.Q("logo-placeholder"); + // Đảm bảo Logo luôn có thể nhấn được + _logoContainer.pickingMode = PickingMode.Position; + _logo.pickingMode = PickingMode.Position; _logoContainer.RegisterCallback(OnLogoClicked); - // Tracking interactions _root.RegisterCallback(evt => ResetIdleTimer()); + var buttons = _root.Query