Merge branch 'develop' into 6.4.20全流程优化

Assets/Scripts/Dialog System/BaseYarnCommand.cs

@@ -70,6 +70,20 @@ namespace AibisDream
             var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
             return panel.FadeOutAsync(duration);
         }
+        
+        [YarnCommand("fade_in_sync")]
+        public static void FadeInSync(float duration = 1)
+        {
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            panel.FadeInSync(duration);
+        }
+
+        [YarnCommand("fade_out_sync")]
+        public static void FadeOutSync(float duration = 1)
+        {
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            panel.FadeOutSync(duration);
+        }
 
         [YarnCommand("show_obj")]
         public static IEnumerator ShowObj(string picName)

Assets/Scripts/Dialog System/DialogController.cs

@@ -60,7 +60,7 @@ namespace AibisDream
             _dialogueRunner.Stop();
             StorageSystem.Instance.Clear();
             DialogCanvasManager.Instance.HideDialog();
-            DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.OldBox);
+            DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.StandardBubble);
         }
 
         public void LoadDialog(YarnProject yarnProject)

Assets/Scripts/Dialog System/LocalisedLineProvider.cs

@@ -2,6 +2,8 @@
 using UnityEngine.Localization.Settings;
 using Yarn.Unity;
 using AibisDream.Framework;
+using AibisDream.Utility;
+using UnityEngine;
 
 namespace AibisDream
 {
@@ -24,12 +26,13 @@ namespace AibisDream
             }
 
             LocalizeSubstitutions(line);
+            var resText = CommonUtil.Escape(text);
 
             // Construct the localized line
             LocalizedLine localizedLine = new LocalizedLine
             {
                 TextID = line.ID,
-                RawText = text,
+                RawText = resText,
                 Substitutions = line.Substitutions,
                 Metadata = YarnProject.lineMetadata.GetMetadata(line.ID)
             };
@@ -53,6 +56,11 @@ namespace AibisDream
             return localizedLine;
         }
 
+        // private string Escape(string text)
+        // {
+        //     Debug
+        // }
+
         private void LocalizeSubstitutions(Yarn.Line line)
         {
             for (var i = 0; i < line.Substitutions.Length; i++)