Fixed rich tag bug

Author: Fizzycoco214

Assets/Scenes/SampleScene.unity

@@ -177,7 +177,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "<shake:5>crazy</shake><wave:20> text effects \nwow isn't this so </wave><shake:5>cool"
+  m_text: "<shake:10>fcrazy </shake> <wave:10>text <color=red>effects</color> \nwow
+    isn't this so </wave> <wave:3><shake:5>cool"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -204,7 +205,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 60.9
+  m_fontSize: 70.15
   m_fontSizeBase: 40.38
   m_fontWeight: 400
   m_enableAutoSizing: 1

Assets/TextParser.cs

@@ -8,10 +8,13 @@
 
 public class TextParser : MonoBehaviour
 {
-    //Regexes from https://github.com/markv12/VertexTextAnimationDemo
+    //Remainder Regex from https://github.com/markv12/VertexTextAnimationDemo
 
     private const string REMAINDER_REGEX = "(.*?((?=>)|(/|$)))";
 
+    //Because text mesh pro parses it's own tags, we need to find them
+    private static  readonly Regex richTagRegex = new Regex("<.*?>");
+
     static readonly TextRegex[] textRegexes = {
         new("shake", new TextCharacterShakeEffect()),
         new("wave", new TextWaveEffect())
@@ -82,12 +85,14 @@ void UpdateRanges(int index, int length) {
             UpdateRanges(effectRanges[i].endIndex, effectRanges[i].endTagLength);
         }
 
-        // //Because the mesh doesn't have spaces
-        // for(int i = 0; i < text.Length; i++) {
-        //     if(text[i] == ' ') {
-        //         UpdateRanges(i, 1);
-        //     }
-        // }
+        //Modifying the indexes to account for the removed non custom rich tags
+        MatchCollection nonCustomTagMatches = richTagRegex.Matches(text);
+        for(int i = 0; i < nonCustomTagMatches.Count; i++) {
+            Match match = nonCustomTagMatches[i];
+            if(match.Success) {
+                UpdateRanges(match.Index, match.Length);
+            }
+        }
 
         return effectRanges;
     }

Packages/packages-lock.json

@@ -14,7 +14,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.2d.aseprite": {
-      "version": "1.1.6",
+      "version": "1.1.7",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -140,7 +140,7 @@
         "com.unity.2d.spriteshape": "10.0.7",
         "com.unity.2d.tilemap": "1.0.0",
         "com.unity.2d.tilemap.extras": "4.1.0",
-        "com.unity.2d.aseprite": "1.1.6"
+        "com.unity.2d.aseprite": "1.1.7"
       }
     },
     "com.unity.ide.rider": {

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.0.26f1
-m_EditorVersionWithRevision: 6000.0.26f1 (ccb7c73d2c02)
+m_EditorVersion: 6000.0.32f1
+m_EditorVersionWithRevision: 6000.0.32f1 (b2e806cf271c)