Skip to content

Commit 4337f9e

Browse files
author
Super-Lovers
committed
Bugfixes to settings, dialogue and char customization
1 parent 0bfa2ec commit 4337f9e

File tree

15 files changed

+471
-100
lines changed

15 files changed

+471
-100
lines changed

‎Case 4/Assets/Prefabs/Interface Menus/Dialogue Display.prefab‎

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ MonoBehaviour:
366366
m_fontSizeMax: 72
367367
m_fontStyle: 1
368368
m_textAlignment: 513
369-
m_isAlignmentEnumConverted: 1
370369
m_characterSpacing: 0
371370
m_wordSpacing: 0
372371
m_lineSpacing: 0
@@ -393,6 +392,7 @@ MonoBehaviour:
393392
m_verticalMapping: 0
394393
m_uvLineOffset: 0
395394
m_geometrySortingOrder: 0
395+
m_VertexBufferAutoSizeReduction: 1
396396
m_firstVisibleCharacter: 0
397397
m_useMaxVisibleDescender: 1
398398
m_pageToDisplay: 1
@@ -407,12 +407,9 @@ MonoBehaviour:
407407
lineCount: 3
408408
pageCount: 1
409409
materialCount: 1
410-
m_havePropertiesChanged: 0
411410
m_isUsingLegacyAnimationComponent: 0
412411
m_isVolumetricText: 0
413412
m_spriteAnimator: {fileID: 0}
414-
m_isInputParsingRequired: 0
415-
m_inputSource: 0
416413
m_hasFontAssetChanged: 0
417414
m_subTextObjects:
418415
- {fileID: 0}
@@ -528,7 +525,6 @@ MonoBehaviour:
528525
m_fontSizeMax: 72
529526
m_fontStyle: 1
530527
m_textAlignment: 514
531-
m_isAlignmentEnumConverted: 1
532528
m_characterSpacing: 0
533529
m_wordSpacing: 0
534530
m_lineSpacing: 0
@@ -555,6 +551,7 @@ MonoBehaviour:
555551
m_verticalMapping: 0
556552
m_uvLineOffset: 0
557553
m_geometrySortingOrder: 0
554+
m_VertexBufferAutoSizeReduction: 1
558555
m_firstVisibleCharacter: 0
559556
m_useMaxVisibleDescender: 1
560557
m_pageToDisplay: 1
@@ -569,12 +566,9 @@ MonoBehaviour:
569566
lineCount: 1
570567
pageCount: 1
571568
materialCount: 1
572-
m_havePropertiesChanged: 0
573569
m_isUsingLegacyAnimationComponent: 0
574570
m_isVolumetricText: 0
575571
m_spriteAnimator: {fileID: 0}
576-
m_isInputParsingRequired: 0
577-
m_inputSource: 0
578572
m_hasFontAssetChanged: 0
579573
m_subTextObjects:
580574
- {fileID: 0}
@@ -617,7 +611,6 @@ MonoBehaviour:
617611
m_CallState: 2
618612
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
619613
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
620-
delegates: []
621614
--- !u!1 &5437275361185204022
622615
GameObject:
623616
m_ObjectHideFlags: 0
@@ -917,7 +910,6 @@ MonoBehaviour:
917910
m_fontSizeMax: 72
918911
m_fontStyle: 1
919912
m_textAlignment: 514
920-
m_isAlignmentEnumConverted: 1
921913
m_characterSpacing: 0
922914
m_wordSpacing: 0
923915
m_lineSpacing: 0
@@ -944,6 +936,7 @@ MonoBehaviour:
944936
m_verticalMapping: 0
945937
m_uvLineOffset: 0
946938
m_geometrySortingOrder: 0
939+
m_VertexBufferAutoSizeReduction: 1
947940
m_firstVisibleCharacter: 0
948941
m_useMaxVisibleDescender: 1
949942
m_pageToDisplay: 1
@@ -958,12 +951,9 @@ MonoBehaviour:
958951
lineCount: 1
959952
pageCount: 1
960953
materialCount: 1
961-
m_havePropertiesChanged: 0
962954
m_isUsingLegacyAnimationComponent: 0
963955
m_isVolumetricText: 0
964956
m_spriteAnimator: {fileID: 0}
965-
m_isInputParsingRequired: 0
966-
m_inputSource: 0
967957
m_hasFontAssetChanged: 0
968958
m_subTextObjects:
969959
- {fileID: 0}
@@ -995,7 +985,7 @@ Canvas:
995985
m_SortingBucketNormalizedSize: 0
996986
m_AdditionalShaderChannelsFlag: 25
997987
m_SortingLayerID: 0
998-
m_SortingOrder: 21
988+
m_SortingOrder: 22
999989
m_TargetDisplay: 0
1000990
--- !u!114 &3199959769407915959
1001991
MonoBehaviour:
@@ -1117,7 +1107,6 @@ MonoBehaviour:
11171107
m_fontSizeMax: 72
11181108
m_fontStyle: 1
11191109
m_textAlignment: 514
1120-
m_isAlignmentEnumConverted: 1
11211110
m_characterSpacing: 0
11221111
m_wordSpacing: 0
11231112
m_lineSpacing: 0
@@ -1144,6 +1133,7 @@ MonoBehaviour:
11441133
m_verticalMapping: 0
11451134
m_uvLineOffset: 0
11461135
m_geometrySortingOrder: 0
1136+
m_VertexBufferAutoSizeReduction: 1
11471137
m_firstVisibleCharacter: 0
11481138
m_useMaxVisibleDescender: 1
11491139
m_pageToDisplay: 1
@@ -1158,12 +1148,9 @@ MonoBehaviour:
11581148
lineCount: 1
11591149
pageCount: 1
11601150
materialCount: 1
1161-
m_havePropertiesChanged: 0
11621151
m_isUsingLegacyAnimationComponent: 0
11631152
m_isVolumetricText: 0
11641153
m_spriteAnimator: {fileID: 0}
1165-
m_isInputParsingRequired: 0
1166-
m_inputSource: 0
11671154
m_hasFontAssetChanged: 0
11681155
m_subTextObjects:
11691156
- {fileID: 0}
@@ -1206,7 +1193,6 @@ MonoBehaviour:
12061193
m_CallState: 2
12071194
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
12081195
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1209-
delegates: []
12101196
--- !u!1 &5437275361735642863
12111197
GameObject:
12121198
m_ObjectHideFlags: 0
@@ -1384,7 +1370,6 @@ MonoBehaviour:
13841370
m_fontSizeMax: 72
13851371
m_fontStyle: 1
13861372
m_textAlignment: 514
1387-
m_isAlignmentEnumConverted: 1
13881373
m_characterSpacing: 0
13891374
m_wordSpacing: 0
13901375
m_lineSpacing: 0
@@ -1411,6 +1396,7 @@ MonoBehaviour:
14111396
m_verticalMapping: 0
14121397
m_uvLineOffset: 0
14131398
m_geometrySortingOrder: 0
1399+
m_VertexBufferAutoSizeReduction: 1
14141400
m_firstVisibleCharacter: 0
14151401
m_useMaxVisibleDescender: 1
14161402
m_pageToDisplay: 1
@@ -1425,12 +1411,9 @@ MonoBehaviour:
14251411
lineCount: 1
14261412
pageCount: 1
14271413
materialCount: 1
1428-
m_havePropertiesChanged: 0
14291414
m_isUsingLegacyAnimationComponent: 0
14301415
m_isVolumetricText: 0
14311416
m_spriteAnimator: {fileID: 0}
1432-
m_isInputParsingRequired: 0
1433-
m_inputSource: 0
14341417
m_hasFontAssetChanged: 0
14351418
m_subTextObjects:
14361419
- {fileID: 0}
@@ -1473,7 +1456,6 @@ MonoBehaviour:
14731456
m_CallState: 2
14741457
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
14751458
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1476-
delegates: []
14771459
--- !u!1 &5437275361948517395
14781460
GameObject:
14791461
m_ObjectHideFlags: 0
@@ -1757,7 +1739,6 @@ MonoBehaviour:
17571739
m_fontSizeMax: 72
17581740
m_fontStyle: 1
17591741
m_textAlignment: 514
1760-
m_isAlignmentEnumConverted: 1
17611742
m_characterSpacing: 0
17621743
m_wordSpacing: 0
17631744
m_lineSpacing: 0
@@ -1784,6 +1765,7 @@ MonoBehaviour:
17841765
m_verticalMapping: 0
17851766
m_uvLineOffset: 0
17861767
m_geometrySortingOrder: 0
1768+
m_VertexBufferAutoSizeReduction: 1
17871769
m_firstVisibleCharacter: 0
17881770
m_useMaxVisibleDescender: 1
17891771
m_pageToDisplay: 1
@@ -1798,12 +1780,9 @@ MonoBehaviour:
17981780
lineCount: 1
17991781
pageCount: 1
18001782
materialCount: 1
1801-
m_havePropertiesChanged: 0
18021783
m_isUsingLegacyAnimationComponent: 0
18031784
m_isVolumetricText: 0
18041785
m_spriteAnimator: {fileID: 0}
1805-
m_isInputParsingRequired: 0
1806-
m_inputSource: 0
18071786
m_hasFontAssetChanged: 0
18081787
m_subTextObjects:
18091788
- {fileID: 0}
@@ -1846,7 +1825,6 @@ MonoBehaviour:
18461825
m_CallState: 2
18471826
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
18481827
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1849-
delegates: []
18501828
--- !u!1 &5437275362289365650
18511829
GameObject:
18521830
m_ObjectHideFlags: 0
@@ -1954,7 +1932,6 @@ MonoBehaviour:
19541932
m_CallState: 2
19551933
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
19561934
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1957-
delegates: []
19581935
--- !u!223 &3600800012842640126
19591936
Canvas:
19601937
m_ObjectHideFlags: 0
@@ -2473,7 +2450,6 @@ MonoBehaviour:
24732450
m_fontSizeMax: 72
24742451
m_fontStyle: 1
24752452
m_textAlignment: 514
2476-
m_isAlignmentEnumConverted: 1
24772453
m_characterSpacing: 0
24782454
m_wordSpacing: 0
24792455
m_lineSpacing: 0
@@ -2500,6 +2476,7 @@ MonoBehaviour:
25002476
m_verticalMapping: 0
25012477
m_uvLineOffset: 0
25022478
m_geometrySortingOrder: 0
2479+
m_VertexBufferAutoSizeReduction: 1
25032480
m_firstVisibleCharacter: 0
25042481
m_useMaxVisibleDescender: 1
25052482
m_pageToDisplay: 1
@@ -2514,12 +2491,9 @@ MonoBehaviour:
25142491
lineCount: 1
25152492
pageCount: 1
25162493
materialCount: 1
2517-
m_havePropertiesChanged: 0
25182494
m_isUsingLegacyAnimationComponent: 0
25192495
m_isVolumetricText: 0
25202496
m_spriteAnimator: {fileID: 0}
2521-
m_isInputParsingRequired: 0
2522-
m_inputSource: 0
25232497
m_hasFontAssetChanged: 0
25242498
m_subTextObjects:
25252499
- {fileID: 0}

‎Case 4/Assets/Prefabs/Interface Menus/Settings UI.prefab‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5158,8 +5158,7 @@ MonoBehaviour:
51585158
m_Script: {fileID: 11500000, guid: cf28df014bbfe934ab54712c2e1f50c8, type: 3}
51595159
m_Name:
51605160
m_EditorClassIdentifier:
5161-
CurrentFontInSettings: {fileID: 0}
5162-
FontLabel: {fileID: 0}
5161+
CurrentFontInSettings: {fileID: 7138623934031232380}
51635162
--- !u!1 &5492252702825337969
51645163
GameObject:
51655164
m_ObjectHideFlags: 0
@@ -7366,7 +7365,6 @@ MonoBehaviour:
73667365
m_Name:
73677366
m_EditorClassIdentifier:
73687367
CurrentFontInSettings: {fileID: 7138623934031232380}
7369-
FontLabel: {fileID: 7138623934031232380}
73707368
--- !u!1 &8896241053956866950
73717369
GameObject:
73727370
m_ObjectHideFlags: 0

‎Case 4/Assets/Resources/Clothing/New Clothing/bot000.png‎

8.49 KB
Loading

‎Case 4/Assets/Resources/Clothing/New Clothing/bot000.png.meta‎

Lines changed: 123 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Case 4/Assets/Resources/Clothing/New Clothing/top000.png‎

35.1 KB
Loading

0 commit comments

Comments
 (0)