diff --git a/Assets/Prefabs/Gui/Text Window.prefab b/Assets/Prefabs/Gui/Text Window.prefab new file mode 100644 index 00000000..66f7e21d --- /dev/null +++ b/Assets/Prefabs/Gui/Text Window.prefab @@ -0,0 +1,206 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2238221804770022731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5675095456052203324} + - component: {fileID: 3860981623522070048} + - component: {fileID: 5454195951375089972} + - component: {fileID: 7755882541030130766} + - component: {fileID: 7142948280202591084} + - component: {fileID: 5970773619642777561} + m_Layer: 0 + m_Name: Text Window + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5675095456052203324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2238221804770022731} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3860981623522070048 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2238221804770022731} + m_CullTransparentMesh: 0 +--- !u!114 &5454195951375089972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2238221804770022731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 257 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 5454195951375089972} + characterCount: 0 + spriteCount: 0 + spaceCount: 0 + wordCount: 0 + linkCount: 0 + lineCount: 0 + pageCount: 0 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &7755882541030130766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2238221804770022731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &7142948280202591084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2238221804770022731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 0 + m_MinHeight: 0 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &5970773619642777561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2238221804770022731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 874604b4ee644c33b11c6b62a57f8043, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Gui/Text Window.prefab.meta b/Assets/Prefabs/Gui/Text Window.prefab.meta new file mode 100644 index 00000000..95b2e476 --- /dev/null +++ b/Assets/Prefabs/Gui/Text Window.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e855655d0201d7241813a13caf132189 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index ba1e9582..7791e56a 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -13679,8 +13679,11 @@ MonoBehaviour: - {fileID: 2077539212} - {fileID: 704808008} - {fileID: 1845217158} + windowsRoot: {fileID: 487423528} windowPrefab: {fileID: 1937894905981870343, guid: 7cca77f05c96fde48981a1284c9f0a65, type: 3} + textWindowPrefab: {fileID: 5970773619642777561, guid: e855655d0201d7241813a13caf132189, + type: 3} groundsTree: {fileID: 16709742} cavesTree: {fileID: 1489062526} floorsTree: {fileID: 286422256} @@ -48950,7 +48953,7 @@ PrefabInstance: - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, type: 3} @@ -49496,6 +49499,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1997391902} m_CullTransparentMesh: 0 +--- !u!1001 &2000271946 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 603107229} + m_Modifications: + - target: {fileID: 52533149716429702, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 52533149716429702, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 52533149716429702, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 52533149716429702, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 654469715} + - target: {fileID: 52533149716429702, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ShowTextWindowDebug + objectReference: {fileID: 0} + - target: {fileID: 52533149716429702, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1143266294359805880, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_Name + value: Show Text Window Button + objectReference: {fileID: 0} + - target: {fileID: 2541901451345154754, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541901451345154754, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951088318560188779, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5349008474867026201, guid: 9d34257f3f255ee4ea7ee68549a36a09, + type: 3} + propertyPath: m_text + value: Text Window + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9d34257f3f255ee4ea7ee68549a36a09, type: 3} --- !u!4 &2004696087 stripped Transform: m_CorrespondingSourceObject: {fileID: 400002, guid: 28a5e79925e3ce04a82856c16a572cbe, diff --git a/Assets/Warlander/Deedplanner/Gui/GuiManager.cs b/Assets/Warlander/Deedplanner/Gui/GuiManager.cs index caa47ab5..b53f088d 100644 --- a/Assets/Warlander/Deedplanner/Gui/GuiManager.cs +++ b/Assets/Warlander/Deedplanner/Gui/GuiManager.cs @@ -1,5 +1,7 @@ using System; +using TMPro; using UnityEngine; +using UnityEngine.UI; using Warlander.Deedplanner.Gui.Widgets; namespace Warlander.Deedplanner.Gui @@ -10,8 +12,10 @@ public class GuiManager : MonoBehaviour [SerializeField] private RectTransform[] interfaceTransforms = null; + [SerializeField] private RectTransform windowsRoot = null; [SerializeField] private Window windowPrefab = null; - + [SerializeField] private TextWindow textWindowPrefab = null; + [SerializeField] private UnityTree groundsTree = null; [SerializeField] private UnityTree cavesTree = null; [SerializeField] private UnityTree floorsTree = null; @@ -74,14 +78,24 @@ public void ShowLayoutsWindow() public Window CreateWindow(string title, RectTransform content, bool closeable) { - Window windowClone = Instantiate(windowPrefab); + Window windowClone = Instantiate(windowPrefab, windowsRoot); windowClone.Title = title; windowClone.Content = content; windowClone.CloseButtonVisible = closeable; + windowClone.gameObject.SetActive(false); + windowClone.DestroyOnClose = true; return windowClone; } + public Window CreateTextWindow(string title, string text) + { + TextWindow textWindow = Instantiate(textWindowPrefab); + textWindow.Text.text = text; + + return CreateWindow(title, textWindow.GetComponent(), true); + } + [Serializable] private struct WindowMapping { diff --git a/Assets/Warlander/Deedplanner/Gui/Widgets/TextWindow.cs b/Assets/Warlander/Deedplanner/Gui/Widgets/TextWindow.cs new file mode 100644 index 00000000..b331ada5 --- /dev/null +++ b/Assets/Warlander/Deedplanner/Gui/Widgets/TextWindow.cs @@ -0,0 +1,31 @@ +using System; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace Warlander.Deedplanner.Gui.Widgets +{ + [RequireComponent(typeof(TextMeshProUGUI), typeof(ContentSizeFitter), typeof(LayoutElement))] + public class TextWindow : MonoBehaviour + { + private RectTransform rectTransform; + private TextMeshProUGUI text; + private LayoutElement layoutElement; + + public TextMeshProUGUI Text => text; + + private void Awake() + { + rectTransform = GetComponent(); + text = GetComponent(); + layoutElement = GetComponent(); + } + + private void Update() + { + Vector2 sizeDelta = rectTransform.sizeDelta; + layoutElement.minWidth = sizeDelta.x; + layoutElement.minHeight = sizeDelta.y; + } + } +} \ No newline at end of file diff --git a/Assets/Warlander/Deedplanner/Gui/Widgets/TextWindow.cs.meta b/Assets/Warlander/Deedplanner/Gui/Widgets/TextWindow.cs.meta new file mode 100644 index 00000000..116086f3 --- /dev/null +++ b/Assets/Warlander/Deedplanner/Gui/Widgets/TextWindow.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 874604b4ee644c33b11c6b62a57f8043 +timeCreated: 1586736801 \ No newline at end of file diff --git a/Assets/Warlander/Deedplanner/Gui/Widgets/Window.cs b/Assets/Warlander/Deedplanner/Gui/Widgets/Window.cs index b8d23768..4b3e5068 100644 --- a/Assets/Warlander/Deedplanner/Gui/Widgets/Window.cs +++ b/Assets/Warlander/Deedplanner/Gui/Widgets/Window.cs @@ -29,6 +29,8 @@ public string Title { get => titleGui.text; set => titleGui.text = value; } + + public bool DestroyOnClose { get; set; } = false; private bool windowShown = false; @@ -67,7 +69,14 @@ public void HideWindow() } windowShown = false; - canvasGroup.DOFade(0, 0.15f).SetEase(Ease.Linear).OnComplete(() => gameObject.SetActive(false)); + canvasGroup.DOFade(0, 0.15f).SetEase(Ease.Linear).OnComplete(() => + { + gameObject.SetActive(false); + if (DestroyOnClose) + { + Destroy(gameObject); + } + }); } public void OnPointerDown(PointerEventData eventData) diff --git a/Assets/Warlander/Deedplanner/Logic/DebugManager.cs b/Assets/Warlander/Deedplanner/Logic/DebugManager.cs index 6d2ce7d1..33ad08b8 100644 --- a/Assets/Warlander/Deedplanner/Logic/DebugManager.cs +++ b/Assets/Warlander/Deedplanner/Logic/DebugManager.cs @@ -5,6 +5,7 @@ using Warlander.Deedplanner.Data.Decorations; using Warlander.Deedplanner.Graphics; using Warlander.Deedplanner.Gui; +using Warlander.Deedplanner.Gui.Widgets; namespace Warlander.Deedplanner.Logic { @@ -87,6 +88,12 @@ public void LoadModelDebug() CoroutineManager.Instance.QueueCoroutine(WurmAssetsLoader.LoadModel(modelFilePath, OnModelLoaded)); } + public void ShowTextWindowDebug() + { + Window window = GuiManager.Instance.CreateTextWindow("Test Window", "Testing\nTesting Longer Text"); + window.ShowWindow(); + } + private void OnModelLoaded(GameObject model) {