Skip to content

Commit 1442929

Browse files
committed
Improve Text
1 parent 5797801 commit 1442929

File tree

2 files changed

+33
-109
lines changed

2 files changed

+33
-109
lines changed

Assets/Demo/Demo.unity

Lines changed: 27 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ RectTransform:
454454
m_LocalScale: {x: 1, y: 1, z: 1}
455455
m_Children: []
456456
m_Father: {fileID: 1055279002}
457-
m_RootOrder: 2
457+
m_RootOrder: 0
458458
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
459459
m_AnchorMin: {x: 0, y: 0}
460460
m_AnchorMax: {x: 1, y: 1}
@@ -726,15 +726,15 @@ PlayableDirector:
726726
- key: {fileID: 0}
727727
value: {fileID: 0}
728728
- key: {fileID: 0}
729-
value: {fileID: 1597564081}
729+
value: {fileID: 0}
730730
- key: {fileID: 0}
731731
value: {fileID: 267027280}
732732
- key: {fileID: 114332260137397888, guid: 35d950978ffcf40c0b9506f599f52acc, type: 2}
733733
value: {fileID: 0}
734734
- key: {fileID: 114356330867510608, guid: 35d950978ffcf40c0b9506f599f52acc, type: 2}
735735
value: {fileID: 577572918}
736736
- key: {fileID: 0}
737-
value: {fileID: 1597564081}
737+
value: {fileID: 0}
738738
- key: {fileID: 114125229209556558, guid: 35d950978ffcf40c0b9506f599f52acc, type: 2}
739739
value: {fileID: 0}
740740
- key: {fileID: 114157632183617374, guid: 35d950978ffcf40c0b9506f599f52acc, type: 2}
@@ -924,9 +924,8 @@ RectTransform:
924924
m_LocalPosition: {x: 0, y: 0, z: 0}
925925
m_LocalScale: {x: 0, y: 0, z: 0}
926926
m_Children:
927-
- {fileID: 1101430504}
928-
- {fileID: 1597564080}
929927
- {fileID: 577572917}
928+
- {fileID: 1101430504}
930929
- {fileID: 1906617782}
931930
m_Father: {fileID: 0}
932931
m_RootOrder: 3
@@ -965,7 +964,7 @@ RectTransform:
965964
m_LocalScale: {x: 0.7670182, y: 0.7670182, z: 0.7670182}
966965
m_Children: []
967966
m_Father: {fileID: 1055279002}
968-
m_RootOrder: 0
967+
m_RootOrder: 1
969968
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
970969
m_AnchorMin: {x: 0.5, y: 0.5}
971970
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1002,9 +1001,11 @@ MonoBehaviour:
10021001
m_Calls: []
10031002
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
10041003
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1005-
m_text: 'Unity demoscene
1004+
m_text: 'Unity Demoscene Prototype
10061005
1007-
by <#ffffff>gam0022</color>'
1006+
<size=50><#9999ff>the GLOW</color></size>
1007+
1008+
<size=30>by GAM0022</size>'
10081009
m_isRightToLeft: 0
10091010
m_fontAsset: {fileID: 11400000, guid: 163292f6f226d954593d45b079f8aae0, type: 2}
10101011
m_sharedMaterial: {fileID: 2140032, guid: 163292f6f226d954593d45b079f8aae0, type: 2}
@@ -1013,8 +1014,8 @@ MonoBehaviour:
10131014
m_fontMaterials: []
10141015
m_fontColor32:
10151016
serializedVersion: 2
1016-
rgba: 4292596224
1017-
m_fontColor: {r: 0, g: 0.8246956, b: 0.8602941, a: 1}
1017+
rgba: 4294967295
1018+
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
10181019
m_enableVertexGradient: 0
10191020
m_fontColorGradient:
10201021
topLeft: {r: 1, g: 1, b: 1, a: 1}
@@ -1037,7 +1038,7 @@ MonoBehaviour:
10371038
m_enableAutoSizing: 0
10381039
m_fontSizeMin: 18
10391040
m_fontSizeMax: 72
1040-
m_fontStyle: 0
1041+
m_fontStyle: 34
10411042
m_textAlignment: 514
10421043
m_isAlignmentEnumConverted: 1
10431044
m_characterSpacing: 0
@@ -1071,12 +1072,12 @@ MonoBehaviour:
10711072
m_margin: {x: 0, y: 0, z: 0, w: 0}
10721073
m_textInfo:
10731074
textComponent: {fileID: 0}
1074-
characterCount: 26
1075+
characterCount: 45
10751076
spriteCount: 0
1076-
spaceCount: 3
1077-
wordCount: 4
1077+
spaceCount: 6
1078+
wordCount: 7
10781079
linkCount: 0
1079-
lineCount: 2
1080+
lineCount: 3
10801081
pageCount: 1
10811082
materialCount: 1
10821083
m_havePropertiesChanged: 1
@@ -1169,80 +1170,6 @@ Transform:
11691170
Transform:
11701171
m_PrefabParentObject: {fileID: 400042, guid: 320b1c2af77554f99a1658df4a6d3d5c, type: 3}
11711172
m_PrefabInternal: {fileID: 170335795}
1172-
--- !u!1 &1597564079
1173-
GameObject:
1174-
m_ObjectHideFlags: 0
1175-
m_PrefabParentObject: {fileID: 0}
1176-
m_PrefabInternal: {fileID: 0}
1177-
serializedVersion: 5
1178-
m_Component:
1179-
- component: {fileID: 1597564080}
1180-
- component: {fileID: 1597564082}
1181-
- component: {fileID: 1597564081}
1182-
m_Layer: 5
1183-
m_Name: Text
1184-
m_TagString: Untagged
1185-
m_Icon: {fileID: 0}
1186-
m_NavMeshLayer: 0
1187-
m_StaticEditorFlags: 0
1188-
m_IsActive: 1
1189-
--- !u!224 &1597564080
1190-
RectTransform:
1191-
m_ObjectHideFlags: 0
1192-
m_PrefabParentObject: {fileID: 0}
1193-
m_PrefabInternal: {fileID: 0}
1194-
m_GameObject: {fileID: 1597564079}
1195-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1196-
m_LocalPosition: {x: 0, y: 0, z: 0}
1197-
m_LocalScale: {x: 1, y: 1, z: 1}
1198-
m_Children: []
1199-
m_Father: {fileID: 1055279002}
1200-
m_RootOrder: 1
1201-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1202-
m_AnchorMin: {x: 0.5, y: 0.5}
1203-
m_AnchorMax: {x: 0.5, y: 0.5}
1204-
m_AnchoredPosition: {x: 0, y: 0}
1205-
m_SizeDelta: {x: 800, y: 600}
1206-
m_Pivot: {x: 0.5, y: 0.5}
1207-
--- !u!114 &1597564081
1208-
MonoBehaviour:
1209-
m_ObjectHideFlags: 0
1210-
m_PrefabParentObject: {fileID: 0}
1211-
m_PrefabInternal: {fileID: 0}
1212-
m_GameObject: {fileID: 1597564079}
1213-
m_Enabled: 1
1214-
m_EditorHideFlags: 0
1215-
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
1216-
m_Name:
1217-
m_EditorClassIdentifier:
1218-
m_Material: {fileID: 0}
1219-
m_Color: {r: 1, g: 1, b: 1, a: 1}
1220-
m_RaycastTarget: 1
1221-
m_OnCullStateChanged:
1222-
m_PersistentCalls:
1223-
m_Calls: []
1224-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
1225-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1226-
m_FontData:
1227-
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
1228-
m_FontSize: 100
1229-
m_FontStyle: 1
1230-
m_BestFit: 0
1231-
m_MinSize: 0
1232-
m_MaxSize: 187
1233-
m_Alignment: 4
1234-
m_AlignByGeometry: 1
1235-
m_RichText: 1
1236-
m_HorizontalOverflow: 0
1237-
m_VerticalOverflow: 0
1238-
m_LineSpacing: 1
1239-
m_Text:
1240-
--- !u!222 &1597564082
1241-
CanvasRenderer:
1242-
m_ObjectHideFlags: 0
1243-
m_PrefabParentObject: {fileID: 0}
1244-
m_PrefabInternal: {fileID: 0}
1245-
m_GameObject: {fileID: 1597564079}
12461173
--- !u!1 &1694283209
12471174
GameObject:
12481175
m_ObjectHideFlags: 0
@@ -1342,7 +1269,7 @@ RectTransform:
13421269
m_LocalScale: {x: 0.7670182, y: 0.7670182, z: 0.7670182}
13431270
m_Children: []
13441271
m_Father: {fileID: 1055279002}
1345-
m_RootOrder: 3
1272+
m_RootOrder: 2
13461273
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13471274
m_AnchorMin: {x: 0.5, y: 0.5}
13481275
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1379,16 +1306,13 @@ MonoBehaviour:
13791306
m_Calls: []
13801307
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
13811308
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1382-
m_text: 'Made with <#ffffff>Unity</color>
1383-
1309+
m_text: 'Made with <size=50><#9999ff>Unity</color></size>
13841310
13851311
+ uRaymarching
13861312
1387-
+ Post-processing Stack
1388-
1389-
+ Text Mesh Pro
1313+
+ TimeLine
13901314
1391-
+ Default Playables'
1315+
+ etc'
13921316
m_isRightToLeft: 0
13931317
m_fontAsset: {fileID: 11400000, guid: 163292f6f226d954593d45b079f8aae0, type: 2}
13941318
m_sharedMaterial: {fileID: 2140032, guid: 163292f6f226d954593d45b079f8aae0, type: 2}
@@ -1397,8 +1321,8 @@ MonoBehaviour:
13971321
m_fontMaterials: []
13981322
m_fontColor32:
13991323
serializedVersion: 2
1400-
rgba: 4292596224
1401-
m_fontColor: {r: 0, g: 0.8246956, b: 0.8602941, a: 1}
1324+
rgba: 4294967295
1325+
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
14021326
m_enableVertexGradient: 0
14031327
m_fontColorGradient:
14041328
topLeft: {r: 1, g: 1, b: 1, a: 1}
@@ -1421,7 +1345,7 @@ MonoBehaviour:
14211345
m_enableAutoSizing: 0
14221346
m_fontSizeMin: 18
14231347
m_fontSizeMax: 72
1424-
m_fontStyle: 0
1348+
m_fontStyle: 34
14251349
m_textAlignment: 514
14261350
m_isAlignmentEnumConverted: 1
14271351
m_characterSpacing: 0
@@ -1455,12 +1379,12 @@ MonoBehaviour:
14551379
m_margin: {x: 0, y: 0, z: 0, w: 0}
14561380
m_textInfo:
14571381
textComponent: {fileID: 0}
1458-
characterCount: 91
1382+
characterCount: 42
14591383
spriteCount: 0
1460-
spaceCount: 15
1461-
wordCount: 11
1384+
spaceCount: 7
1385+
wordCount: 5
14621386
linkCount: 0
1463-
lineCount: 6
1387+
lineCount: 4
14641388
pageCount: 1
14651389
materialCount: 1
14661390
m_havePropertiesChanged: 1

Assets/Demo/DemoTimeline.playable

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ MonoBehaviour:
440440
m_ClipIn: 0
441441
m_Asset: {fileID: 114417091622260958}
442442
m_UnderlyingAsset: {fileID: 114782058166837458}
443-
m_Duration: 1.9333333333333333
443+
m_Duration: 1.5166666666666666
444444
m_TimeScale: 1
445445
m_ParentTrack: {fileID: 114330093078192334}
446446
m_EaseInDuration: 0
@@ -1134,11 +1134,11 @@ MonoBehaviour:
11341134
m_Parent: {fileID: 11400000}
11351135
m_Children: []
11361136
m_Clips:
1137-
- m_Start: 1.7166666666666666
1137+
- m_Start: 2.283333333333333
11381138
m_ClipIn: 0
11391139
m_Asset: {fileID: 114209265440038942}
11401140
m_UnderlyingAsset: {fileID: 114209265440038942}
1141-
m_Duration: 6.066666666665666
1141+
m_Duration: 5.499999999998999
11421142
m_TimeScale: 1
11431143
m_ParentTrack: {fileID: 114732225061613110}
11441144
m_EaseInDuration: 0
@@ -1211,11 +1211,11 @@ MonoBehaviour:
12111211
m_Parent: {fileID: 11400000}
12121212
m_Children: []
12131213
m_Clips:
1214-
- m_Start: 1.7166666666666666
1214+
- m_Start: 2.283333333333333
12151215
m_ClipIn: 0
12161216
m_Asset: {fileID: 114522509778552404}
12171217
m_UnderlyingAsset: {fileID: 114209265440038942}
1218-
m_Duration: 6.066666666665666
1218+
m_Duration: 5.499999999999
12191219
m_TimeScale: 1
12201220
m_ParentTrack: {fileID: 114773509343165864}
12211221
m_EaseInDuration: 0
@@ -1303,7 +1303,7 @@ MonoBehaviour:
13031303
m_ClipIn: 0
13041304
m_Asset: {fileID: 114782058166837458}
13051305
m_UnderlyingAsset: {fileID: 114782058166837458}
1306-
m_Duration: 0.9
1306+
m_Duration: 1.3666666666656662
13071307
m_TimeScale: 1
13081308
m_ParentTrack: {fileID: 114867680559463800}
13091309
m_EaseInDuration: 0

0 commit comments

Comments
 (0)