Skip to content

Commit e7c38f9

Browse files
authored
Merge pull request #11 from jp-netsis/UpdateToUnity6000.0.23f1
Updated : Unity6000.0.23f1
2 parents 70bde26 + c52eee4 commit e7c38f9

File tree

77 files changed

+50203
-1526
lines changed

Some content is hidden

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

77 files changed

+50203
-1526
lines changed

Assets/RubyTextMeshPro/Source/Editor/RubyTMP_CreateObjectMenu.cs

Lines changed: 225 additions & 45 deletions
Large diffs are not rendered by default.

Assets/RubyTextMeshPro/Source/IRubyText.cs

Lines changed: 0 additions & 31 deletions
This file was deleted.

Assets/RubyTextMeshPro/Source/IRubyText.cs.meta

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
2-
"name": "RubyTextMeshPro",
3-
"rootNamespace": "",
4-
"references": [
5-
"Unity.TextMeshPro"
6-
],
7-
"includePlatforms": [],
8-
"excludePlatforms": [],
9-
"allowUnsafeCode": false,
10-
"overrideReferences": false,
11-
"precompiledReferences": [],
12-
"autoReferenced": true,
13-
"defineConstraints": [],
14-
"versionDefines": [],
15-
"noEngineReferences": false
2+
"name": "RubyTextMeshPro",
3+
"rootNamespace": "",
4+
"references": [
5+
"GUID:6055be8ebefd69e48b49212b09b47b2f",
6+
"GUID:01a550a3dc360344093cd9c9dd4fc408"
7+
],
8+
"includePlatforms": [],
9+
"excludePlatforms": [],
10+
"allowUnsafeCode": false,
11+
"overrideReferences": false,
12+
"precompiledReferences": [],
13+
"autoReferenced": true,
14+
"defineConstraints": [],
15+
"versionDefines": [],
16+
"noEngineReferences": false
1617
}

Assets/RubyTextMeshPro/Source/RubyTextMeshPro.cs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
1-
using System;
2-
using System.Text.RegularExpressions;
1+
using jp.netsis.RubyText;
32
using UnityEngine;
43
using UnityEngine.Serialization;
54

65
namespace TMPro
76
{
8-
using static RubyTextMeshProDefinitions;
7+
using static RubyTextConstants;
98

109
public class RubyTextMeshPro : TextMeshPro, IRubyText
1110
{
1211
[Tooltip("v offset ruby. (em, px, %).")]
1312
[SerializeField]
14-
[FormerlySerializedAs("rubyVerticalOffset")]
13+
[FormerlySerializedAs("rubyVerticalOffset")]
1514
private string _rubyVerticalOffset = "1em";
15+
1616
public string rubyVerticalOffset => this._rubyVerticalOffset;
1717

1818
[Tooltip("ruby scale. (1=100%)")]
1919
[SerializeField]
20-
[FormerlySerializedAs("rubyScale")]
20+
[FormerlySerializedAs("rubyScale")]
2121
private float _rubyScale = 0.5f;
22+
2223
public float rubyScale => this._rubyScale;
2324

2425
[Tooltip("The height of the ruby line can be specified. (em, px, %).")]
2526
[SerializeField]
26-
[FormerlySerializedAs("rubyLineHeight")]
27+
[FormerlySerializedAs("rubyLineHeight")]
2728
private string _rubyLineHeight = "";
29+
2830
public string rubyLineHeight => this._rubyLineHeight;
2931

3032
[TextArea(5, 10)]
3133
[SerializeField]
3234
[FormerlySerializedAs("m_uneditedText")]
3335
private string _uneditedText;
36+
3437
public string uneditedText
3538
{
3639
get => this._uneditedText;
@@ -41,15 +44,17 @@ public string uneditedText
4144
}
4245
}
4346

44-
[Tooltip("ruby show type.")]
47+
[Tooltip("ruby show type.")]
4548
[SerializeField]
4649
[FormerlySerializedAs("rubyShowType")]
4750
private RubyShowType _rubyShowType = RubyShowType.RUBY_ALIGNMENT;
51+
4852
public RubyShowType rubyShowType => this._rubyShowType;
4953

50-
[Tooltip("Affects only BASE_NO_OVERRAP_RUBY_ALIGNMENT ruby margin.")]
54+
[Tooltip("Affects only BASE_NO_OVERRAP_RUBY_ALIGNMENT ruby margin.")]
5155
[SerializeField]
5256
private float _rubyMargin = 10;
57+
5358
public float rubyMargin => this._rubyMargin;
5459

5560
#if UNITY_EDITOR

Assets/RubyTextMeshPro/Source/RubyTextMeshProDefinitions.cs

Lines changed: 0 additions & 182 deletions
This file was deleted.

Assets/RubyTextMeshPro/Source/RubyTextMeshProDefinitions.cs.meta

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)