Merge pull request #4 from Giresharu/3-2020333打卡源工程报错

3 2020333打卡源工程报错

Assets/CHANGELOG-en.md

@@ -2,16 +2,22 @@ TMPro-Player
 ===
 [查看中文版本](./CHANGELOG.md)
 
+[1.1.4](https://github.com/Giresharu/TMPro-Player/releases/1.1.4)
+---
+
+### Fixed
+* Fixed various compatibility issues in Unity 2020.x version.
+
 [1.1.3](https://github.com/Giresharu/TMPro-Player/releases/1.1.3)
 ---
 
-### 修复
+### Fixed
 * Fixed the issue of incorrectly merge-optimizing of nested or interleaved paired tags.
 
 [1.1.2](https://github.com/Giresharu/TMPro-Player/releases/1.1.2)
 ---
 
-### 修复
+### Fixed
 * I made a silly mistake, accidentally typed an extra character. It's fixed now.
 
 [1.1.1](https://github.com/Giresharu/TMPro-Player/releases/1.1.1)

Assets/CHANGELOG.md

@@ -2,6 +2,12 @@ TMPro-Player
 ===
 [View in English](./CHANGELOG-en.md)
 
+[1.1.4](https://github.com/Giresharu/TMPro-Player/releases/1.1.4)
+---
+
+### 修复
+* 修复了在 unity 2020.x 版本中的各种不兼容问题
+
 [1.1.3](https://github.com/Giresharu/TMPro-Player/releases/1.1.3)
 ---
 

Assets/README-en.md

@@ -1,6 +1,6 @@
 ![LOGO](./logo.png)
 ===
-[![Releases](https://img.shields.io/github/v/release/Giresharu/TMPro-Player.svg)](https://github.com/Giresharu/TMPro-Player/releases/latest) [![openupm](https://img.shields.io/npm/v/com.gsr.tmproplayer?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.gsr.tmproplayer/) [![LICENSE](https://img.shields.io/github/license/Giresharu/TMPro-Player)](./LICENSE.md) ![Unity](https://img.shields.io/badge/Unity%20Supported-2020.1%2B-ff69b4.svg)
+[![Releases](https://img.shields.io/github/v/release/Giresharu/TMPro-Player?logo=github)](https://github.com/Giresharu/TMPro-Player/releases/latest) [![openupm](https://img.shields.io/npm/v/com.gsr.tmproplayer?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.gsr.tmproplayer/) [![LICENSE](https://img.shields.io/github/license/Giresharu/TMPro-Player)](./LICENSE.md) ![Unity](https://img.shields.io/badge/Unity%20Supported-2020.1%2B-ff69b4.svg?logo=unity) [![bilibili](https://img.shields.io/badge/bilibili-Overview_Video(in_Chinese)-FE7398?logo=bilibili&logoColor=white)](https://www.bilibili.com/video/BV1mV4y117jG/)
 
 [查看中文版](./README.md)
 
@@ -60,7 +60,7 @@ In your project's root directory, use the following command:
 # Install the latest version
 openupm add com.gsr.tmproplayer
 # Install a specific version
-openupm add [email protected].3
+openupm add [email protected].4
 ```
 If you are using a modified version of `com.unity.textmeshpro` and it is not recognized as a dependency, please use the following command to install:
 
@@ -73,7 +73,7 @@ openupm add com.gsr.tmproplayer -f
 In the Unity engine, open the `Package Manager` and click on the `+` button in the top left corner. Choose `Add package from git URL` and enter the git URL of this project:
 
 ```shell
-https://github.com/Giresharu/TMPro-Player.git?path=Assets#1.1.3
+https://github.com/Giresharu/TMPro-Player.git?path=Assets#1.1.4
 ```
 It is recommended to specify the version number when installing via Git URL to avoid automatically updating to the latest repository instead of the latest version. This ensures that you install a stable repository.
 

Assets/README.md

@@ -1,6 +1,7 @@
 ![LOGO](./logo.png)
 ===
-[![Releases](https://img.shields.io/github/v/release/Giresharu/TMPro-Player.svg)](https://github.com/Giresharu/TMPro-Player/releases/latest) [![openupm](https://img.shields.io/npm/v/com.gsr.tmproplayer?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.gsr.tmproplayer/) [![LICENSE](https://img.shields.io/github/license/Giresharu/TMPro-Player)](./LICENSE.md) ![Unity](https://img.shields.io/badge/Unity%20Supported-2020.1%2B-ff69b4.svg)
+
+[![Releases](https://img.shields.io/github/v/release/Giresharu/TMPro-Player?logo=github)](https://github.com/Giresharu/TMPro-Player/releases/latest) [![openupm](https://img.shields.io/npm/v/com.gsr.tmproplayer?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.gsr.tmproplayer/) [![LICENSE](https://img.shields.io/github/license/Giresharu/TMPro-Player)](./LICENSE.md) ![Unity](https://img.shields.io/badge/Unity%20Supported-2020.1%2B-ff69b4.svg?logo=unity) [![bilibili](https://img.shields.io/badge/bilibili-介绍视频-FE7398?logo=bilibili&logoColor=white)](https://www.bilibili.com/video/BV1mV4y117jG/)
 
 [View in English](./README-en.md)
 
@@ -58,7 +59,7 @@ TMPro Player 是一款基于 TextMeshPro 的富文本标签管理插件，实现
 # 安装最新版本
 openupm add com.gsr.tmproplayer
 # 安装指定版本
-openupm add [email protected].3
+openupm add [email protected].4
 ```
 如果你使用了魔改的 `com.unity.textmeshpro` ，并且无法正确被识别为依赖时，请使用如下命令安装：
 
@@ -71,7 +72,7 @@ openupm add com.gsr.tmproplayer -f
 在 Unity 引擎中，打开 `Package Manager` ，点击左上角的 `+` ，选择 `Add package from git URL` ，然后输入本项目的 git 地址即可： 
 
 ```shell
-https://github.com/Giresharu/TMPro-Player.git?path=Assets#1.1.3
+https://github.com/Giresharu/TMPro-Player.git?path=Assets#1.1.4
 ```
 建议使用 git URL 安装时指定版本号，否则会默认更新为最新仓库，而非最新版本。有可能会安装不稳定的仓库。
 

Assets/Runtime/TMPPlayerRichTagManager.cs

@@ -7,8 +7,7 @@
 using UnityEngine;
 
 namespace TMPPlayer {
-
-    [Icon("Packages/com.gsr.tmproplayer/Icons/manager.png")]
+
     public class TMPPlayerRichTagManager : MonoBehaviour {
 
         static TMPPlayerRichTagManager instance;

Assets/Runtime/TMProPlayer.cs

@@ -9,7 +9,7 @@
 
 namespace TMPPlayer {
 
-    [RequireComponent(typeof(TMP_Text))][Icon("Packages/com.gsr.tmproplayer/Icons/player.png")]
+    [RequireComponent(typeof(TMP_Text))]
     public class TMProPlayer : MonoBehaviour {
 
         public bool isTypeWriter = true;
@@ -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];
 

Assets/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.gsr.tmproplayer",
   "displayName": "TMPro Player",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "unity": "2020.1",
   "description": "基于 TextMeshPro 的自定义富文本标签插件\nCustom Rich Text Tag Plugin Based on TextMeshPro",
   "keywords": [

CHANGELOG-en.md

@@ -2,16 +2,22 @@ TMPro-Player
 ===
 [查看中文版本](./CHANGELOG.md)
 
+[1.1.4](https://github.com/Giresharu/TMPro-Player/releases/1.1.4)
+---
+
+### Fixed
+* Fixed various compatibility issues in Unity 2020.x version.
+
 [1.1.3](https://github.com/Giresharu/TMPro-Player/releases/1.1.3)
 ---
 
-### 修复
+### Fixed
 * Fixed the issue of incorrectly merge-optimizing of nested or interleaved paired tags.
 
 [1.1.2](https://github.com/Giresharu/TMPro-Player/releases/1.1.2)
 ---
 
-### 修复
+### Fixed
 * I made a silly mistake, accidentally typed an extra character. It's fixed now.
 
 [1.1.1](https://github.com/Giresharu/TMPro-Player/releases/1.1.1)

CHANGELOG.md

@@ -2,6 +2,12 @@ TMPro-Player
 ===
 [View in English](./CHANGELOG-en.md)
 
+[1.1.4](https://github.com/Giresharu/TMPro-Player/releases/1.1.4)
+---
+
+### 修复
+* 修复了在 unity 2020.x 版本中的各种不兼容问题
+
 [1.1.3](https://github.com/Giresharu/TMPro-Player/releases/1.1.3)
 ---
 

README-en.md

@@ -1,6 +1,6 @@
 ![LOGO](./Assets/logo.png)
 ===
-[![Releases](https://img.shields.io/github/v/release/Giresharu/TMPro-Player.svg)](https://github.com/Giresharu/TMPro-Player/releases/latest) [![openupm](https://img.shields.io/npm/v/com.gsr.tmproplayer?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.gsr.tmproplayer/) [![LICENSE](https://img.shields.io/github/license/Giresharu/TMPro-Player)](./LICENSE.md) ![Unity](https://img.shields.io/badge/Unity%20Supported-2020.1%2B-ff69b4.svg)
+[![Releases](https://img.shields.io/github/v/release/Giresharu/TMPro-Player?logo=github)](https://github.com/Giresharu/TMPro-Player/releases/latest) [![openupm](https://img.shields.io/npm/v/com.gsr.tmproplayer?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.gsr.tmproplayer/) [![LICENSE](https://img.shields.io/github/license/Giresharu/TMPro-Player)](./LICENSE.md) ![Unity](https://img.shields.io/badge/Unity%20Supported-2020.1%2B-ff69b4.svg?logo=unity) [![bilibili](https://img.shields.io/badge/bilibili-Overview_Video(in_Chinese)-FE7398?logo=bilibili&logoColor=white)](https://www.bilibili.com/video/BV1mV4y117jG/)
 
 [查看中文版](./README.md)
 
@@ -60,7 +60,7 @@ In your project's root directory, use the following command:
 # Install the latest version
 openupm add com.gsr.tmproplayer
 # Install a specific version
-openupm add [email protected].3
+openupm add [email protected].4
 ```
 If you are using a modified version of `com.unity.textmeshpro` and it is not recognized as a dependency, please use the following command to install:
 
@@ -73,7 +73,7 @@ openupm add com.gsr.tmproplayer -f
 In the Unity engine, open the `Package Manager` and click on the `+` button in the top left corner. Choose `Add package from git URL` and enter the git URL of this project:
 
 ```shell
-https://github.com/Giresharu/TMPro-Player.git?path=Assets#1.1.3
+https://github.com/Giresharu/TMPro-Player.git?path=Assets#1.1.4
 ```
 It is recommended to specify the version number when installing via Git URL to avoid automatically updating to the latest repository instead of the latest version. This ensures that you install a stable repository.
 

README.md

@@ -1,6 +1,6 @@
 ![LOGO](./Assets/logo.png)
 ===
-[![Releases](https://img.shields.io/github/v/release/Giresharu/TMPro-Player.svg)](https://github.com/Giresharu/TMPro-Player/releases/latest) [![openupm](https://img.shields.io/npm/v/com.gsr.tmproplayer?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.gsr.tmproplayer/) [![LICENSE](https://img.shields.io/github/license/Giresharu/TMPro-Player)](./LICENSE.md) ![Unity](https://img.shields.io/badge/Unity%20Supported-2020.1%2B-ff69b4.svg)
+[![Releases](https://img.shields.io/github/v/release/Giresharu/TMPro-Player?logo=github)](https://github.com/Giresharu/TMPro-Player/releases/latest) [![openupm](https://img.shields.io/npm/v/com.gsr.tmproplayer?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.gsr.tmproplayer/) [![LICENSE](https://img.shields.io/github/license/Giresharu/TMPro-Player)](./LICENSE.md) ![Unity](https://img.shields.io/badge/Unity%20Supported-2020.1%2B-ff69b4.svg?logo=unity) [![bilibili](https://img.shields.io/badge/bilibili-介绍视频-FE7398?logo=bilibili&logoColor=white)](https://www.bilibili.com/video/BV1mV4y117jG/)
 
 [View in English](./README-en.md)
 
@@ -58,7 +58,7 @@ TMPro Player 是一款基于 TextMeshPro 的富文本标签管理插件，实现
 # 安装最新版本
 openupm add com.gsr.tmproplayer
 # 安装指定版本
-openupm add [email protected].3
+openupm add [email protected].4
 ```
 如果你使用了魔改的 `com.unity.textmeshpro` ，并且无法正确被识别为依赖时，请使用如下命令安装：
 
@@ -71,7 +71,7 @@ openupm add com.gsr.tmproplayer -f
 在 Unity 引擎中，打开 `Package Manager` ，点击左上角的 `+` ，选择 `Add package from git URL` ，然后输入本项目的 git 地址即可： 
 
 ```shell
-https://github.com/Giresharu/TMPro-Player.git?path=Assets#1.1.3
+https://github.com/Giresharu/TMPro-Player.git?path=Assets#1.1.4
 ```
 建议使用 git URL 安装时指定版本号，否则会默认更新为最新仓库，而非最新版本。有可能会安装不稳定的仓库。