From 2a46961ad7e04ea067d01c5ef5379d3a96de9f62 Mon Sep 17 00:00:00 2001 From: Mike Nisbet Date: Sat, 2 Dec 2023 00:24:45 +0000 Subject: [PATCH] localize grab/toss promo --- Assets/Scenes/Main.unity | 27 ++++++++++++++++++------ Assets/Scripts/Tutorials/PromoManager.cs | 13 ++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 0b2fedc6cd..25b9bb36d5 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -10783,12 +10783,27 @@ MonoBehaviour: m_BrushSizeHintShowDistance: 250 m_BrushSizeHintPreventSwipeAmount: 1 m_BrushSizeHintCancelSwipeAmount: 0.3 - m_GrabPanelHintText: 'Use Grip To Grab - - The Blinking Panel' - m_TossPanelHintText: 'Toss The Panel - - To Dismiss It' + m_GrabPanelHintText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 6606866780160 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_TossPanelHintText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 6887293751296 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + references: + version: 2 + RefIds: [] --- !u!114 &652605569 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Tutorials/PromoManager.cs b/Assets/Scripts/Tutorials/PromoManager.cs index 16a153de18..485582d64e 100644 --- a/Assets/Scripts/Tutorials/PromoManager.cs +++ b/Assets/Scripts/Tutorials/PromoManager.cs @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -using UnityEngine; -using System.Linq; using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.Localization; namespace TiltBrush { @@ -60,8 +61,8 @@ public class PromoManager : MonoBehaviour [SerializeField] private float m_BrushSizeHintCancelSwipeAmount = 0.3f; [Header("Floating Panel Promo")] - [SerializeField, TextArea] private string m_GrabPanelHintText; - [SerializeField, TextArea] private string m_TossPanelHintText; + [SerializeField] private LocalizedString m_GrabPanelHintText; + [SerializeField] private LocalizedString m_TossPanelHintText; private Dictionary m_Factories; private HashSet m_RequestedPromos; @@ -77,8 +78,8 @@ public class PromoManager : MonoBehaviour public float BrushSizeHintShowDistance { get { return m_BrushSizeHintShowDistance; } } public float BrushSizeHintPreventSwipeAmount { get { return m_BrushSizeHintPreventSwipeAmount; } } public float BrushSizeHintCancelSwipeAmount { get { return m_BrushSizeHintCancelSwipeAmount; } } - public string GrabPanelHintText { get { return m_GrabPanelHintText; } } - public string TossPanelHintText { get { return m_TossPanelHintText; } } + public string GrabPanelHintText { get { return m_GrabPanelHintText.GetLocalizedString(); } } + public string TossPanelHintText { get { return m_TossPanelHintText.GetLocalizedString(); } } public IEnumerable RequestedPromos { get { return m_RequestedPromos; } }