Skip to content

Commit edf7ffd

Browse files
committed
add resizable Text
1 parent 8ee101f commit edf7ffd

File tree

2 files changed

+135
-79
lines changed

2 files changed

+135
-79
lines changed

Assets/Prefabs/Relativem.prefab

Lines changed: 133 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -76,162 +76,217 @@ MonoBehaviour:
7676
m_FillOrigin: 0
7777
m_UseSpriteMesh: 0
7878
m_PixelsPerUnitMultiplier: 1
79-
--- !u!1 &5249002012752955196
79+
--- !u!1 &5171608215668599582
8080
GameObject:
8181
m_ObjectHideFlags: 0
8282
m_CorrespondingSourceObject: {fileID: 0}
8383
m_PrefabInstance: {fileID: 0}
8484
m_PrefabAsset: {fileID: 0}
8585
serializedVersion: 6
8686
m_Component:
87-
- component: {fileID: 5249002012752955197}
88-
- component: {fileID: 5249002012752955199}
89-
- component: {fileID: 3435922174595831663}
90-
- component: {fileID: 5771536683387863736}
87+
- component: {fileID: 2122974555912097506}
88+
- component: {fileID: 4471060387998108351}
89+
- component: {fileID: 6646117258741655380}
9190
m_Layer: 5
92-
m_Name: Relativem
91+
m_Name: Text (TMP)
9392
m_TagString: Untagged
9493
m_Icon: {fileID: 0}
9594
m_NavMeshLayer: 0
9695
m_StaticEditorFlags: 0
9796
m_IsActive: 1
98-
--- !u!224 &5249002012752955197
97+
--- !u!224 &2122974555912097506
9998
RectTransform:
10099
m_ObjectHideFlags: 0
101100
m_CorrespondingSourceObject: {fileID: 0}
102101
m_PrefabInstance: {fileID: 0}
103102
m_PrefabAsset: {fileID: 0}
104-
m_GameObject: {fileID: 5249002012752955196}
105-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
103+
m_GameObject: {fileID: 5171608215668599582}
104+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
106105
m_LocalPosition: {x: 0, y: 0, z: 0}
107106
m_LocalScale: {x: 1, y: 1, z: 1}
108-
m_Children:
109-
- {fileID: 4862293520764512196}
110-
- {fileID: 5249002012995545299}
111-
m_Father: {fileID: 0}
112-
m_RootOrder: 0
107+
m_Children: []
108+
m_Father: {fileID: 5249002012752955197}
109+
m_RootOrder: 1
113110
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
114111
m_AnchorMin: {x: 0.5, y: 0.5}
115112
m_AnchorMax: {x: 0.5, y: 0.5}
116-
m_AnchoredPosition: {x: 0.000076293996, y: -51.19998}
117-
m_SizeDelta: {x: 414.7, y: 414.7}
113+
m_AnchoredPosition: {x: -0.0012054, y: -156.92}
114+
m_SizeDelta: {x: 306.15, y: 100.87}
118115
m_Pivot: {x: 0.5, y: 0.5}
119-
--- !u!222 &5249002012752955199
116+
--- !u!222 &4471060387998108351
120117
CanvasRenderer:
121118
m_ObjectHideFlags: 0
122119
m_CorrespondingSourceObject: {fileID: 0}
123120
m_PrefabInstance: {fileID: 0}
124121
m_PrefabAsset: {fileID: 0}
125-
m_GameObject: {fileID: 5249002012752955196}
122+
m_GameObject: {fileID: 5171608215668599582}
126123
m_CullTransparentMesh: 1
127-
--- !u!114 &3435922174595831663
124+
--- !u!114 &6646117258741655380
128125
MonoBehaviour:
129126
m_ObjectHideFlags: 0
130127
m_CorrespondingSourceObject: {fileID: 0}
131128
m_PrefabInstance: {fileID: 0}
132129
m_PrefabAsset: {fileID: 0}
133-
m_GameObject: {fileID: 5249002012752955196}
130+
m_GameObject: {fileID: 5171608215668599582}
134131
m_Enabled: 1
135132
m_EditorHideFlags: 0
136-
m_Script: {fileID: 11500000, guid: 7489b64ff18148c429b7ee13af13abd2, type: 3}
133+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
137134
m_Name:
138135
m_EditorClassIdentifier:
139-
sex: 0
140-
text: {fileID: 5249002012995545300}
141-
_image: {fileID: 7242762467563309380}
142-
children: []
143-
--- !u!65 &5771536683387863736
144-
BoxCollider:
145-
m_ObjectHideFlags: 0
146-
m_CorrespondingSourceObject: {fileID: 0}
147-
m_PrefabInstance: {fileID: 0}
148-
m_PrefabAsset: {fileID: 0}
149-
m_GameObject: {fileID: 5249002012752955196}
150136
m_Material: {fileID: 0}
151-
m_IsTrigger: 0
152-
m_Enabled: 1
153-
serializedVersion: 2
154-
m_Size: {x: 256.1782, y: 256.78223, z: 1}
155-
m_Center: {x: -0.7701789, y: 48.61828, z: 0}
156-
--- !u!1 &5249002012995545298
137+
m_Color: {r: 1, g: 1, b: 1, a: 1}
138+
m_RaycastTarget: 1
139+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
140+
m_Maskable: 1
141+
m_OnCullStateChanged:
142+
m_PersistentCalls:
143+
m_Calls: []
144+
m_text: Relatiive
145+
m_isRightToLeft: 0
146+
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
147+
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
148+
m_fontSharedMaterials: []
149+
m_fontMaterial: {fileID: 0}
150+
m_fontMaterials: []
151+
m_fontColor32:
152+
serializedVersion: 2
153+
rgba: 4278190080
154+
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
155+
m_enableVertexGradient: 0
156+
m_colorMode: 3
157+
m_fontColorGradient:
158+
topLeft: {r: 1, g: 1, b: 1, a: 1}
159+
topRight: {r: 1, g: 1, b: 1, a: 1}
160+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
161+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
162+
m_fontColorGradientPreset: {fileID: 0}
163+
m_spriteAsset: {fileID: 0}
164+
m_tintAllSprites: 0
165+
m_StyleSheet: {fileID: 0}
166+
m_TextStyleHashCode: -1183493901
167+
m_overrideHtmlColors: 0
168+
m_faceColor:
169+
serializedVersion: 2
170+
rgba: 4294967295
171+
m_fontSize: 72
172+
m_fontSizeBase: 36
173+
m_fontWeight: 400
174+
m_enableAutoSizing: 1
175+
m_fontSizeMin: 18
176+
m_fontSizeMax: 72
177+
m_fontStyle: 0
178+
m_HorizontalAlignment: 2
179+
m_VerticalAlignment: 512
180+
m_textAlignment: 65535
181+
m_characterSpacing: 0
182+
m_wordSpacing: 0
183+
m_lineSpacing: 0
184+
m_lineSpacingMax: 0
185+
m_paragraphSpacing: 0
186+
m_charWidthMaxAdj: 0
187+
m_enableWordWrapping: 1
188+
m_wordWrappingRatios: 0.4
189+
m_overflowMode: 0
190+
m_linkedTextComponent: {fileID: 0}
191+
parentLinkedComponent: {fileID: 0}
192+
m_enableKerning: 1
193+
m_enableExtraPadding: 0
194+
checkPaddingRequired: 0
195+
m_isRichText: 1
196+
m_parseCtrlCharacters: 1
197+
m_isOrthographic: 1
198+
m_isCullingEnabled: 0
199+
m_horizontalMapping: 0
200+
m_verticalMapping: 0
201+
m_uvLineOffset: 0
202+
m_geometrySortingOrder: 0
203+
m_IsTextObjectScaleStatic: 0
204+
m_VertexBufferAutoSizeReduction: 0
205+
m_useMaxVisibleDescender: 1
206+
m_pageToDisplay: 1
207+
m_margin: {x: -0.88908386, y: 0, z: 0, w: 0}
208+
m_isUsingLegacyAnimationComponent: 0
209+
m_isVolumetricText: 0
210+
m_hasFontAssetChanged: 0
211+
m_baseMaterial: {fileID: 0}
212+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
213+
--- !u!1 &5249002012752955196
157214
GameObject:
158215
m_ObjectHideFlags: 0
159216
m_CorrespondingSourceObject: {fileID: 0}
160217
m_PrefabInstance: {fileID: 0}
161218
m_PrefabAsset: {fileID: 0}
162219
serializedVersion: 6
163220
m_Component:
164-
- component: {fileID: 5249002012995545299}
165-
- component: {fileID: 5249002012995545301}
166-
- component: {fileID: 5249002012995545300}
221+
- component: {fileID: 5249002012752955197}
222+
- component: {fileID: 5249002012752955199}
223+
- component: {fileID: 3435922174595831663}
224+
- component: {fileID: 5771536683387863736}
167225
m_Layer: 5
168-
m_Name: Text
226+
m_Name: Relativem
169227
m_TagString: Untagged
170228
m_Icon: {fileID: 0}
171229
m_NavMeshLayer: 0
172230
m_StaticEditorFlags: 0
173231
m_IsActive: 1
174-
--- !u!224 &5249002012995545299
232+
--- !u!224 &5249002012752955197
175233
RectTransform:
176234
m_ObjectHideFlags: 0
177235
m_CorrespondingSourceObject: {fileID: 0}
178236
m_PrefabInstance: {fileID: 0}
179237
m_PrefabAsset: {fileID: 0}
180-
m_GameObject: {fileID: 5249002012995545298}
181-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
238+
m_GameObject: {fileID: 5249002012752955196}
239+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
182240
m_LocalPosition: {x: 0, y: 0, z: 0}
183241
m_LocalScale: {x: 1, y: 1, z: 1}
184-
m_Children: []
185-
m_Father: {fileID: 5249002012752955197}
186-
m_RootOrder: 1
242+
m_Children:
243+
- {fileID: 4862293520764512196}
244+
- {fileID: 2122974555912097506}
245+
m_Father: {fileID: 0}
246+
m_RootOrder: 0
187247
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
188-
m_AnchorMin: {x: 0.5, y: 0}
189-
m_AnchorMax: {x: 0.5, y: 0}
190-
m_AnchoredPosition: {x: 0.000034809, y: 50.435}
191-
m_SizeDelta: {x: 306.15, y: 100.87}
248+
m_AnchorMin: {x: 0.5, y: 0.5}
249+
m_AnchorMax: {x: 0.5, y: 0.5}
250+
m_AnchoredPosition: {x: 0.000076293996, y: -51.19998}
251+
m_SizeDelta: {x: 414.7, y: 414.7}
192252
m_Pivot: {x: 0.5, y: 0.5}
193-
--- !u!222 &5249002012995545301
253+
--- !u!222 &5249002012752955199
194254
CanvasRenderer:
195255
m_ObjectHideFlags: 0
196256
m_CorrespondingSourceObject: {fileID: 0}
197257
m_PrefabInstance: {fileID: 0}
198258
m_PrefabAsset: {fileID: 0}
199-
m_GameObject: {fileID: 5249002012995545298}
259+
m_GameObject: {fileID: 5249002012752955196}
200260
m_CullTransparentMesh: 1
201-
--- !u!114 &5249002012995545300
261+
--- !u!114 &3435922174595831663
202262
MonoBehaviour:
203263
m_ObjectHideFlags: 0
204264
m_CorrespondingSourceObject: {fileID: 0}
205265
m_PrefabInstance: {fileID: 0}
206266
m_PrefabAsset: {fileID: 0}
207-
m_GameObject: {fileID: 5249002012995545298}
267+
m_GameObject: {fileID: 5249002012752955196}
208268
m_Enabled: 1
209269
m_EditorHideFlags: 0
210-
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
270+
m_Script: {fileID: 11500000, guid: 7489b64ff18148c429b7ee13af13abd2, type: 3}
211271
m_Name:
212272
m_EditorClassIdentifier:
273+
sex: 0
274+
text: {fileID: 6646117258741655380}
275+
_image: {fileID: 7242762467563309380}
276+
children: []
277+
--- !u!65 &5771536683387863736
278+
BoxCollider:
279+
m_ObjectHideFlags: 0
280+
m_CorrespondingSourceObject: {fileID: 0}
281+
m_PrefabInstance: {fileID: 0}
282+
m_PrefabAsset: {fileID: 0}
283+
m_GameObject: {fileID: 5249002012752955196}
213284
m_Material: {fileID: 0}
214-
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
215-
m_RaycastTarget: 1
216-
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
217-
m_Maskable: 1
218-
m_OnCullStateChanged:
219-
m_PersistentCalls:
220-
m_Calls: []
221-
m_FontData:
222-
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
223-
m_FontSize: 36
224-
m_FontStyle: 0
225-
m_BestFit: 0
226-
m_MinSize: 0
227-
m_MaxSize: 96
228-
m_Alignment: 4
229-
m_AlignByGeometry: 0
230-
m_RichText: 1
231-
m_HorizontalOverflow: 0
232-
m_VerticalOverflow: 0
233-
m_LineSpacing: 1
234-
m_Text: First Cousin Twice Reduced
285+
m_IsTrigger: 0
286+
m_Enabled: 1
287+
serializedVersion: 2
288+
m_Size: {x: 256.1782, y: 256.78223, z: 1}
289+
m_Center: {x: -0.7701789, y: 48.61828, z: 0}
235290
--- !u!1 &5249002014074953535
236291
GameObject:
237292
m_ObjectHideFlags: 0

Assets/Scripts/ImageController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
using System.Collections.Generic;
22
using System.Linq;
3+
using TMPro;
34
using UnityEngine;
45
using UnityEngine.UI;
56

67
public class ImageController : MonoBehaviour
78
{
89
private LineRenderer _lineRenderer;
910
public Sex sex;
10-
public Text text;
11+
public TextMeshProUGUI text;
1112
public Image _image;
1213
private bool markedDown;
1314
private CanvasScaler _canvasScaler;

0 commit comments

Comments
 (0)