Skip to content

Commit 93a4dcd

Browse files
authored
Merge pull request #10 from jp-netsis/feature/v1.2.0
Feature/v1.2.0
2 parents 3023854 + d80075b commit 93a4dcd

File tree

78 files changed

+156294
-1103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+156294
-1103
lines changed
File renamed without changes.
File renamed without changes.

Assets/RubyTextMeshPro/Demo/Fonts/rounded-mplus-1c-regular SDF.asset renamed to Assets/Demo/Fonts/rounded-mplus-1c-regular SDF.asset

+5,624-24
Large diffs are not rendered by default.
File renamed without changes.

Assets/RubyTextMeshPro/Demo/Scene/RubySampleScene2 (TMPuGUI).unity renamed to Assets/Demo/Scene/RubySampleScene2 (TMPuGUI).unity

+242-380
Large diffs are not rendered by default.
+102-100
Large diffs are not rendered by default.
+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
using System.Collections;
2-
using TMPro;
3-
using UnityEngine;
4-
5-
[RequireComponent(typeof(RubyTextMeshPro))]
6-
public class SampleRubyTMP : MonoBehaviour
7-
{
8-
public float span = 3f;
9-
10-
private readonly string[] strArray =
11-
{
12-
"<ruby=いち>壱</ruby>",
13-
"<ruby=に>弐</ruby>",
14-
"<ruby=さん>参</ruby>",
15-
"<ruby=し>肆</ruby>",
16-
"<ruby=ご>伍</ruby>",
17-
"<ruby=ろく>禄</ruby>",
18-
"<ruby=しち>漆</ruby>",
19-
"<ruby=はち>捌</ruby>",
20-
"<ruby=きゅう>玖</ruby>",
21-
"<ruby=じゅう>拾</ruby>"
22-
};
23-
24-
private RubyTextMeshPro rubyTextMeshPro;
25-
26-
private int strIndex;
27-
28-
// Start is called before the first frame update
29-
private void Start()
30-
{
31-
this.rubyTextMeshPro = this.GetComponent<RubyTextMeshPro>();
32-
this.StartCoroutine(this.TimeUpdate());
33-
}
34-
35-
// Update is called once per frame
36-
private IEnumerator TimeUpdate()
37-
{
38-
while (true)
39-
{
40-
yield return new WaitForSeconds(this.span);
41-
this.UpdateText();
42-
}
43-
}
44-
45-
private void UpdateText()
46-
{
47-
this.rubyTextMeshPro.uneditedText = this.strArray[this.strIndex];
48-
this.strIndex++;
49-
50-
if (this.strArray.Length <= this.strIndex)
51-
{
52-
this.strIndex = 0;
53-
}
54-
}
1+
using System.Collections;
2+
using TMPro;
3+
using UnityEngine;
4+
5+
[RequireComponent(typeof(RubyTextMeshPro))]
6+
public class SampleRubyTMP : MonoBehaviour
7+
{
8+
public float span = 3f;
9+
10+
private readonly string[] strArray =
11+
{
12+
"<ruby=いち>壱</ruby>",
13+
"<ruby=に>弐</ruby>",
14+
"<ruby=さん>参</ruby>",
15+
"<ruby=し>肆</ruby>",
16+
"<ruby=ご>伍</ruby>",
17+
"<ruby=ろく>禄</ruby>",
18+
"<ruby=しち>漆</ruby>",
19+
"<ruby=はち>捌</ruby>",
20+
"<ruby=きゅう>玖</ruby>",
21+
"<ruby=じゅう>拾</ruby>"
22+
};
23+
24+
private RubyTextMeshPro rubyTextMeshPro;
25+
26+
private int strIndex;
27+
28+
// Start is called before the first frame update
29+
private void Start()
30+
{
31+
this.rubyTextMeshPro = this.GetComponent<RubyTextMeshPro>();
32+
this.StartCoroutine(this.TimeUpdate());
33+
}
34+
35+
// Update is called once per frame
36+
private IEnumerator TimeUpdate()
37+
{
38+
while (true)
39+
{
40+
yield return new WaitForSeconds(this.span);
41+
this.UpdateText();
42+
}
43+
}
44+
45+
private void UpdateText()
46+
{
47+
this.rubyTextMeshPro.uneditedText = this.strArray[this.strIndex];
48+
this.strIndex++;
49+
50+
if (this.strArray.Length <= this.strIndex)
51+
{
52+
this.strIndex = 0;
53+
}
54+
}
5555
}
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
using System.Collections;
2-
using TMPro;
3-
using UnityEngine;
4-
5-
[RequireComponent(typeof(RubyTextMeshProUGUI))]
6-
public class SampleRubyTMPUGUI : MonoBehaviour
7-
{
8-
public float span = 3f;
9-
10-
private readonly string[] strArray =
11-
{
12-
"<ruby=いち>壱</ruby>",
13-
"<ruby=に>弐</ruby>",
14-
"<ruby=さん>参</ruby>",
15-
"<ruby=し>肆</ruby>",
16-
"<ruby=ご>伍</ruby>",
17-
"<ruby=ろく>禄</ruby>",
18-
"<ruby=しち>漆</ruby>",
19-
"<ruby=はち>捌</ruby>",
20-
"<ruby=きゅう>玖</ruby>",
21-
"<ruby=じゅう>拾</ruby>"
22-
};
23-
24-
private RubyTextMeshProUGUI rubyTextMeshPro;
25-
26-
private int strIndex;
27-
28-
// Start is called before the first frame update
29-
private void Start()
30-
{
31-
this.rubyTextMeshPro = this.GetComponent<RubyTextMeshProUGUI>();
32-
this.StartCoroutine(this.TimeUpdate());
33-
}
34-
35-
// Update is called once per frame
36-
private IEnumerator TimeUpdate()
37-
{
38-
while (true)
39-
{
40-
yield return new WaitForSeconds(this.span);
41-
this.UpdateText();
42-
}
43-
}
44-
45-
private void UpdateText()
46-
{
47-
this.rubyTextMeshPro.uneditedText = this.strArray[this.strIndex];
48-
this.strIndex++;
49-
50-
if (this.strArray.Length <= this.strIndex)
51-
{
52-
this.strIndex = 0;
53-
}
54-
}
1+
using System.Collections;
2+
using TMPro;
3+
using UnityEngine;
4+
5+
[RequireComponent(typeof(RubyTextMeshProUGUI))]
6+
public class SampleRubyTMPUGUI : MonoBehaviour
7+
{
8+
public float span = 3f;
9+
10+
private readonly string[] strArray =
11+
{
12+
"<ruby=いち>壱</ruby>",
13+
"<ruby=に>弐</ruby>",
14+
"<ruby=さん>参</ruby>",
15+
"<ruby=し>肆</ruby>",
16+
"<ruby=ご>伍</ruby>",
17+
"<ruby=ろく>禄</ruby>",
18+
"<ruby=しち>漆</ruby>",
19+
"<ruby=はち>捌</ruby>",
20+
"<ruby=きゅう>玖</ruby>",
21+
"<ruby=じゅう>拾</ruby>"
22+
};
23+
24+
private RubyTextMeshProUGUI rubyTextMeshPro;
25+
26+
private int strIndex;
27+
28+
// Start is called before the first frame update
29+
private void Start()
30+
{
31+
this.rubyTextMeshPro = this.GetComponent<RubyTextMeshProUGUI>();
32+
this.StartCoroutine(this.TimeUpdate());
33+
}
34+
35+
// Update is called once per frame
36+
private IEnumerator TimeUpdate()
37+
{
38+
while (true)
39+
{
40+
yield return new WaitForSeconds(this.span);
41+
this.UpdateText();
42+
}
43+
}
44+
45+
private void UpdateText()
46+
{
47+
this.rubyTextMeshPro.uneditedText = this.strArray[this.strIndex];
48+
this.strIndex++;
49+
50+
if (this.strArray.Length <= this.strIndex)
51+
{
52+
this.strIndex = 0;
53+
}
54+
}
5555
}
File renamed without changes.

Assets/RubyTextMeshPro/Samples~/Demo.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/RubyTextMeshPro/Samples~/Demo/Fonts.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)