diff --git a/.idea/.idea.HALLUCINATE/.idea/workspace.xml b/.idea/.idea.HALLUCINATE/.idea/workspace.xml index 71ec12d6..ab4766c0 100644 --- a/.idea/.idea.HALLUCINATE/.idea/workspace.xml +++ b/.idea/.idea.HALLUCINATE/.idea/workspace.xml @@ -6,553 +6,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - @@ -689,7 +149,7 @@ - + diff --git a/Assets/Scove/UIScaleTest.unity b/Assets/Scove/UIScaleTest.unity index 78116e9d..916a194b 100644 --- a/Assets/Scove/UIScaleTest.unity +++ b/Assets/Scove/UIScaleTest.unity @@ -320,103 +320,6 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_RenderingLayers: 1 m_ShadowRenderingLayers: 1 ---- !u!1 &1157680018 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1157680020} - - component: {fileID: 1157680019} - m_Layer: 0 - m_Name: Basic Spawner - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1157680019 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1157680018} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca752d01bdc2c5e42938776307031da3, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::_BasicSpawner - LobbyManager: {fileID: 1588175187} - _playerPrefab: - RawGuidValue: 761bdf2e5c0cff4488527355acb975e5 ---- !u!4 &1157680020 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1157680018} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10.55016, y: -0, z: 12.31339} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1588175186 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1588175188} - - component: {fileID: 1588175187} - m_Layer: 0 - m_Name: Lobby manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1588175187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1588175186} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 258164a5e282e34489a3c62c443c22f0, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::_LobbyManager - lobbyPanel: {fileID: 0} - spawner: {fileID: 0} - playerNameInput: {fileID: 0} - roomListParent: {fileID: 0} - roomListItemPrefab: {fileID: 0} - roomNameInput: {fileID: 0} ---- !u!4 &1588175188 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1588175186} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10.55016, y: -0, z: 12.31339} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1848374378 GameObject: m_ObjectHideFlags: 0 @@ -560,6 +463,4 @@ SceneRoots: m_Roots: - {fileID: 1848374381} - {fileID: 626355270} - - {fileID: 1588175188} - - {fileID: 1157680020} - {fileID: 458228301} diff --git a/Assets/Scripts/UI/MainMenuController.cs b/Assets/Scripts/UI/MainMenuController.cs index 0302490d..064300a5 100644 --- a/Assets/Scripts/UI/MainMenuController.cs +++ b/Assets/Scripts/UI/MainMenuController.cs @@ -12,12 +12,13 @@ namespace Hallucinate.UI private VisualElement _logo; private VisualElement _ribbon; - private VisualElement _virtualCursor; + private VisualElement _logoSpace; private float _lastInteractionTime; private const float IDLE_TIMEOUT = 5.0f; private Tween _pulseTween; + private Tween _rotationTween; public override void Initialize(VisualElement uxmlRoot, UIManager manager) { @@ -25,89 +26,117 @@ namespace Hallucinate.UI _logo = root.Q("Logo"); _ribbon = root.Q("Ribbon"); - _virtualCursor = root.Q("VirtualCursor"); + _logoSpace = root.Q("LogoSpace"); if (_logo == null) { - Debug.LogError($"[MainMenuController] Element 'Logo' not found in UXML! Root children: {root.childCount}"); + Debug.LogError($"[MainMenuController] Element 'Logo' not found in UXML!"); return; } - _logo.RegisterCallback(OnLogoClicked); + ResetLogoPosition(); + _logo.RegisterCallback(OnLogoClicked); - // Bind Buttons with null checks - var settingsBtn = root.Q