diff --git a/_DOTween.Assembly/DOTween/Plugins/StringPlugin.cs b/_DOTween.Assembly/DOTween/Plugins/StringPlugin.cs index 032f6c2..1331da3 100644 --- a/_DOTween.Assembly/DOTween/Plugins/StringPlugin.cs +++ b/_DOTween.Assembly/DOTween/Plugins/StringPlugin.cs @@ -87,15 +87,16 @@ namespace DG.Tweening.Plugins if (isRelative) { _Buffer.Append(startValue); if (options.scrambleMode != ScrambleMode.None) { - setter(_Buffer.Append(changeValue, 0, len).AppendScrambledChars(changeValueLen - len, ScrambledCharsToUse(options)).ToString()); + setter(Append(changeValue, 0, len, options.richTextEnabled).AppendScrambledChars(changeValueLen - len, ScrambledCharsToUse(options)).ToString()); return; } - setter(_Buffer.Append(changeValue, 0, len).ToString()); + setter(Append(changeValue, 0, len, options.richTextEnabled).ToString()); return; } if (options.scrambleMode != ScrambleMode.None) { - setter(_Buffer.Append(changeValue, 0, len).AppendScrambledChars(changeValueLen - len, ScrambledCharsToUse(options)).ToString()); +// setter(_Buffer.Append(changeValue, 0, len).AppendScrambledChars(changeValueLen - len, ScrambledCharsToUse(options)).ToString()); + setter(Append(changeValue, 0, len, options.richTextEnabled).AppendScrambledChars(changeValueLen - len, ScrambledCharsToUse(options)).ToString()); return; } @@ -112,11 +113,11 @@ namespace DG.Tweening.Plugins } // Manages eventual rich text, if enabled, readding tags to the given string and closing them when necessary - void Append(string value, int startIndex, int length, bool richTextEnabled) + StringBuilder Append(string value, int startIndex, int length, bool richTextEnabled) { if (!richTextEnabled) { _Buffer.Append(value, startIndex, length); - return; + return _Buffer; } const string tagMatch = @"<.*?(>)"; @@ -158,6 +159,7 @@ namespace DG.Tweening.Plugins Match m = Regex.Match(next, closeTagMatch); if (m.Success) _Buffer.Append(m.Value); } + return _Buffer; } char[] ScrambledCharsToUse(StringOptions options) diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index dca1428..cd2050e 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -1906,6 +1906,41 @@ What axis to constrain in case of Vector tweens + + + Type of scramble to apply to string tweens + + + + + No scrambling of characters + + + + + A-Z + a-z + 0-9 characters + + + + + A-Z characters + + + + + a-z characters + + + + + 0-9 characters + + + + + Custom characters + + Path control point @@ -1943,40 +1978,5 @@ Public only so custom shortcuts can access some of these methods - - - Type of scramble to apply to string tweens - - - - - No scrambling of characters - - - - - A-Z + a-z + 0-9 characters - - - - - A-Z characters - - - - - a-z characters - - - - - 0-9 characters - - - - - Custom characters - - diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 09b6c14..cf17509 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll and b/_DOTween.Assembly/bin/DOTween.dll differ diff --git a/_DOTween.Assembly/bin/DOTween.dll.mdb b/_DOTween.Assembly/bin/DOTween.dll.mdb index 21beec9..85d75e2 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ