scove/BABA_YAGA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upd

Browse Source
This commit is contained in:
scove
2026-04-27 13:27:40 +07:00
parent b7436b299b
commit d075d4d861
10 changed files with 1064 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
Assets/Scripts/UI/MainMenuController.cs
View File

@@ -7,6 +7,7 @@ namespace UI
{
public class MainMenuController : MonoBehaviour
{
private VisualElement _root;
private VisualElement _logoContainer;
private VisualElement _logo;
private VisualElement _ribbon;
@@ -20,53 +21,72 @@ namespace UI
public float pulseAmount = 0.05f;
private float _lastInteractionTime;
private int _lastClickFrame = -1;
private Coroutine _currentTransition;
private void OnEnable()
{
var root = GetComponent<UIDocument>().rootVisualElement;
_root = GetComponent<UIDocument>().rootVisualElement;
_logoContainer = root.Q<VisualElement>("beat-logo-container");
_logo = root.Q<VisualElement>("beat-logo");
_ribbon = root.Q<VisualElement>("menu-ribbon");
_logoPlaceholder = root.Q<VisualElement>("logo-placeholder");
_logoContainer = _root.Q<VisualElement>("beat-logo-container");
_logo = _root.Q<VisualElement>("beat-logo");
_ribbon = _root.Q<VisualElement>("menu-ribbon");
_logoPlaceholder = _root.Q<VisualElement>("logo-placeholder");
_logoContainer.RegisterCallback<ClickEvent>(OnLogoClicked);
// Register interactions to reset idle timer
root.RegisterCallback<MouseMoveEvent>(evt => ResetIdleTimer());
var buttons = root.Query<Button>().ToList();
foreach (var btn in buttons)
{
btn.RegisterCallback<ClickEvent>(evt => ResetIdleTimer());
}
// Tracking interactions
_root.RegisterCallback<MouseMoveEvent>(evt => ResetIdleTimer());
var buttons = _root.Query<Button>().ToList();
foreach (var btn in buttons) btn.RegisterCallback<ClickEvent>(evt => ResetIdleTimer());
// Routing
root.Q<Button>("btn-create")?.RegisterCallback<ClickEvent>(ev => NavigateToLobby(true));
root.Q<Button>("btn-join")?.RegisterCallback<ClickEvent>(ev => NavigateToLobby(false));
root.Q<Button>("btn-settings")?.RegisterCallback<ClickEvent>(ev => UIManager.Instance.ToggleSettings());
root.Q<Button>("btn-profile")?.RegisterCallback<ClickEvent>(ev => UIManager.Instance.ShowScreen("Profile"));
root.Q<Button>("btn-exit")?.RegisterCallback<ClickEvent>(ev => Application.Quit());
_root.Q<Button>("btn-create")?.RegisterCallback<ClickEvent>(ev => NavigateToLobby(true));
_root.Q<Button>("btn-join")?.RegisterCallback<ClickEvent>(ev => NavigateToLobby(false));
_root.Q<Button>("btn-settings")?.RegisterCallback<ClickEvent>(ev => UIManager.Instance.ToggleSettings());
_root.Q<Button>("btn-profile")?.RegisterCallback<ClickEvent>(ev => UIManager.Instance.ShowScreen("Profile"));
_root.Q<Button>("btn-exit")?.RegisterCallback<ClickEvent>(ev => Application.Quit());
ResetToIdleState();
}
private void Update()
{
// 1. Logic Pulsing (Luôn chạy)
// Pulsing logic
float baseScale = _isActive ? 0.38f : 1.0f;
float pulse = Mathf.Sin(Time.time * pulseSpeed) * pulseAmount;
_logo.style.scale = new Scale(new Vector3(baseScale + pulse, baseScale + pulse, 1f));
// 2. Logic Idle Timeout
if (_isActive)
// Idle timer logic
if (_isActive && _currentTransition == null)
{
if (Time.time - _lastInteractionTime > idleTimeout)
{
StartCoroutine(TransitionToIdle());
_currentTransition = StartCoroutine(TransitionToIdle());
}
}
}
private void OnLogoClicked(ClickEvent evt)
{
if (Time.frameCount == _lastClickFrame) return;
_lastClickFrame = Time.frameCount;
ResetIdleTimer();
if (!_isActive) {
if (_currentTransition != null) StopCoroutine(_currentTransition);
_currentTransition = StartCoroutine(TransitionToActive());
} else {
if (_currentTransition == null) NavigateToLobby(true);
}
}
private void ResetIdleTimer()
{
_lastInteractionTime = Time.time;
}
private void NavigateToLobby(bool isCreate)
{
var lobby = Object.FindFirstObjectByType<LobbyController>();
@@ -74,63 +94,79 @@ namespace UI
UIManager.Instance.ShowScreen("Lobby");
}
private void OnLogoClicked(ClickEvent evt)
{
ResetIdleTimer();
if (!_isActive) {
// Chỉ chuyển từ Idle sang Active
StartCoroutine(TransitionToActive());
} else {
// Khi đã trong dải Ribbon, nhấn để vào Create Room
NavigateToLobby(true);
}
}
private void ResetIdleTimer()
{
_lastInteractionTime = Time.time;
}
private void ResetToIdleState()
{
_isActive = false;
UIManager.Instance.isMainMenuActive = false;
_ribbon.style.display = DisplayStyle.None;
// Ensure logo is back in root
if (_logoContainer.parent != _root) _root.Add(_logoContainer);
_logoContainer.style.position = Position.Absolute;
_logoContainer.style.translate = new Translate(0, 0);
_logoContainer.pickingMode = PickingMode.Position;
_currentTransition = null;
}
private IEnumerator TransitionToActive()
{
_isActive = true;
UIManager.Instance.isMainMenuActive = true;
ResetIdleTimer();
_ribbon.style.display = DisplayStyle.Flex;
_ribbon.style.opacity = 0;
// Wait for layout update to get correct placeholder position
yield return null;
// Animation properties
_logoContainer.style.transitionProperty = new List<StylePropertyName> { "translate", "opacity" };
_logoContainer.style.transitionDuration = new List<TimeValue> { new TimeValue(transitionDuration, TimeUnit.Second) };
_ribbon.style.transitionProperty = new List<StylePropertyName> { "opacity" };
_ribbon.style.transitionDuration = new List<TimeValue> { new TimeValue(transitionDuration, TimeUnit.Second) };
yield return null;
// Di chuyển logo sang vị trí thứ 2 (-20%)
// Move to placeholder (-20% of screen width)
_logoContainer.style.translate = new Translate(Length.Percent(-20f), 0);
_ribbon.style.opacity = 1;
yield return new WaitForSeconds(transitionDuration);
// --- REPARENTING LOGIC ---
// Move logo container INSIDE the placeholder for perfect positioning
_logoPlaceholder.Add(_logoContainer);
// Reset translation because it's now relative to the placeholder
_logoContainer.style.translate = new Translate(0, 0);
_logoContainer.style.position = Position.Relative; // Follow flex layout
_logoContainer.style.alignSelf = Align.Center;
_currentTransition = null;
}
private IEnumerator TransitionToIdle()
{
_isActive = false;
UIManager.Instance.isMainMenuActive = false;
// --- UN-PARENTING LOGIC ---
// Move back to root for animation
Vector3 worldPos = _logoContainer.worldBound.center;
_root.Add(_logoContainer);
_logoContainer.style.position = Position.Absolute;
// Keep it at current position visually before animating back
_logoContainer.style.translate = new Translate(Length.Percent(-20f), 0);
yield return null; // wait for frame
_logoContainer.style.translate = new Translate(0, 0);
_ribbon.style.opacity = 0;
yield return new WaitForSeconds(transitionDuration);
_ribbon.style.display = DisplayStyle.None;
_currentTransition = null;
}
}
}

31
Assets/Scripts/UI/UIManager.cs
View File

@@ -36,6 +36,9 @@ namespace UI
private Stack<string> _navigationStack = new Stack<string>();
private string _currentScreenName;
private VisualElement _lastHoveredElement;
// Flags for MainMenu state
public bool isMainMenuActive = false;
private bool _isSettingsOpen = false;
private void Awake()
@@ -60,8 +63,7 @@ namespace UI
var root = doc.rootVisualElement;
_customCursor = new VisualElement();
_customCursor.style.width = 25;
_customCursor.style.height = 25;
_customCursor.style.width = 25; _customCursor.style.height = 25;
_customCursor.style.backgroundColor = Color.white;
_customCursor.style.borderTopLeftRadius = 13; _customCursor.style.borderTopRightRadius = 13;
_customCursor.style.borderBottomLeftRadius = 13; _customCursor.style.borderBottomRightRadius = 13;
@@ -86,15 +88,15 @@ namespace UI
private void Update()
{
// Calculate Virtual Mouse Position
Vector2 mousePos = Input.mousePosition;
bool isMainMenu = (_currentScreenName == "MainMenu");
bool restrictY = (isMainMenu && !_isSettingsOpen);
bool restrictY = (isMainMenu && isMainMenuActive && !_isSettingsOpen);
float targetY = restrictY ? Screen.height / 2f : mousePos.y;
Vector2 uiPos = new Vector2(mousePos.x, Screen.height - targetY);
// Visibility Logic for Cursor & Trail
bool showCursor = !isMainMenu || _isSettingsOpen;
bool showCursor = !isMainMenu || !isMainMenuActive || _isSettingsOpen;
DisplayStyle cursorDisplay = showCursor ? DisplayStyle.Flex : DisplayStyle.None;
if (_customCursor != null)
@@ -110,17 +112,14 @@ namespace UI
currentTrail.style.left = uiPos.x - 9;
currentTrail.style.top = uiPos.y - 9;
currentTrail.style.opacity = 0.5f;
foreach(var t in _trailPool)
{
t.style.display = cursorDisplay;
t.style.opacity = Mathf.Max(0, t.style.opacity.value - Time.deltaTime * 4f);
}
_trailIndex = (_trailIndex + 1) % _trailPool.Count;
}
// Handle Focus & Clicks using virtual coordinates
HandleVirtualInput(uiPos);
if ((Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl)) && Input.GetKeyDown(KeyCode.O))
@@ -168,7 +167,7 @@ namespace UI
}
}
// --- Editor Support Methods ---
// --- Editor Support Methods (Restored) ---
public void SyncScreens()
{
@@ -201,7 +200,7 @@ namespace UI
if (!screen.isOverlay)
{
foreach(var s in screens) if(!s.isOverlay) s.document.rootVisualElement.style.display = DisplayStyle.None;
foreach(var s in screens) if(!s.isOverlay && s.document != null) s.document.rootVisualElement.style.display = DisplayStyle.None;
_navigationStack.Push(name);
_currentScreenName = name;
}
@@ -219,8 +218,12 @@ namespace UI
if (currentData != null) currentData.document.rootVisualElement.style.display = DisplayStyle.None;
_currentScreenName = _navigationStack.Peek();
var prev = screens.Find(s => s.screenName == _currentScreenName);
if (prev != null) prev.document.rootVisualElement.style.display = DisplayStyle.Flex;
var prevData = screens.Find(s => s.screenName == _currentScreenName);
if (prevData != null)
{
prevData.document.rootVisualElement.style.display = DisplayStyle.Flex;
prevData.isActive = true;
}
}
public void ToggleSettings()
@@ -230,6 +233,8 @@ namespace UI
_isSettingsOpen = settings.document.rootVisualElement.style.display == DisplayStyle.None;
settings.document.rootVisualElement.style.display = _isSettingsOpen ? DisplayStyle.Flex : DisplayStyle.None;
settings.isActive = _isSettingsOpen;
if (_isSettingsOpen) settings.document.sortingOrder = 999;
}
}
}