Merge branch 'bugfix/jumpline' into 'develop'

问题修复

See merge request aibis-dream/aibis-dream!344

Assets/Scripts/Dialog System/LineView.cs

@@ -15,6 +15,7 @@ namespace AibisDream
 
             if (DialogController.Instance.quickRunMode)
             {
+                DialogCanvasManager.Instance.TrySkipLine(true);
                 DialogCanvasManager.Instance.NextStep();
             }
         }

Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs

@@ -57,9 +57,9 @@ namespace AibisDream
             // }
             
             // SpriteGroup加载
-            characterGroup.config.key = data.groupName;
+            characterGroup.config.key = data.configKey;
             yield return characterGroup.InstantiateByConfigAsync();
-            characterGroup.SwitchState(data.state);
+            characterGroup.SwitchState(data.curState);
             yield return characterGroup.Fade(data.shown);
         }
 
@@ -99,10 +99,10 @@ namespace AibisDream
         public bool hasDevice;
         public bool isShow;
 
-        public string groupName;
-        public string state;
+        public string configKey;
+        public string curState;
         public bool shown;
-        
+
         public event Action<ClinicData> LoadEvent;
 
         public void Load()

Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs

@@ -186,7 +186,7 @@ namespace AibisDream.FixSystem
             // HideDialog应该由其他函数控制
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isAutoSkip)
         {
             // 这里不能跳过对话
             return true;

Assets/Scripts/UI/DialogUI/CenterOption.cs

@@ -52,7 +52,7 @@ namespace AibisDream
             gameObject.SetActive(false);
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip)
         {
             // 无法跳过
             return true;

Assets/Scripts/UI/DialogUI/CenterText.cs

@@ -76,9 +76,9 @@ namespace AibisDream
             gameObject.SetActive(false);
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip)
         {
-            if (_skipLineDelay)
+            if (_skipLineDelay && !isForceSkip)
             {
                 return true;
             }

Assets/Scripts/UI/DialogUI/DialogBoxBase.cs

@@ -165,9 +165,9 @@ namespace AibisDream
         /// false说明对话已经显示完成了，可以跳过
         /// </summary>
         /// <returns></returns>
-        public virtual bool TrySkipLine()
+        public virtual bool TrySkipLine(bool isForceSkip)
         {
-            if (_skipLineDelay)
+            if (_skipLineDelay && !isForceSkip)
             {
                 return true;
             }

Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs

@@ -68,9 +68,9 @@ namespace AibisDream
             _dialogViews?.ForEach(item => item.HideDialog());
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip = false)
         {
-            return _currentView == null || _currentView.TrySkipLine();
+            return _currentView == null || _currentView.TrySkipLine(isForceSkip);
         }
 
         public void NextStep()

Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs

@@ -169,9 +169,9 @@ namespace AibisDream
             _curView.HideDialog();
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip = false)
         {
-            return _lastShowView != null && _lastShowView.TrySkipLine();
+            return _lastShowView != null && _lastShowView.TrySkipLine(isForceSkip);
         }
 
         public void NextStep()

Assets/Scripts/UI/DialogUI/IDialogView.cs

@@ -16,7 +16,7 @@ namespace AibisDream
 
         public void HideDialog();
 
-        public bool TrySkipLine();
+        public bool TrySkipLine(bool isForceSkip = false);
 
         public void NextStep();
     }

Assets/Scripts/UI/DialogUI/TextBubble.cs

@@ -18,8 +18,6 @@ namespace AibisDream.Framework
 
         #endregion
 
-        private bool _skipLineDelay;
-
         public bool IsShowingText => _typewriter.isShowingText;
 
         private void Awake()

Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs

@@ -103,9 +103,9 @@ namespace AibisDream
             }
         }
 
-        public bool TrySkipLine()
+        public bool TrySkipLine(bool isForceSkip)
         {
-            if (_skipLineDelay)
+            if (_skipLineDelay && !isForceSkip)
             {
                 return true;
             }