Skip to content

Commit cb146fa

Browse files
author
JunichiEnomoto
committed
fix : #6
And Version Up Unity 2020
1 parent d1cb960 commit cb146fa

4 files changed

Lines changed: 11 additions & 19 deletions

File tree

Assets/RubyTextMeshPro/Source/RubyTextMeshPro.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public override void ForceMeshUpdate(bool ignoreActiveState = false, bool forceT
6161
if (m_enableAutoSizing)
6262
{
6363
// change auto size timing, update ruby tag size.
64-
SetTextCustom(m_uneditedText);
64+
text = ReplaceRubyTags(m_uneditedText);
65+
base.ForceMeshUpdate(ignoreActiveState,forceTextReparsing);
6566
}
6667
}
6768

Packages/manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.collab-proxy": "1.7.1",
4+
"com.unity.collab-proxy": "1.9.0",
55
"com.unity.ext.nunit": "1.0.6",
66
"com.unity.ide.rider": "2.0.7",
77
"com.unity.ide.visualstudio": "2.0.11",
8-
"com.unity.ide.vscode": "1.2.3",
9-
"com.unity.test-framework": "1.1.27",
8+
"com.unity.ide.vscode": "1.2.4",
9+
"com.unity.test-framework": "1.1.29",
1010
"com.unity.textmeshpro": "3.0.6",
1111
"com.unity.timeline": "1.4.8",
1212
"com.unity.ugui": "1.0.0",

Packages/packages-lock.json

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
"dependencies": {}
88
},
99
"com.unity.collab-proxy": {
10-
"version": "1.7.1",
10+
"version": "1.9.0",
1111
"depth": 0,
1212
"source": "registry",
13-
"dependencies": {
14-
"com.unity.nuget.newtonsoft-json": "2.0.0"
15-
},
13+
"dependencies": {},
1614
"url": "https://packages.unity.com"
1715
},
1816
"com.unity.ext.nunit": {
@@ -41,21 +39,14 @@
4139
"url": "https://packages.unity.com"
4240
},
4341
"com.unity.ide.vscode": {
44-
"version": "1.2.3",
42+
"version": "1.2.4",
4543
"depth": 0,
4644
"source": "registry",
4745
"dependencies": {},
4846
"url": "https://packages.unity.com"
4947
},
50-
"com.unity.nuget.newtonsoft-json": {
51-
"version": "2.0.0",
52-
"depth": 1,
53-
"source": "registry",
54-
"dependencies": {},
55-
"url": "https://packages.unity.com"
56-
},
5748
"com.unity.test-framework": {
58-
"version": "1.1.27",
49+
"version": "1.1.29",
5950
"depth": 0,
6051
"source": "registry",
6152
"dependencies": {

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.17f1
2-
m_EditorVersionWithRevision: 2020.3.17f1 (a4537701e4ab)
1+
m_EditorVersion: 2020.3.19f1
2+
m_EditorVersionWithRevision: 2020.3.19f1 (68f137dc9bbe)

0 commit comments

Comments
 (0)