Skip to content

Commit 9b05d2b

Browse files
fernando-cortezfernando-cortez
committed
last commented sections resolved, tooltip in character select works again
1 parent cfe13da commit 9b05d2b

File tree

7 files changed

+120
-47
lines changed

7 files changed

+120
-47
lines changed

‎Assets/Prefabs/UI/CharacterSelectCanvas.prefab‎

Lines changed: 71 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,17 @@ MonoBehaviour:
183183
m_lineSpacingMax: 0
184184
m_paragraphSpacing: 0
185185
m_charWidthMaxAdj: 0
186-
m_enableWordWrapping: 1
186+
m_TextWrappingMode: 1
187187
m_wordWrappingRatios: 0.4
188188
m_overflowMode: 0
189189
m_linkedTextComponent: {fileID: 0}
190190
parentLinkedComponent: {fileID: 0}
191191
m_enableKerning: 1
192+
m_ActiveFontFeatures: 6e72656b
192193
m_enableExtraPadding: 0
193194
checkPaddingRequired: 0
194195
m_isRichText: 1
196+
m_EmojiFallbackSupport: 1
195197
m_parseCtrlCharacters: 1
196198
m_isOrthographic: 1
197199
m_isCullingEnabled: 0
@@ -317,15 +319,17 @@ MonoBehaviour:
317319
m_lineSpacingMax: 0
318320
m_paragraphSpacing: 0
319321
m_charWidthMaxAdj: 0
320-
m_enableWordWrapping: 1
322+
m_TextWrappingMode: 1
321323
m_wordWrappingRatios: 0.4
322324
m_overflowMode: 3
323325
m_linkedTextComponent: {fileID: 0}
324326
parentLinkedComponent: {fileID: 0}
325327
m_enableKerning: 1
328+
m_ActiveFontFeatures: 6e72656b
326329
m_enableExtraPadding: 0
327330
checkPaddingRequired: 0
328331
m_isRichText: 1
332+
m_EmojiFallbackSupport: 1
329333
m_parseCtrlCharacters: 1
330334
m_isOrthographic: 1
331335
m_isCullingEnabled: 0
@@ -453,15 +457,17 @@ MonoBehaviour:
453457
m_lineSpacingMax: 0
454458
m_paragraphSpacing: 0
455459
m_charWidthMaxAdj: 0
456-
m_enableWordWrapping: 1
460+
m_TextWrappingMode: 1
457461
m_wordWrappingRatios: 0.4
458462
m_overflowMode: 0
459463
m_linkedTextComponent: {fileID: 0}
460464
parentLinkedComponent: {fileID: 0}
461465
m_enableKerning: 1
466+
m_ActiveFontFeatures: 6e72656b
462467
m_enableExtraPadding: 0
463468
checkPaddingRequired: 0
464469
m_isRichText: 1
470+
m_EmojiFallbackSupport: 1
465471
m_parseCtrlCharacters: 1
466472
m_isOrthographic: 1
467473
m_isCullingEnabled: 0
@@ -592,15 +598,17 @@ MonoBehaviour:
592598
m_lineSpacingMax: 0
593599
m_paragraphSpacing: 0
594600
m_charWidthMaxAdj: 0
595-
m_enableWordWrapping: 1
601+
m_TextWrappingMode: 1
596602
m_wordWrappingRatios: 0.4
597603
m_overflowMode: 0
598604
m_linkedTextComponent: {fileID: 0}
599605
parentLinkedComponent: {fileID: 0}
600606
m_enableKerning: 1
607+
m_ActiveFontFeatures: 00000000
601608
m_enableExtraPadding: 0
602609
checkPaddingRequired: 0
603610
m_isRichText: 1
611+
m_EmojiFallbackSupport: 1
604612
m_parseCtrlCharacters: 1
605613
m_isOrthographic: 1
606614
m_isCullingEnabled: 0
@@ -908,15 +916,17 @@ MonoBehaviour:
908916
m_lineSpacingMax: 0
909917
m_paragraphSpacing: 0
910918
m_charWidthMaxAdj: 0
911-
m_enableWordWrapping: 1
919+
m_TextWrappingMode: 1
912920
m_wordWrappingRatios: 0.4
913921
m_overflowMode: 0
914922
m_linkedTextComponent: {fileID: 0}
915923
parentLinkedComponent: {fileID: 0}
916924
m_enableKerning: 1
925+
m_ActiveFontFeatures: 6e72656b
917926
m_enableExtraPadding: 0
918927
checkPaddingRequired: 0
919928
m_isRichText: 1
929+
m_EmojiFallbackSupport: 1
920930
m_parseCtrlCharacters: 1
921931
m_isOrthographic: 1
922932
m_isCullingEnabled: 0
@@ -1042,15 +1052,17 @@ MonoBehaviour:
10421052
m_lineSpacingMax: 0
10431053
m_paragraphSpacing: 0
10441054
m_charWidthMaxAdj: 0
1045-
m_enableWordWrapping: 1
1055+
m_TextWrappingMode: 1
10461056
m_wordWrappingRatios: 0.4
10471057
m_overflowMode: 0
10481058
m_linkedTextComponent: {fileID: 0}
10491059
parentLinkedComponent: {fileID: 0}
10501060
m_enableKerning: 1
1061+
m_ActiveFontFeatures: 6e72656b
10511062
m_enableExtraPadding: 0
10521063
checkPaddingRequired: 0
10531064
m_isRichText: 1
1065+
m_EmojiFallbackSupport: 1
10541066
m_parseCtrlCharacters: 1
10551067
m_isOrthographic: 1
10561068
m_isCullingEnabled: 0
@@ -1385,15 +1397,17 @@ MonoBehaviour:
13851397
m_lineSpacingMax: 0
13861398
m_paragraphSpacing: 0
13871399
m_charWidthMaxAdj: 0
1388-
m_enableWordWrapping: 1
1400+
m_TextWrappingMode: 1
13891401
m_wordWrappingRatios: 0.4
13901402
m_overflowMode: 0
13911403
m_linkedTextComponent: {fileID: 0}
13921404
parentLinkedComponent: {fileID: 0}
13931405
m_enableKerning: 1
1406+
m_ActiveFontFeatures: 00000000
13941407
m_enableExtraPadding: 0
13951408
checkPaddingRequired: 0
13961409
m_isRichText: 1
1410+
m_EmojiFallbackSupport: 1
13971411
m_parseCtrlCharacters: 1
13981412
m_isOrthographic: 1
13991413
m_isCullingEnabled: 0
@@ -1595,15 +1609,17 @@ MonoBehaviour:
15951609
m_lineSpacingMax: 0
15961610
m_paragraphSpacing: 0
15971611
m_charWidthMaxAdj: 0
1598-
m_enableWordWrapping: 1
1612+
m_TextWrappingMode: 1
15991613
m_wordWrappingRatios: 0.4
16001614
m_overflowMode: 3
16011615
m_linkedTextComponent: {fileID: 0}
16021616
parentLinkedComponent: {fileID: 0}
16031617
m_enableKerning: 1
1618+
m_ActiveFontFeatures: 6e72656b
16041619
m_enableExtraPadding: 0
16051620
checkPaddingRequired: 0
16061621
m_isRichText: 1
1622+
m_EmojiFallbackSupport: 1
16071623
m_parseCtrlCharacters: 1
16081624
m_isOrthographic: 1
16091625
m_isCullingEnabled: 0
@@ -1729,15 +1745,17 @@ MonoBehaviour:
17291745
m_lineSpacingMax: 0
17301746
m_paragraphSpacing: 0
17311747
m_charWidthMaxAdj: 0
1732-
m_enableWordWrapping: 1
1748+
m_TextWrappingMode: 1
17331749
m_wordWrappingRatios: 0.4
17341750
m_overflowMode: 3
17351751
m_linkedTextComponent: {fileID: 0}
17361752
parentLinkedComponent: {fileID: 0}
17371753
m_enableKerning: 1
1754+
m_ActiveFontFeatures: 6e72656b
17381755
m_enableExtraPadding: 0
17391756
checkPaddingRequired: 0
17401757
m_isRichText: 1
1758+
m_EmojiFallbackSupport: 1
17411759
m_parseCtrlCharacters: 1
17421760
m_isOrthographic: 1
17431761
m_isCullingEnabled: 0
@@ -1886,6 +1904,7 @@ MonoBehaviour:
18861904
m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
18871905
m_Name:
18881906
m_EditorClassIdentifier:
1907+
m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
18891908
m_TooltipPopup: {fileID: 5940892342300009070}
18901909
m_TooltipText: Ability 3
18911910
m_ActivateOnClick: 1
@@ -2192,15 +2211,17 @@ MonoBehaviour:
21922211
m_lineSpacingMax: 0
21932212
m_paragraphSpacing: 0
21942213
m_charWidthMaxAdj: 0
2195-
m_enableWordWrapping: 1
2214+
m_TextWrappingMode: 1
21962215
m_wordWrappingRatios: 0.4
21972216
m_overflowMode: 0
21982217
m_linkedTextComponent: {fileID: 0}
21992218
parentLinkedComponent: {fileID: 0}
22002219
m_enableKerning: 1
2220+
m_ActiveFontFeatures: 6e72656b
22012221
m_enableExtraPadding: 0
22022222
checkPaddingRequired: 0
22032223
m_isRichText: 1
2224+
m_EmojiFallbackSupport: 1
22042225
m_parseCtrlCharacters: 1
22052226
m_isOrthographic: 1
22062227
m_isCullingEnabled: 0
@@ -2628,6 +2649,7 @@ MonoBehaviour:
26282649
m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
26292650
m_Name:
26302651
m_EditorClassIdentifier:
2652+
m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
26312653
m_TooltipPopup: {fileID: 5940892342300009070}
26322654
m_TooltipText: Ability 1
26332655
m_ActivateOnClick: 1
@@ -2720,6 +2742,7 @@ MonoBehaviour:
27202742
m_Script: {fileID: 11500000, guid: 79e7ca3e19eb99c4f97ff06a95ef7dac, type: 3}
27212743
m_Name:
27222744
m_EditorClassIdentifier:
2745+
m_PointAction: {fileID: -1959881153152325168, guid: add476edce0d24d26bcdaf1681449ecf, type: 3}
27232746
m_TooltipPopup: {fileID: 5940892342300009070}
27242747
m_TooltipText: Ability 2
27252748
m_ActivateOnClick: 1
@@ -2927,15 +2950,17 @@ MonoBehaviour:
29272950
m_lineSpacingMax: 0
29282951
m_paragraphSpacing: 0
29292952
m_charWidthMaxAdj: 0
2930-
m_enableWordWrapping: 1
2953+
m_TextWrappingMode: 1
29312954
m_wordWrappingRatios: 0.4
29322955
m_overflowMode: 0
29332956
m_linkedTextComponent: {fileID: 0}
29342957
parentLinkedComponent: {fileID: 0}
29352958
m_enableKerning: 1
2959+
m_ActiveFontFeatures: 00000000
29362960
m_enableExtraPadding: 0
29372961
checkPaddingRequired: 0
29382962
m_isRichText: 1
2963+
m_EmojiFallbackSupport: 1
29392964
m_parseCtrlCharacters: 1
29402965
m_isOrthographic: 1
29412966
m_isCullingEnabled: 0
@@ -3061,15 +3086,17 @@ MonoBehaviour:
30613086
m_lineSpacingMax: 0
30623087
m_paragraphSpacing: 0
30633088
m_charWidthMaxAdj: 0
3064-
m_enableWordWrapping: 1
3089+
m_TextWrappingMode: 1
30653090
m_wordWrappingRatios: 0.4
30663091
m_overflowMode: 0
30673092
m_linkedTextComponent: {fileID: 0}
30683093
parentLinkedComponent: {fileID: 0}
30693094
m_enableKerning: 1
3095+
m_ActiveFontFeatures: 6e72656b
30703096
m_enableExtraPadding: 0
30713097
checkPaddingRequired: 0
30723098
m_isRichText: 1
3099+
m_EmojiFallbackSupport: 1
30733100
m_parseCtrlCharacters: 1
30743101
m_isOrthographic: 1
30753102
m_isCullingEnabled: 0
@@ -3600,6 +3627,10 @@ PrefabInstance:
36003627
serializedVersion: 3
36013628
m_TransformParent: {fileID: 5940892341490189322}
36023629
m_Modifications:
3630+
- target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
3631+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
3632+
value: 1801810542
3633+
objectReference: {fileID: 0}
36033634
- target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
36043635
propertyPath: m_SizeDelta.x
36053636
value: -128.157
@@ -3898,6 +3929,10 @@ PrefabInstance:
38983929
serializedVersion: 3
38993930
m_TransformParent: {fileID: 5940892341490189322}
39003931
m_Modifications:
3932+
- target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
3933+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
3934+
value: 1801810542
3935+
objectReference: {fileID: 0}
39013936
- target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
39023937
propertyPath: m_SizeDelta.x
39033938
value: -56.959
@@ -4076,6 +4111,10 @@ PrefabInstance:
40764111
serializedVersion: 3
40774112
m_TransformParent: {fileID: 5940892341490189322}
40784113
m_Modifications:
4114+
- target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
4115+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
4116+
value: 1801810542
4117+
objectReference: {fileID: 0}
40794118
- target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
40804119
propertyPath: m_SizeDelta.x
40814120
value: -56.959
@@ -4382,6 +4421,10 @@ PrefabInstance:
43824421
serializedVersion: 3
43834422
m_TransformParent: {fileID: 5940892341490189322}
43844423
m_Modifications:
4424+
- target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
4425+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
4426+
value: 1801810542
4427+
objectReference: {fileID: 0}
43854428
- target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
43864429
propertyPath: m_SizeDelta.x
43874430
value: -64.078
@@ -4560,6 +4603,10 @@ PrefabInstance:
45604603
serializedVersion: 3
45614604
m_TransformParent: {fileID: 5940892341490189322}
45624605
m_Modifications:
4606+
- target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
4607+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
4608+
value: 1801810542
4609+
objectReference: {fileID: 0}
45634610
- target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
45644611
propertyPath: m_SizeDelta.x
45654612
value: -64.079
@@ -4870,6 +4917,10 @@ PrefabInstance:
48704917
serializedVersion: 3
48714918
m_TransformParent: {fileID: 5940892341490189322}
48724919
m_Modifications:
4920+
- target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
4921+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
4922+
value: 1801810542
4923+
objectReference: {fileID: 0}
48734924
- target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
48744925
propertyPath: m_SizeDelta.x
48754926
value: -64.078
@@ -5110,6 +5161,10 @@ PrefabInstance:
51105161
serializedVersion: 3
51115162
m_TransformParent: {fileID: 5940892341490189322}
51125163
m_Modifications:
5164+
- target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
5165+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
5166+
value: 1801810542
5167+
objectReference: {fileID: 0}
51135168
- target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
51145169
propertyPath: m_SizeDelta.x
51155170
value: -62.37
@@ -5296,6 +5351,10 @@ PrefabInstance:
52965351
propertyPath: m_Enabled
52975352
value: 1
52985353
objectReference: {fileID: 0}
5354+
- target: {fileID: 463572819075978806, guid: ff848390065bf914fb60582f4d872815, type: 3}
5355+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
5356+
value: 1801810542
5357+
objectReference: {fileID: 0}
52995358
- target: {fileID: 857184778587777497, guid: ff848390065bf914fb60582f4d872815, type: 3}
53005359
propertyPath: m_SizeDelta.x
53015360
value: -83.065

0 commit comments

Comments
 (0)