Merge branch 'develop' into 6.11优化

Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset

@@ -450,6 +450,14 @@ MonoBehaviour:
     m_Localized: "CenterText: \u7B2C\u4E00\u7AE0"
     m_Metadata:
       m_Items: []
+  - m_Id: 356927556030464
+    m_Localized: "Task: \u5207\u9664\u903B\u8F91\u6A21\u5757"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 356927585390592
+    m_Localized: "Task: \u5207\u9664\u8BB0\u5FC6\u6A21\u5757"
+    m_Metadata:
+      m_Items: []
   references:
     version: 2
     RefIds: []

Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn

@@ -282,7 +282,7 @@ position: 907,-2702
 <<complete_task "line:002672d">>
 <<wait 0.1>>
 // <<open_screen Emo>>
-<<task_moveOut TaskManager>>
+<<task_moveOut>>
 Linking: 正在建立连接… #line:0e7b127 
 <<wait 0.2>>
 gotash?: 啊！痛…好痛！ #line:0348ba1 

Assets/Scenes/Persistence.unity

@@ -16935,6 +16935,7 @@ GameObject:
   - component: {fileID: 1318260398}
   - component: {fileID: 1318260400}
   - component: {fileID: 1318260399}
+  - component: {fileID: 1318260401}
   m_Layer: 5
   m_Name: Width Estimation
   m_TagString: Untagged
@@ -16959,7 +16960,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -1129}
-  m_SizeDelta: {x: 200, y: 50}
+  m_SizeDelta: {x: 1291.51, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1318260399
 MonoBehaviour:
@@ -16981,7 +16982,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 
+  m_text: "SD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82ACSD\u53D1\u65AF\u8482\u82AC"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
   m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
@@ -17058,6 +17059,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1318260397}
   m_CullTransparentMesh: 1
+--- !u!114 &1318260401
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1318260397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1001 &1337853806
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/Dialog System/LocalisedLineProvider.cs

@@ -56,11 +56,6 @@ 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++)

Assets/Scripts/FixSystemNew/FixStateMachine.cs

@@ -574,9 +574,6 @@ namespace AibisDream.FixSystem
             yield return CameraKit.Instance.SwitchCamera(CameraEnum.CutEmoDeep);
             yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeOutAsync(0.1f);
             yield return cuttingManager.StartCutting(bodyModule);
-            
-            
-            
         }
         
         public IEnumerator Exit()

Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 using AibisDream.Framework;
 using AibisDream.Kit;
 using AibisDream.Utility;
@@ -118,6 +119,8 @@ namespace AibisDream
 
         private void HandleLayout(string line)
         {
+            // 先去除富文本标签
+            line = Regex.Replace(line.Replace("<br>", "\n"), "[<|{].*?[>|}]", string.Empty);
             var width = DialogCanvasManager.Instance.EstimateTextWidth(line, _lineText.fontSize);
             if (width > maxWidth)
             {

Assets/Scripts/UI/DialogUI/Bubbles/BubbleGroup.cs

@@ -138,7 +138,12 @@ namespace AibisDream
 
         public bool TrySkipLine(bool isForceSkip = false)
         {
-            if (_curBubble.IsShowingText)
+            if (!_curBubble)
+            {
+                return true;
+            }
+            
+            if (_curBubble && _curBubble.IsShowingText)
             {
                 _curBubble.SkipLine();
                 return true;
@@ -156,6 +161,7 @@ namespace AibisDream
             _nextStep = null;
 
             _curBubble?.Hide();
+            _curBubble = null;
 
             next?.Invoke();
         }

Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs

@@ -156,9 +156,6 @@ namespace AibisDream
         public void ShowLine(string dialogLine, CharacterVo character, Action nextStep, string lineId,
             bool isAutoSkip = false)
         {
-            Debug.Log($"{character.dialogViewType}");
-            Debug.Log(_defaultView.GetType());
-            
             _isNextAutoSkip = isAutoSkip;
             // 根据DialogViewType确定在哪个对话框显示
             if (character.dialogViewType == DialogViewType.Default)

Assets/Scripts/Utility/CommonUtil.cs

@@ -253,7 +253,7 @@ namespace AibisDream.Utility
 
         public static string Escape(string rawText)
         {
-            return rawText.Replace("^", "#").Replace("[[", "\\{").Replace("]]", "\\}");
+            return rawText.Replace("^", "#").Replace("[[", "{").Replace("]]", "}");
         }
     }
 }