From 98affc899a680f62c2648cd1fad4c2bfa37586a5 Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期四, 15 十月 2020 16:31:48 +0800
Subject: [PATCH] 8540 【工具】指引提取语言表工具

---
 System/NewBieGuidance/FunctionalGuideBehaviour.cs    |    6 +-
 System/NewBieGuidance/NewBieGuideScriptableObject.cs |   54 +++++++++++++++++---------
 System/NewBieGuidance/NewBieWin.cs                   |    2 
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/System/NewBieGuidance/FunctionalGuideBehaviour.cs b/System/NewBieGuidance/FunctionalGuideBehaviour.cs
index 7c25d54..c816404 100644
--- a/System/NewBieGuidance/FunctionalGuideBehaviour.cs
+++ b/System/NewBieGuidance/FunctionalGuideBehaviour.cs
@@ -47,7 +47,7 @@
             var guideConfig = GuideConfig.Get(guide);
             var stepConfig = ScriptableObjectLoader.LoadSoFunctionalGuideStep(guideConfig.Steps[0]);
 
-            if (string.IsNullOrEmpty(stepConfig.tipContent))
+            if (string.IsNullOrEmpty(stepConfig.GetTipContent(GuideType.Functional)))
             {
                 m_ContainerLeft.gameObject.SetActive(false);
                 m_ContainerRight.gameObject.SetActive(false);
@@ -58,13 +58,13 @@
                 {
                     m_ContainerLeft.gameObject.SetActive(true);
                     m_ContainerRight.gameObject.SetActive(false);
-                    m_DialogueLeft.text = stepConfig.tipContent;
+                    m_DialogueLeft.text = stepConfig.GetTipContent(GuideType.Functional);
                 }
                 else
                 {
                     m_ContainerLeft.gameObject.SetActive(false);
                     m_ContainerRight.gameObject.SetActive(true);
-                    m_DialogueRight.text = stepConfig.tipContent;
+                    m_DialogueRight.text = stepConfig.GetTipContent(GuideType.Functional);
                 }
             }
 
diff --git a/System/NewBieGuidance/NewBieGuideScriptableObject.cs b/System/NewBieGuidance/NewBieGuideScriptableObject.cs
index ff81a60..632071e 100644
--- a/System/NewBieGuidance/NewBieGuideScriptableObject.cs
+++ b/System/NewBieGuidance/NewBieGuideScriptableObject.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 
 [CreateAssetMenu(menuName = "Config/NewbieGuideStep")]
-public class NewBieGuideScriptableObject : ScriptableObject
+public class NewBieGuideScriptableObject : ScriptableObject
 {
     public int stepId;
     public Vector2 clickPosition;
@@ -11,6 +11,8 @@
     public Vector2 tipPosition;
     public ArrowPosition arrowPosition;
     public string UIElementPath;
+
+    //宸插簾寮冿紝鐜颁娇鐢℅etTipContetn()
     public string tipContent;
     public SelectBoxPattern selectBox;
     public int effect2;
@@ -21,26 +23,40 @@
     public bool clickAnyWhereComplete = false;
     public bool pointerDownComplete = false;
 
-    public enum ArrowPosition
-    {
-        None,
-        Left,
-        Right,
-        Top,
-        Bottom,
-    }
-
-    public enum UsherOrientation
-    {
-        Normal = 0,
-        Reversal = 1
+    public enum ArrowPosition
+    {
+        None,
+        Left,
+        Right,
+        Top,
+        Bottom,
     }
 
-    public enum SelectBoxPattern
-    {
-        Pattern1 = 0,
-        Pattern2 = 1,
-        None = 2,//涓轰粈涔圢one鏄�2鍛紝鍥犱负None鍚庢坊鍔犵殑锛岃�岃繖涓灇涓炬槸搴忓垪鍖栫殑瀛楁
+    public enum UsherOrientation
+    {
+        Normal = 0,
+        Reversal = 1
+    }
+
+    public enum SelectBoxPattern
+    {
+        Pattern1 = 0,
+        Pattern2 = 1,
+        None = 2,//涓轰粈涔圢one鏄�2鍛紝鍥犱负None鍚庢坊鍔犵殑锛岃�岃繖涓灇涓炬槸搴忓垪鍖栫殑瀛楁
+    }
+
+    public const string GuidesPrefixNewBie = "guide_new_";
+    public const string GuidesPrefixFun = "guide_fun_";
+
+    public string GetTipContent(GuideType type)
+    {
+
+        switch (type)
+        {
+            case GuideType.NewBie: return Language.Get(GuidesPrefixNewBie + stepId);
+            case GuideType.Functional: return Language.Get(GuidesPrefixFun + stepId);
+            default: return "";
+        }
     }
 
 }
diff --git a/System/NewBieGuidance/NewBieWin.cs b/System/NewBieGuidance/NewBieWin.cs
index b93ffa0..aa67bae 100644
--- a/System/NewBieGuidance/NewBieWin.cs
+++ b/System/NewBieGuidance/NewBieWin.cs
@@ -234,7 +234,7 @@
             m_NewBieGuide.gameObject.SetActive(true);
 
             m_NewBieMask.Display(step);
-            m_Dialogue.text = stepConfig.tipContent;
+            m_Dialogue.text = stepConfig.GetTipContent(GuideType.NewBie);
             m_ContainerDialogue.transform.localPosition = stepConfig.tipPosition;
 
             m_ClickHintRoot.localPosition = stepConfig.clickPosition;

--
Gitblit v1.8.0