修复2020不支持的新语法

Giresharu · Jun 26, 2023 · 44e8ae7 · 44e8ae7
1 parent db1b11a
commit 44e8ae7
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Assets/Runtime/TMProPlayer.cs b/Assets/Runtime/TMProPlayer.cs
@@ -194,7 +194,8 @@ public void SetText(string text, bool isAdditive = false, bool newline = false)
         /// </summary>
         /// <param name="invokeSingleActions"> 是否需要执行跳过的文字中的单个标签 </param>
         public void Skip(bool invokeSingleActions = true) {
-            if (typeWriterTokenSource is not { IsCancellationRequested: false }) return;
+            if (typeWriterTokenSource == null || typeWriterTokenSource.IsCancellationRequested) return;
+            // if (typeWriterTokenSource is not { IsCancellationRequested: false }) return;
 
             typeWriterTokenSource.Cancel();
             typeWriterTokenSource.Dispose();
@@ -346,7 +347,7 @@ void ShowText(bool isAdditive = false) {
                 lastInvokeIndex = TextMeshPro.text.Length - 1;
                 // AddUpdateFlags(TMP_VertexDataUpdateFlags.Colors32);
             }
-            
+
             // 触发成对 Action
             foreach (var tuple in pairedActions.Keys)
                 tuple.actionInfo.Invoke(this, actionTokenSource.Token, pairedActions[tuple], tuple.value);
@@ -497,7 +498,9 @@ IEnumerator TypeWriter(CancellationToken token) {
                     Stack<int> temp = new Stack<int>();
 
                     while (true) {
-                        if (!tagIndices.TryPop(out int i)) break;
+                        if (tagIndices.Count <= 0) break;
+                        int i = tagIndices.Pop();
+                        // if (!tagIndices.TryPop(out int i)) break;
 
                         RichTagInfo richTagInfo = textTags[i];