From 69b2edf1e6288b6fa95499502303147fa522e92d Mon Sep 17 00:00:00 2001 From: Geri Date: Fri, 26 Jan 2024 20:58:09 +0100 Subject: [PATCH] feature: Message sending --- Assets/Prefabs/Message.prefab | 138 ++++++++++++++++++++- Assets/Scripts/Messaging/Message.cs | 8 ++ Assets/Scripts/Messaging/MessageManager.cs | 13 +- 3 files changed, 157 insertions(+), 2 deletions(-) diff --git a/Assets/Prefabs/Message.prefab b/Assets/Prefabs/Message.prefab index 335d510..c37443a 100644 --- a/Assets/Prefabs/Message.prefab +++ b/Assets/Prefabs/Message.prefab @@ -1,5 +1,139 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1294452579022797697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 158050521503001043} + - component: {fileID: 81007626358808144} + - component: {fileID: 5123271222652756937} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &158050521503001043 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294452579022797697} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5034134452723103632} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &81007626358808144 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294452579022797697} + m_CullTransparentMesh: 1 +--- !u!114 &5123271222652756937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294452579022797697} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: New 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_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + 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_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3730343923350390943 GameObject: m_ObjectHideFlags: 0 @@ -30,7 +164,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 158050521503001043} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -88,3 +223,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8cc3fce6c7f415fa982510d4778f914, type: 3} m_Name: m_EditorClassIdentifier: + messageText: {fileID: 5123271222652756937} diff --git a/Assets/Scripts/Messaging/Message.cs b/Assets/Scripts/Messaging/Message.cs index 4204fa8..9752e58 100644 --- a/Assets/Scripts/Messaging/Message.cs +++ b/Assets/Scripts/Messaging/Message.cs @@ -1,12 +1,20 @@ using System; +using TMPro; using UnityEngine; namespace Messaging { public class Message : MonoBehaviour{ public RectTransform RectTransform { private set; get; } + public string Text => messageText.text; + + [SerializeField] private TMP_Text messageText; private void Awake() { RectTransform = GetComponent(); } + + public void SetMessageText(string text) { + messageText.text = text; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Messaging/MessageManager.cs b/Assets/Scripts/Messaging/MessageManager.cs index 67401a0..c791868 100644 --- a/Assets/Scripts/Messaging/MessageManager.cs +++ b/Assets/Scripts/Messaging/MessageManager.cs @@ -1,4 +1,3 @@ -using System; using UnityEngine; namespace Messaging { @@ -10,5 +9,17 @@ namespace Messaging { private void Awake() { _messages = messageStructureGenerator.GenerateMessages(); } + + public void CreateMessage(string message) { + ModifyMessageText(message, _messages.Length - 1); + } + + private void ModifyMessageText(string message, int index) { + if(index < 0) return; + + ModifyMessageText(_messages[index].Text, index - 1); + + _messages[index].SetMessageText(message); + } } } \ No newline at end of file