Update
This commit is contained in:
13
.idea/.idea.HALLUCINATE/.idea/workspace.xml
generated
13
.idea/.idea.HALLUCINATE/.idea/workspace.xml
generated
@@ -6,18 +6,9 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="f9183c68-daf0-43b8-be4c-fad79983f91b" name="Changes" comment="">
|
<list default="true" id="f9183c68-daf0-43b8-be4c-fad79983f91b" name="Changes" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.HALLUCINATE/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/Ancient Medium SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/Ancient Medium SDF.asset" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/BlackFlag SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/BlackFlag SDF.asset" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/RevolverBlackletter-Regular SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/RevolverBlackletter-Regular SDF.asset" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/Seagram tfb SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/Seagram tfb SDF.asset" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/Sketch Gothic School SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CuaDangPrototype[Don'tMove]/Sketch Gothic School SDF.asset" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/MainMenuController.cs" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/UIManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/UIManager.cs" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UI/UIManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UI/UIManager.cs" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Settings/PC_RPAsset.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Settings/PC_RPAsset.asset" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/UI/Documents/MainMenu.uxml" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/UI/Documents/MainMenu.uxml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@@ -151,7 +142,7 @@
|
|||||||
<workItem from="1777150520438" duration="58000" />
|
<workItem from="1777150520438" duration="58000" />
|
||||||
<workItem from="1777150592854" duration="4699000" />
|
<workItem from="1777150592854" duration="4699000" />
|
||||||
<workItem from="1777181837663" duration="1519000" />
|
<workItem from="1777181837663" duration="1519000" />
|
||||||
<workItem from="1777269364664" duration="1822000" />
|
<workItem from="1777269364664" duration="5003000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
@@ -485,36 +485,34 @@ MonoBehaviour:
|
|||||||
- screenName: MainMenu
|
- screenName: MainMenu
|
||||||
document: {fileID: 2003742651}
|
document: {fileID: 2003742651}
|
||||||
isOverlay: 0
|
isOverlay: 0
|
||||||
customCursor: {fileID: 0}
|
|
||||||
isActive: 0
|
isActive: 0
|
||||||
- screenName: Lobby
|
- screenName: Lobby
|
||||||
document: {fileID: 1471116802}
|
document: {fileID: 1471116802}
|
||||||
isOverlay: 0
|
isOverlay: 0
|
||||||
customCursor: {fileID: 0}
|
|
||||||
isActive: 1
|
isActive: 1
|
||||||
- screenName: Lounge
|
- screenName: Lounge
|
||||||
document: {fileID: 257796814}
|
document: {fileID: 257796814}
|
||||||
isOverlay: 0
|
isOverlay: 0
|
||||||
customCursor: {fileID: 0}
|
|
||||||
isActive: 0
|
isActive: 0
|
||||||
- screenName: HUD
|
- screenName: HUD
|
||||||
document: {fileID: 1136953559}
|
document: {fileID: 1136953559}
|
||||||
isOverlay: 0
|
isOverlay: 0
|
||||||
customCursor: {fileID: 0}
|
|
||||||
isActive: 0
|
isActive: 0
|
||||||
- screenName: Settings
|
- screenName: Settings
|
||||||
document: {fileID: 1582124357}
|
document: {fileID: 1582124357}
|
||||||
isOverlay: 1
|
isOverlay: 1
|
||||||
customCursor: {fileID: 0}
|
|
||||||
isActive: 0
|
isActive: 0
|
||||||
- screenName: Profile
|
- screenName: Profile
|
||||||
document: {fileID: 666657092}
|
document: {fileID: 666657092}
|
||||||
isOverlay: 0
|
isOverlay: 0
|
||||||
customCursor: {fileID: 0}
|
|
||||||
isActive: 0
|
isActive: 0
|
||||||
initialScreen: MainMenu
|
initialScreen: MainMenu
|
||||||
|
trailSprite: {fileID: 21300000, guid: b9c4a623634019648b505c6122243b00, type: 3}
|
||||||
|
trailFadeSpeed: 3
|
||||||
|
trailCount: 15
|
||||||
focusRadius: 300
|
focusRadius: 300
|
||||||
globalOpacity: 1
|
globalOpacity: 1
|
||||||
|
isMainMenuActive: 0
|
||||||
--- !u!4 &1183887570
|
--- !u!4 &1183887570
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -890,9 +888,10 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 691980524acfc544f9660cfc35ce3616, type: 3}
|
m_Script: {fileID: 11500000, guid: 691980524acfc544f9660cfc35ce3616, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::UI.MainMenuController
|
m_EditorClassIdentifier: Assembly-CSharp::UI.MainMenuController
|
||||||
|
transitionDuration: 0.5
|
||||||
|
idleTimeout: 5
|
||||||
pulseSpeed: 2
|
pulseSpeed: 2
|
||||||
pulseAmount: 0.1
|
pulseAmount: 0.1
|
||||||
transitionDuration: 0.5
|
|
||||||
--- !u!1660057539 &9223372036854775807
|
--- !u!1660057539 &9223372036854775807
|
||||||
SceneRoots:
|
SceneRoots:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -33,12 +33,23 @@ namespace UI
|
|||||||
_ribbon = _root.Q<VisualElement>("menu-ribbon");
|
_ribbon = _root.Q<VisualElement>("menu-ribbon");
|
||||||
_logoPlaceholder = _root.Q<VisualElement>("logo-placeholder");
|
_logoPlaceholder = _root.Q<VisualElement>("logo-placeholder");
|
||||||
|
|
||||||
|
// Đảm bảo Logo luôn có thể nhấn được
|
||||||
|
_logoContainer.pickingMode = PickingMode.Position;
|
||||||
|
_logo.pickingMode = PickingMode.Position;
|
||||||
_logoContainer.RegisterCallback<ClickEvent>(OnLogoClicked);
|
_logoContainer.RegisterCallback<ClickEvent>(OnLogoClicked);
|
||||||
|
|
||||||
// Tracking interactions
|
|
||||||
_root.RegisterCallback<MouseMoveEvent>(evt => ResetIdleTimer());
|
_root.RegisterCallback<MouseMoveEvent>(evt => ResetIdleTimer());
|
||||||
|
|
||||||
var buttons = _root.Query<Button>().ToList();
|
var buttons = _root.Query<Button>().ToList();
|
||||||
foreach (var btn in buttons) btn.RegisterCallback<ClickEvent>(evt => ResetIdleTimer());
|
foreach (var btn in buttons)
|
||||||
|
{
|
||||||
|
btn.RegisterCallback<PointerDownEvent>(evt => ApplyDrumHit(btn, true));
|
||||||
|
btn.RegisterCallback<PointerUpEvent>(evt => ApplyDrumHit(btn, false));
|
||||||
|
btn.RegisterCallback<ClickEvent>(evt => ResetIdleTimer());
|
||||||
|
}
|
||||||
|
|
||||||
|
_logoContainer.RegisterCallback<PointerDownEvent>(evt => ApplyDrumHit(_logoContainer, true));
|
||||||
|
_logoContainer.RegisterCallback<PointerUpEvent>(evt => ApplyDrumHit(_logoContainer, false));
|
||||||
|
|
||||||
// Routing
|
// Routing
|
||||||
_root.Q<Button>("btn-create")?.RegisterCallback<ClickEvent>(ev => NavigateToLobby(true));
|
_root.Q<Button>("btn-create")?.RegisterCallback<ClickEvent>(ev => NavigateToLobby(true));
|
||||||
@@ -52,18 +63,14 @@ namespace UI
|
|||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
// Pulsing logic
|
float baseScale = _isActive ? 0.35f : 1.0f;
|
||||||
float baseScale = _isActive ? 0.38f : 1.0f;
|
|
||||||
float pulse = Mathf.Sin(Time.time * pulseSpeed) * pulseAmount;
|
float pulse = Mathf.Sin(Time.time * pulseSpeed) * pulseAmount;
|
||||||
_logo.style.scale = new Scale(new Vector3(baseScale + pulse, baseScale + pulse, 1f));
|
_logo.style.scale = new Scale(new Vector3(baseScale + pulse, baseScale + pulse, 1f));
|
||||||
|
|
||||||
// Idle timer logic
|
|
||||||
if (_isActive && _currentTransition == null)
|
if (_isActive && _currentTransition == null)
|
||||||
{
|
{
|
||||||
if (Time.time - _lastInteractionTime > idleTimeout)
|
if (Time.time - _lastInteractionTime > idleTimeout)
|
||||||
{
|
|
||||||
_currentTransition = StartCoroutine(TransitionToIdle());
|
_currentTransition = StartCoroutine(TransitionToIdle());
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,11 +81,26 @@ namespace UI
|
|||||||
|
|
||||||
ResetIdleTimer();
|
ResetIdleTimer();
|
||||||
|
|
||||||
|
// QUAN TRỌNG: Chỉ vào Lobby nếu ĐÃ Active và KHÔNG đang chuyển cảnh
|
||||||
if (!_isActive) {
|
if (!_isActive) {
|
||||||
if (_currentTransition != null) StopCoroutine(_currentTransition);
|
if (_currentTransition != null) StopCoroutine(_currentTransition);
|
||||||
_currentTransition = StartCoroutine(TransitionToActive());
|
_currentTransition = StartCoroutine(TransitionToActive());
|
||||||
} else {
|
} else if (_currentTransition == null) {
|
||||||
if (_currentTransition == null) NavigateToLobby(true);
|
NavigateToLobby(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ApplyDrumHit(VisualElement element, bool isDown)
|
||||||
|
{
|
||||||
|
if (isDown)
|
||||||
|
{
|
||||||
|
element.style.scale = new Scale(new Vector3(0.85f, 0.85f, 1f));
|
||||||
|
element.style.transitionDuration = new List<TimeValue> { new TimeValue(0.05f, TimeUnit.Second) };
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
element.style.scale = new Scale(Vector3.one);
|
||||||
|
element.style.transitionDuration = new List<TimeValue> { new TimeValue(0.15f, TimeUnit.Second) };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,12 +122,12 @@ namespace UI
|
|||||||
UIManager.Instance.isMainMenuActive = false;
|
UIManager.Instance.isMainMenuActive = false;
|
||||||
_ribbon.style.display = DisplayStyle.None;
|
_ribbon.style.display = DisplayStyle.None;
|
||||||
|
|
||||||
// Ensure logo is back in root
|
_root.Add(_logoContainer);
|
||||||
if (_logoContainer.parent != _root) _root.Add(_logoContainer);
|
|
||||||
|
|
||||||
_logoContainer.style.position = Position.Absolute;
|
_logoContainer.style.position = Position.Absolute;
|
||||||
_logoContainer.style.translate = new Translate(0, 0);
|
_logoContainer.style.width = 300; _logoContainer.style.height = 300;
|
||||||
_logoContainer.pickingMode = PickingMode.Position;
|
_logoContainer.style.left = Length.Percent(50);
|
||||||
|
_logoContainer.style.top = Length.Percent(50);
|
||||||
|
_logoContainer.style.translate = new Translate(Length.Percent(-50), Length.Percent(-50));
|
||||||
_currentTransition = null;
|
_currentTransition = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,29 +140,29 @@ namespace UI
|
|||||||
_ribbon.style.display = DisplayStyle.Flex;
|
_ribbon.style.display = DisplayStyle.Flex;
|
||||||
_ribbon.style.opacity = 0;
|
_ribbon.style.opacity = 0;
|
||||||
|
|
||||||
// Wait for layout update to get correct placeholder position
|
|
||||||
yield return null;
|
yield return null;
|
||||||
|
|
||||||
// Animation properties
|
|
||||||
_logoContainer.style.transitionProperty = new List<StylePropertyName> { "translate", "opacity" };
|
_logoContainer.style.transitionProperty = new List<StylePropertyName> { "translate", "opacity" };
|
||||||
_logoContainer.style.transitionDuration = new List<TimeValue> { new TimeValue(transitionDuration, TimeUnit.Second) };
|
_logoContainer.style.transitionDuration = new List<TimeValue> { new TimeValue(transitionDuration, TimeUnit.Second) };
|
||||||
_ribbon.style.transitionProperty = new List<StylePropertyName> { "opacity" };
|
_ribbon.style.transitionProperty = new List<StylePropertyName> { "opacity" };
|
||||||
_ribbon.style.transitionDuration = new List<TimeValue> { new TimeValue(transitionDuration, TimeUnit.Second) };
|
_ribbon.style.transitionDuration = new List<TimeValue> { new TimeValue(transitionDuration, TimeUnit.Second) };
|
||||||
|
|
||||||
// Move to placeholder (-20% of screen width)
|
// Trượt Logo từ tâm sang vị trí ribbon (#2)
|
||||||
_logoContainer.style.translate = new Translate(Length.Percent(-20f), 0);
|
_logoContainer.style.translate = new Translate(Length.Percent(-75f), Length.Percent(-50f));
|
||||||
_ribbon.style.opacity = 1;
|
_ribbon.style.opacity = 1;
|
||||||
|
|
||||||
yield return new WaitForSeconds(transitionDuration);
|
yield return new WaitForSeconds(transitionDuration);
|
||||||
|
|
||||||
// --- REPARENTING LOGIC ---
|
// Gán chặt vào placeholder và khóa kích thước để chống giãn
|
||||||
// Move logo container INSIDE the placeholder for perfect positioning
|
|
||||||
_logoPlaceholder.Add(_logoContainer);
|
_logoPlaceholder.Add(_logoContainer);
|
||||||
|
_logoContainer.style.position = Position.Relative;
|
||||||
// Reset translation because it's now relative to the placeholder
|
_logoContainer.style.left = StyleKeyword.Auto;
|
||||||
|
_logoContainer.style.top = StyleKeyword.Auto;
|
||||||
_logoContainer.style.translate = new Translate(0, 0);
|
_logoContainer.style.translate = new Translate(0, 0);
|
||||||
_logoContainer.style.position = Position.Relative; // Follow flex layout
|
|
||||||
_logoContainer.style.alignSelf = Align.Center;
|
// Khóa kích thước nhỏ để fit vào Ribbon
|
||||||
|
_logoContainer.style.width = 100;
|
||||||
|
_logoContainer.style.height = 100;
|
||||||
|
|
||||||
_currentTransition = null;
|
_currentTransition = null;
|
||||||
}
|
}
|
||||||
@@ -150,18 +172,16 @@ namespace UI
|
|||||||
_isActive = false;
|
_isActive = false;
|
||||||
UIManager.Instance.isMainMenuActive = false;
|
UIManager.Instance.isMainMenuActive = false;
|
||||||
|
|
||||||
// --- UN-PARENTING LOGIC ---
|
|
||||||
// Move back to root for animation
|
|
||||||
Vector3 worldPos = _logoContainer.worldBound.center;
|
|
||||||
_root.Add(_logoContainer);
|
_root.Add(_logoContainer);
|
||||||
_logoContainer.style.position = Position.Absolute;
|
_logoContainer.style.position = Position.Absolute;
|
||||||
|
_logoContainer.style.width = 300; _logoContainer.style.height = 300;
|
||||||
// Keep it at current position visually before animating back
|
_logoContainer.style.left = Length.Percent(50);
|
||||||
_logoContainer.style.translate = new Translate(Length.Percent(-20f), 0);
|
_logoContainer.style.top = Length.Percent(50);
|
||||||
|
_logoContainer.style.translate = new Translate(Length.Percent(-75f), Length.Percent(-50f));
|
||||||
|
|
||||||
yield return null; // wait for frame
|
yield return null;
|
||||||
|
|
||||||
_logoContainer.style.translate = new Translate(0, 0);
|
_logoContainer.style.translate = new Translate(Length.Percent(-50f), Length.Percent(-50f));
|
||||||
_ribbon.style.opacity = 0;
|
_ribbon.style.opacity = 0;
|
||||||
|
|
||||||
yield return new WaitForSeconds(transitionDuration);
|
yield return new WaitForSeconds(transitionDuration);
|
||||||
|
|||||||
@@ -22,12 +22,15 @@ namespace UI
|
|||||||
public List<ScreenData> screens = new List<ScreenData>();
|
public List<ScreenData> screens = new List<ScreenData>();
|
||||||
public string initialScreen = "MainMenu";
|
public string initialScreen = "MainMenu";
|
||||||
|
|
||||||
[Header("Cursor Settings")]
|
[Header("Cursor & Trail Settings")]
|
||||||
|
public Sprite trailSprite;
|
||||||
|
public float trailFadeSpeed = 3f;
|
||||||
|
public int trailCount = 15;
|
||||||
|
public float focusRadius = 500f;
|
||||||
|
|
||||||
private VisualElement _customCursor;
|
private VisualElement _customCursor;
|
||||||
private List<VisualElement> _trailPool = new List<VisualElement>();
|
private List<VisualElement> _trailPool = new List<VisualElement>();
|
||||||
private int _trailIndex = 0;
|
private int _trailIndex = 0;
|
||||||
public int trailCount = 15;
|
|
||||||
public float focusRadius = 500f;
|
|
||||||
|
|
||||||
[Header("Editor Preview")]
|
[Header("Editor Preview")]
|
||||||
[Range(0f, 1f)]
|
[Range(0f, 1f)]
|
||||||
@@ -37,7 +40,6 @@ namespace UI
|
|||||||
private string _currentScreenName;
|
private string _currentScreenName;
|
||||||
private VisualElement _lastHoveredElement;
|
private VisualElement _lastHoveredElement;
|
||||||
|
|
||||||
// Flags for MainMenu state
|
|
||||||
public bool isMainMenuActive = false;
|
public bool isMainMenuActive = false;
|
||||||
private bool _isSettingsOpen = false;
|
private bool _isSettingsOpen = false;
|
||||||
|
|
||||||
@@ -46,6 +48,9 @@ namespace UI
|
|||||||
if (Instance == null) Instance = this;
|
if (Instance == null) Instance = this;
|
||||||
else { Destroy(gameObject); return; }
|
else { Destroy(gameObject); return; }
|
||||||
|
|
||||||
|
var myDoc = GetComponent<UIDocument>();
|
||||||
|
if (myDoc != null) myDoc.sortingOrder = 1000;
|
||||||
|
|
||||||
SetupCursor();
|
SetupCursor();
|
||||||
foreach (var s in screens)
|
foreach (var s in screens)
|
||||||
{
|
{
|
||||||
@@ -74,10 +79,18 @@ namespace UI
|
|||||||
for (int i = 0; i < trailCount; i++)
|
for (int i = 0; i < trailCount; i++)
|
||||||
{
|
{
|
||||||
var trail = new VisualElement();
|
var trail = new VisualElement();
|
||||||
trail.style.width = 18; trail.style.height = 18;
|
trail.style.width = 20; trail.style.height = 20;
|
||||||
trail.style.backgroundColor = new Color(1, 1, 1, 0.4f);
|
if (trailSprite != null)
|
||||||
trail.style.borderTopLeftRadius = 9; trail.style.borderTopRightRadius = 9;
|
{
|
||||||
trail.style.borderBottomLeftRadius = 9; trail.style.borderBottomRightRadius = 9;
|
trail.style.backgroundImage = new StyleBackground(trailSprite);
|
||||||
|
trail.style.backgroundColor = Color.clear;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
trail.style.backgroundColor = new Color(1, 1, 1, 0.4f);
|
||||||
|
trail.style.borderTopLeftRadius = 10; trail.style.borderTopRightRadius = 10;
|
||||||
|
trail.style.borderBottomLeftRadius = 10; trail.style.borderBottomRightRadius = 10;
|
||||||
|
}
|
||||||
trail.style.position = Position.Absolute;
|
trail.style.position = Position.Absolute;
|
||||||
trail.pickingMode = PickingMode.Ignore;
|
trail.pickingMode = PickingMode.Ignore;
|
||||||
root.Add(trail);
|
root.Add(trail);
|
||||||
@@ -89,14 +102,12 @@ namespace UI
|
|||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
Vector2 mousePos = Input.mousePosition;
|
Vector2 mousePos = Input.mousePosition;
|
||||||
|
|
||||||
bool isMainMenu = (_currentScreenName == "MainMenu");
|
bool isMainMenu = (_currentScreenName == "MainMenu");
|
||||||
bool restrictY = (isMainMenu && isMainMenuActive && !_isSettingsOpen);
|
bool restrictY = (isMainMenu && isMainMenuActive && !_isSettingsOpen);
|
||||||
|
|
||||||
float targetY = restrictY ? Screen.height / 2f : mousePos.y;
|
float targetY = restrictY ? Screen.height / 2f : mousePos.y;
|
||||||
Vector2 uiPos = new Vector2(mousePos.x, Screen.height - targetY);
|
Vector2 uiPos = new Vector2(mousePos.x, Screen.height - targetY);
|
||||||
|
|
||||||
bool showCursor = !isMainMenu || !isMainMenuActive || _isSettingsOpen;
|
bool showCursor = !isMainMenu || _isSettingsOpen;
|
||||||
DisplayStyle cursorDisplay = showCursor ? DisplayStyle.Flex : DisplayStyle.None;
|
DisplayStyle cursorDisplay = showCursor ? DisplayStyle.Flex : DisplayStyle.None;
|
||||||
|
|
||||||
if (_customCursor != null)
|
if (_customCursor != null)
|
||||||
@@ -109,13 +120,16 @@ namespace UI
|
|||||||
if (_trailPool.Count > 0)
|
if (_trailPool.Count > 0)
|
||||||
{
|
{
|
||||||
var currentTrail = _trailPool[_trailIndex];
|
var currentTrail = _trailPool[_trailIndex];
|
||||||
currentTrail.style.left = uiPos.x - 9;
|
currentTrail.style.display = cursorDisplay;
|
||||||
currentTrail.style.top = uiPos.y - 9;
|
currentTrail.style.left = uiPos.x - 10;
|
||||||
currentTrail.style.opacity = 0.5f;
|
currentTrail.style.top = uiPos.y - 10;
|
||||||
|
currentTrail.style.opacity = 0.6f;
|
||||||
|
|
||||||
foreach(var t in _trailPool)
|
foreach(var t in _trailPool)
|
||||||
{
|
{
|
||||||
t.style.display = cursorDisplay;
|
float currentOp = t.style.opacity.value;
|
||||||
t.style.opacity = Mathf.Max(0, t.style.opacity.value - Time.deltaTime * 4f);
|
if (currentOp > 0) t.style.opacity = Mathf.Max(0, currentOp - Time.deltaTime * trailFadeSpeed);
|
||||||
|
else t.style.display = DisplayStyle.None;
|
||||||
}
|
}
|
||||||
_trailIndex = (_trailIndex + 1) % _trailPool.Count;
|
_trailIndex = (_trailIndex + 1) % _trailPool.Count;
|
||||||
}
|
}
|
||||||
@@ -132,12 +146,10 @@ namespace UI
|
|||||||
var settings = screens.Find(s => s.screenName == "Settings");
|
var settings = screens.Find(s => s.screenName == "Settings");
|
||||||
if (_isSettingsOpen) activeDoc = settings.document;
|
if (_isSettingsOpen) activeDoc = settings.document;
|
||||||
else activeDoc = screens.Find(s => s.screenName == _currentScreenName)?.document;
|
else activeDoc = screens.Find(s => s.screenName == _currentScreenName)?.document;
|
||||||
|
|
||||||
if (activeDoc == null) return;
|
if (activeDoc == null) return;
|
||||||
|
|
||||||
VisualElement bestElement = null;
|
VisualElement bestElement = null;
|
||||||
float minDistance = float.MaxValue;
|
float minDistance = float.MaxValue;
|
||||||
|
|
||||||
var interactables = activeDoc.rootVisualElement.Query<VisualElement>()
|
var interactables = activeDoc.rootVisualElement.Query<VisualElement>()
|
||||||
.Where(e => e.focusable && e.pickingMode != PickingMode.Ignore).ToList();
|
.Where(e => e.focusable && e.pickingMode != PickingMode.Ignore).ToList();
|
||||||
|
|
||||||
@@ -219,11 +231,7 @@ namespace UI
|
|||||||
|
|
||||||
_currentScreenName = _navigationStack.Peek();
|
_currentScreenName = _navigationStack.Peek();
|
||||||
var prevData = screens.Find(s => s.screenName == _currentScreenName);
|
var prevData = screens.Find(s => s.screenName == _currentScreenName);
|
||||||
if (prevData != null)
|
if (prevData != null) prevData.document.rootVisualElement.style.display = DisplayStyle.Flex;
|
||||||
{
|
|
||||||
prevData.document.rootVisualElement.style.display = DisplayStyle.Flex;
|
|
||||||
prevData.isActive = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ToggleSettings()
|
public void ToggleSettings()
|
||||||
@@ -232,8 +240,6 @@ namespace UI
|
|||||||
if (settings == null) return;
|
if (settings == null) return;
|
||||||
_isSettingsOpen = settings.document.rootVisualElement.style.display == DisplayStyle.None;
|
_isSettingsOpen = settings.document.rootVisualElement.style.display == DisplayStyle.None;
|
||||||
settings.document.rootVisualElement.style.display = _isSettingsOpen ? DisplayStyle.Flex : DisplayStyle.None;
|
settings.document.rootVisualElement.style.display = _isSettingsOpen ? DisplayStyle.Flex : DisplayStyle.None;
|
||||||
settings.isActive = _isSettingsOpen;
|
|
||||||
|
|
||||||
if (_isSettingsOpen) settings.document.sortingOrder = 999;
|
if (_isSettingsOpen) settings.document.sortingOrder = 999;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
8
Assets/Textures/Cursor.meta
Normal file
8
Assets/Textures/Cursor.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 24bee8ed17cab4c488d3342332cde2fb
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Textures/Cursor/cursor-smoke.png
Normal file
BIN
Assets/Textures/Cursor/cursor-smoke.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 852 B |
130
Assets/Textures/Cursor/cursor-smoke.png.meta
Normal file
130
Assets/Textures/Cursor/cursor-smoke.png.meta
Normal file
@@ -0,0 +1,130 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b9c4a623634019648b505c6122243b00
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 16384
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 2
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Textures/Cursor/cursor.png
Normal file
BIN
Assets/Textures/Cursor/cursor.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
130
Assets/Textures/Cursor/cursor.png.meta
Normal file
130
Assets/Textures/Cursor/cursor.png.meta
Normal file
@@ -0,0 +1,130 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bf03bd4e32f382f45bd848d91517f188
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 0
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 1
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 16384
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 2
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Android
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -5,10 +5,9 @@
|
|||||||
<!-- Background Blur Layer -->
|
<!-- Background Blur Layer -->
|
||||||
<ui:VisualElement name="bg-blur" style="position: absolute; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.4);" />
|
<ui:VisualElement name="bg-blur" style="position: absolute; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.4);" />
|
||||||
|
|
||||||
<!-- Horizontal Ribbon (Rendered First -> Bottom Layer) -->
|
<!-- Horizontal Ribbon -->
|
||||||
<ui:VisualElement name="menu-ribbon" style="position: absolute; flex-direction: row; justify-content: center; align-items: center; width: 100%; height: 120px; background-color: rgba(0, 0, 0, 0.8); border-top-width: 2px; border-bottom-width: 2px; border-color: rgba(255, 255, 255, 0.1); display: None;">
|
<ui:VisualElement name="menu-ribbon" style="position: absolute; flex-direction: row; justify-content: center; align-items: center; width: 100%; height: 120px; background-color: rgba(0, 0, 0, 0.8); border-top-width: 2px; border-bottom-width: 2px; border-color: rgba(255, 255, 255, 0.1); display: None;">
|
||||||
|
|
||||||
<!-- Left Side Buttons -->
|
|
||||||
<ui:VisualElement style="flex-direction: row; align-items: center; justify-content: flex-end; flex-grow: 1;">
|
<ui:VisualElement style="flex-direction: row; align-items: center; justify-content: flex-end; flex-grow: 1;">
|
||||||
<ui:Button name="btn-settings" class="slanted-button">
|
<ui:Button name="btn-settings" class="slanted-button">
|
||||||
<ui:VisualElement class="slanted-button-inner">
|
<ui:VisualElement class="slanted-button-inner">
|
||||||
@@ -18,9 +17,8 @@
|
|||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
|
|
||||||
<!-- Placeholder for Logo (Position #2) -->
|
<!-- Placeholder for Logo (Position #2) -->
|
||||||
<ui:VisualElement name="logo-placeholder" style="width: 280px; height: 100%;" />
|
<ui:VisualElement name="logo-placeholder" style="width: 200px; height: 120px; justify-content: center; align-items: center;" />
|
||||||
|
|
||||||
<!-- Right Side Buttons -->
|
|
||||||
<ui:VisualElement style="flex-direction: row; align-items: center; justify-content: flex-start; flex-grow: 1;">
|
<ui:VisualElement style="flex-direction: row; align-items: center; justify-content: flex-start; flex-grow: 1;">
|
||||||
<ui:Button name="btn-create" class="slanted-button">
|
<ui:Button name="btn-create" class="slanted-button">
|
||||||
<ui:VisualElement class="slanted-button-inner">
|
<ui:VisualElement class="slanted-button-inner">
|
||||||
@@ -45,10 +43,11 @@
|
|||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
|
|
||||||
<!-- Logo Container (Rendered Last -> Top Layer) -->
|
<!-- Logo Container (Floating Layer) -->
|
||||||
<ui:VisualElement name="beat-logo-container" style="justify-content: center; align-items: center; width: 400px; height: 400px; position: absolute;">
|
<ui:VisualElement name="beat-logo-container" style="width: 300px; height: 300px; position: absolute; justify-content: center; align-items: center;">
|
||||||
<ui:VisualElement name="beat-logo" style="width: 300px; height: 300px; background-color: white; border-radius: 150px; box-shadow: 0 0 50px rgba(255, 255, 255, 0.3);" />
|
<ui:VisualElement name="beat-logo" style="width: 100%; height: 100%; background-color: white; border-radius: 150px; box-shadow: 0 0 50px rgba(255, 255, 255, 0.4); justify-content: center; align-items: center;">
|
||||||
<ui:Label text="HALLUCINATE" style="position: absolute; color: black; -unity-font-style: bold; font-size: 32px; letter-spacing: 5px;" />
|
<ui:Label text="HALLUCINATE" style="color: black; -unity-font-style: bold; font-size: 24px; letter-spacing: 2px; -unity-text-align: middle-center;" />
|
||||||
|
</ui:VisualElement>
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
|
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
|
|||||||
Reference in New Issue
Block a user