From 9058fa1bbdbc4b862d13e9143b61fe89fc818611 Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Wed, 11 Sep 2024 00:08:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=AD=97=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scenes/Persistence.unity     |  2 +-
 Assets/Scripts/UI/DialogUiViewer.cs | 12 +++++++++++-
 Assets/Scripts/Utility/Singleton.cs | 20 ++++++--------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity
index 37172b4b9..7b5ad7f7b 100644
--- a/Assets/Scenes/Persistence.unity
+++ b/Assets/Scenes/Persistence.unity
@@ -1285,7 +1285,7 @@ MonoBehaviour:
   onMessage:
     m_PersistentCalls:
       m_Calls: []
-  waitForNormalChars: 0.1
+  waitForNormalChars: 0.05
   waitLong: 0.6
   waitMiddle: 0.2
   avoidMultiplePunctuactionWait: 0
diff --git a/Assets/Scripts/UI/DialogUiViewer.cs b/Assets/Scripts/UI/DialogUiViewer.cs
index e6d88a3bf..ccb408c8f 100644
--- a/Assets/Scripts/UI/DialogUiViewer.cs
+++ b/Assets/Scripts/UI/DialogUiViewer.cs
@@ -4,7 +4,6 @@ using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 using Yarn.Unity;
-using System.Threading.Tasks;
 
 namespace AibisDream
 {
@@ -33,6 +32,8 @@ namespace AibisDream
 
         #endregion
 
+        private bool _skipLineDelay;
+
         protected override void Awake()
         {
             base.Awake();
@@ -154,6 +155,9 @@ namespace AibisDream
 
         public bool TrySkipLine()
         {
+            // 开始后0.5秒不给跳过
+            if (_skipLineDelay) return true;
+            
             if (dialogText.isShowingText)
             {
                 dialogText.SkipTypewriter();
@@ -179,6 +183,12 @@ namespace AibisDream
             quickTalkButton = box.transform.Find(QUICK_TALK).gameObject;
             
             quickTalkButton.GetComponent<Button>().onClick.AddListener(SwitchQuickTalkMode);
+            
+            dialogText.onTypewriterStart.AddListener(() =>
+            {
+                _skipLineDelay = true;
+                CommonUtil.Delay(300, () => { _skipLineDelay = false; });
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Utility/Singleton.cs b/Assets/Scripts/Utility/Singleton.cs
index 8030caac3..a40b7f013 100644
--- a/Assets/Scripts/Utility/Singleton.cs
+++ b/Assets/Scripts/Utility/Singleton.cs
@@ -4,35 +4,27 @@ namespace AibisDream
 {
     public class Singleton<T> : MonoBehaviour where T : Singleton<T>
     {
-        private static T instance;
-
-        public static T Instance
-        {
-            get { return instance; }
-        }
+        public static T Instance { get; private set; }
 
         protected virtual void Awake()
         {
-            if (instance != null)
+            if (Instance != null)
             {
                 Destroy(gameObject);
             }
             else
             {
-                instance = (T)this;
+                Instance = (T)this;
             }
         }
 
-        public static bool IsInitialized
-        {
-            get { return instance != null; }
-        }
+        public static bool IsInitialized => Instance != null;
 
         protected virtual void OnDestroy()
         {
-            if (instance == this)
+            if (Instance == this)
             {
-                instance = null;
+                Instance = null;
             }
         }
     }