From 33356e952873c75e889b851d81973d24396aba58 Mon Sep 17 00:00:00 2001 From: Robert Hammerle Date: Mon, 2 Dec 2024 11:41:16 +0100 Subject: [PATCH 01/25] wip: Mobile UI refactor --- .../Assets/MobileStylesheet.cs | 17 ++++++++ .../Assets/MobileStylesheet.cs.meta | 2 + .../Assets/Prefabs/UI/IngameUI.prefab | 32 ++++++++++++++- .../Assets/Scenes/HubScene_TownMarket.unity | 8 ++++ .../Assets/UI/Uss/Mobile.uss | 40 +++++++++++++++++++ .../Assets/UI/Uss/Mobile.uss.meta | 3 ++ .../UI/Uxml/Ingame/TextChat/ChatUI.uxml | 2 - 7 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 Basic/DistributedAuthoritySocialHub/Assets/MobileStylesheet.cs create mode 100644 Basic/DistributedAuthoritySocialHub/Assets/MobileStylesheet.cs.meta create mode 100644 Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Mobile.uss create mode 100644 Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Mobile.uss.meta diff --git a/Basic/DistributedAuthoritySocialHub/Assets/MobileStylesheet.cs b/Basic/DistributedAuthoritySocialHub/Assets/MobileStylesheet.cs new file mode 100644 index 000000000..57ae2959d --- /dev/null +++ b/Basic/DistributedAuthoritySocialHub/Assets/MobileStylesheet.cs @@ -0,0 +1,17 @@ +using UnityEngine; +using UnityEngine.UIElements; + +[RequireComponent(typeof(UIDocument))] +public class MobileStylesheet : MonoBehaviour +{ + [SerializeField] + StyleSheet[] m_Stylesheet; + void Start() + { + var uiDocument = GetComponent(); + foreach (var styleSheet in m_Stylesheet) + { + uiDocument.rootVisualElement.styleSheets.Add(styleSheet); + } + } +} diff --git a/Basic/DistributedAuthoritySocialHub/Assets/MobileStylesheet.cs.meta b/Basic/DistributedAuthoritySocialHub/Assets/MobileStylesheet.cs.meta new file mode 100644 index 000000000..8db047b43 --- /dev/null +++ b/Basic/DistributedAuthoritySocialHub/Assets/MobileStylesheet.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c3f1e8062945c4f4d846b5dd47a10b49 \ No newline at end of file diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Prefabs/UI/IngameUI.prefab b/Basic/DistributedAuthoritySocialHub/Assets/Prefabs/UI/IngameUI.prefab index ba90c20d2..628fbd331 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Prefabs/UI/IngameUI.prefab +++ b/Basic/DistributedAuthoritySocialHub/Assets/Prefabs/UI/IngameUI.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 8260601768609746557} - component: {fileID: 2624134516453966882} - component: {fileID: 7977430163742817466} + - component: {fileID: 6103793809426782772} m_Layer: 0 m_Name: WorldspaceUIContainer m_TagString: Untagged @@ -96,6 +97,20 @@ UIRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 +--- !u!114 &6103793809426782772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3209112381140291289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3f1e8062945c4f4d846b5dd47a10b49, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Stylesheet: + - {fileID: 7433441132597879392, guid: ea9efe379dfd4506ad59f7fe609e1c85, type: 3} --- !u!1 &3760817242580890973 GameObject: m_ObjectHideFlags: 0 @@ -227,8 +242,8 @@ Transform: - {fileID: 2256034313796960807} - {fileID: 7559383771208540613} - {fileID: 8481058004063830698} - - {fileID: 6866794867799222920} - {fileID: 7817311818480281289} + - {fileID: 6866794867799222920} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5231826839060252271 @@ -241,6 +256,7 @@ GameObject: m_Component: - component: {fileID: 3336661237540986728} - component: {fileID: 436460152536684898} + - component: {fileID: 7317808533901021140} m_Layer: 0 m_Name: ScreenspaceUIContainer m_TagString: Untagged @@ -282,6 +298,20 @@ MonoBehaviour: m_WorldSpaceSizeMode: 1 m_WorldSpaceWidth: 1920 m_WorldSpaceHeight: 1080 +--- !u!114 &7317808533901021140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5231826839060252271} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3f1e8062945c4f4d846b5dd47a10b49, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Stylesheet: + - {fileID: 7433441132597879392, guid: ea9efe379dfd4506ad59f7fe609e1c85, type: 3} --- !u!1 &6990578997068127384 GameObject: m_ObjectHideFlags: 0 diff --git a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket.unity b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket.unity index 17e9c7c32..e68c5c103 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket.unity +++ b/Basic/DistributedAuthoritySocialHub/Assets/Scenes/HubScene_TownMarket.unity @@ -550,10 +550,18 @@ PrefabInstance: propertyPath: m_Name value: IngameUI objectReference: {fileID: 0} + - target: {fileID: 6103793809426782772, guid: 518a390d1a3b34df4810b14940708492, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6819266640017766453, guid: 518a390d1a3b34df4810b14940708492, type: 3} propertyPath: m_Camera value: objectReference: {fileID: 1062256792} + - target: {fileID: 7317808533901021140, guid: 518a390d1a3b34df4810b14940708492, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8617889547341104717, guid: 518a390d1a3b34df4810b14940708492, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Mobile.uss b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Mobile.uss new file mode 100644 index 000000000..714b6d01c --- /dev/null +++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Mobile.uss @@ -0,0 +1,40 @@ +*{ + --menu-button-size: 80px; +} + +.pickup-indicator__keycode{ + display: none; +} + +#burger-button{ + display: none; +} + +.text-chat { + position: absolute; + top: -80%; + left: 50%; + height: 80%; + width: 60%; + translate: -50% 0; + transition: top 0.2s ease-in-out; +} + +.text-chat__collapsebutton{ + -unity-font-style: bold; + position: absolute; + padding-left: 10px; + bottom: -80px; + width: 80px; + height: 80px; + rotate: -270deg; + left: 50%; +} + +.text-chat__ui{ + +} +.text-chat--visible { + top: 0px; +} + diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Mobile.uss.meta b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Mobile.uss.meta new file mode 100644 index 000000000..447fc61e2 --- /dev/null +++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uss/Mobile.uss.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ea9efe379dfd4506ad59f7fe609e1c85 +timeCreated: 1732804800 \ No newline at end of file diff --git a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/TextChat/ChatUI.uxml b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/TextChat/ChatUI.uxml index d382d8f48..5b9499e29 100644 --- a/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/TextChat/ChatUI.uxml +++ b/Basic/DistributedAuthoritySocialHub/Assets/UI/Uxml/Ingame/TextChat/ChatUI.uxml @@ -1,6 +1,4 @@ -