Skip to content

Commit f040d85

Browse files
committed
update layouts with font name/size
1 parent e8459f7 commit f040d85

Some content is hidden

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

45 files changed

+1495
-556
lines changed

resources/gui/layouts/game/AnnouncementWindow.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
"DisabledTextColor": "255,90,90,90",
5252
"TextAlign": "Center",
5353
"AutoSizeToContents": true,
54-
"Font": "sourcesansproblack,16",
54+
"FontName": "sourcesansproblack",
55+
"FontSize": 16,
5556
"TextScale": 1.0
5657
}
5758
}

resources/gui/layouts/game/BankContextMenu.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@
6767
"DisabledTextColor": "255,90,90,90",
6868
"TextAlign": "Center",
6969
"AutoSizeToContents": false,
70-
"Font": null,
70+
"FontName": null,
71+
"FontSize": null,
7172
"TextScale": 1.0,
7273
"NormalImage": null,
7374
"HoveredImage": null,
@@ -134,7 +135,8 @@
134135
"DisabledTextColor": "255,90,90,90",
135136
"TextAlign": "Center",
136137
"AutoSizeToContents": false,
137-
"Font": null,
138+
"FontName": null,
139+
"FontSize": null,
138140
"TextScale": 1.0,
139141
"NormalImage": null,
140142
"HoveredImage": null,
@@ -195,7 +197,8 @@
195197
"DisabledTextColor": "255,90,90,90",
196198
"TextAlign": "Center",
197199
"AutoSizeToContents": false,
198-
"Font": null,
200+
"FontName": null,
201+
"FontSize": null,
199202
"TextScale": 1.0,
200203
"NormalImage": null,
201204
"HoveredImage": null,
@@ -262,7 +265,8 @@
262265
"DisabledTextColor": "255,90,90,90",
263266
"TextAlign": "Center",
264267
"AutoSizeToContents": false,
265-
"Font": null,
268+
"FontName": null,
269+
"FontSize": null,
266270
"TextScale": 1.0,
267271
"NormalImage": null,
268272
"HoveredImage": null,

resources/gui/layouts/game/BankItem.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@
7777
"DisabledTextColor": "255,90,90,90",
7878
"TextAlign": "Left, Top",
7979
"AutoSizeToContents": true,
80-
"Font": "sourcesansproblack,8",
80+
"FontName": "sourcesansproblack",
81+
"FontSize": 8,
8182
"TextScale": 1.0
8283
}
8384
}

resources/gui/layouts/game/BankWindow.json

+12-6
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115
"DisabledTextColor": "255,90,90,90",
116116
"TextAlign": "Center",
117117
"AutoSizeToContents": false,
118-
"Font": null,
118+
"FontName": null,
119+
"FontSize": null,
119120
"TextScale": 1.0,
120121
"NormalImage": "",
121122
"HoveredImage": "",
@@ -182,7 +183,8 @@
182183
"DisabledTextColor": "255,90,90,90",
183184
"TextAlign": "Center",
184185
"AutoSizeToContents": false,
185-
"Font": null,
186+
"FontName": null,
187+
"FontSize": null,
186188
"TextScale": 1.0,
187189
"NormalImage": "",
188190
"HoveredImage": "",
@@ -243,7 +245,8 @@
243245
"DisabledTextColor": "255,90,90,90",
244246
"TextAlign": "Center",
245247
"AutoSizeToContents": false,
246-
"Font": null,
248+
"FontName": null,
249+
"FontSize": null,
247250
"TextScale": 1.0,
248251
"NormalImage": "uparrownormal.png",
249252
"HoveredImage": "uparrowhover.png",
@@ -310,7 +313,8 @@
310313
"DisabledTextColor": "255,90,90,90",
311314
"TextAlign": "Center",
312315
"AutoSizeToContents": false,
313-
"Font": null,
316+
"FontName": null,
317+
"FontSize": null,
314318
"TextScale": 1.0,
315319
"NormalImage": "downarrownormal.png",
316320
"HoveredImage": "downarrowhover.png",
@@ -409,7 +413,8 @@
409413
"DisabledTextColor": null,
410414
"TextAlign": "Left, Bottom",
411415
"AutoSizeToContents": false,
412-
"Font": "sourcesansproblack,12",
416+
"FontName": "sourcesansproblack",
417+
"FontSize": 12,
413418
"TextScale": 1.0
414419
},
415420
"CloseButton": {
@@ -438,7 +443,8 @@
438443
"DisabledTextColor": "255,90,90,90",
439444
"TextAlign": "Center",
440445
"AutoSizeToContents": false,
441-
"Font": null,
446+
"FontName": null,
447+
"FontSize": null,
442448
"TextScale": 1.0,
443449
"NormalImage": null,
444450
"HoveredImage": null,

resources/gui/layouts/game/CharacterWindow.json

+54-27
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
"DisabledTextColor": "255,90,90,90",
7474
"TextAlign": "Center",
7575
"AutoSizeToContents": false,
76-
"Font": "sourcesansproblack,10",
76+
"FontName": "sourcesansproblack",
77+
"FontSize": 10,
7778
"TextScale": 1.0
7879
},
7980
"ChatacterInfoLabel": {
@@ -103,7 +104,8 @@
103104
"DisabledTextColor": "255,90,90,90",
104105
"TextAlign": "Center",
105106
"AutoSizeToContents": false,
106-
"Font": "sourcesansproblack,10",
107+
"FontName": "sourcesansproblack",
108+
"FontSize": 10,
107109
"TextScale": 1.0
108110
},
109111
"CharacterContainer": {
@@ -159,7 +161,8 @@
159161
"DisabledTextColor": "255,90,90,90",
160162
"TextAlign": "Left, Top",
161163
"AutoSizeToContents": true,
162-
"Font": null,
164+
"FontName": null,
165+
"FontSize": null,
163166
"TextScale": 1.0
164167
},
165168
"StatsLabel": {
@@ -189,7 +192,8 @@
189192
"DisabledTextColor": "255,90,90,90",
190193
"TextAlign": "Left, Top",
191194
"AutoSizeToContents": true,
192-
"Font": "sourcesansproblack,10",
195+
"FontName": "sourcesansproblack",
196+
"FontSize": 10,
193197
"TextScale": 1.0
194198
},
195199
"AttackLabel": {
@@ -219,7 +223,8 @@
219223
"DisabledTextColor": "255,90,90,90",
220224
"TextAlign": "Left, Top",
221225
"AutoSizeToContents": true,
222-
"Font": "sourcesansproblack,8",
226+
"FontName": "sourcesansproblack",
227+
"FontSize": 8,
223228
"TextScale": 1.0
224229
},
225230
"IncreaseAttackButton": {
@@ -248,7 +253,8 @@
248253
"DisabledTextColor": "255,90,90,90",
249254
"TextAlign": "Center",
250255
"AutoSizeToContents": false,
251-
"Font": null,
256+
"FontName": null,
257+
"FontSize": null,
252258
"TextScale": 1.0,
253259
"NormalImage": "addstatnormal.png",
254260
"HoveredImage": "addstathover.png",
@@ -288,7 +294,8 @@
288294
"DisabledTextColor": "255,90,90,90",
289295
"TextAlign": "Left, Top",
290296
"AutoSizeToContents": true,
291-
"Font": "sourcesansproblack,8",
297+
"FontName": "sourcesansproblack",
298+
"FontSize": 8,
292299
"TextScale": 1.0
293300
},
294301
"IncreaseDefenseButton": {
@@ -317,7 +324,8 @@
317324
"DisabledTextColor": "255,90,90,90",
318325
"TextAlign": "Center",
319326
"AutoSizeToContents": false,
320-
"Font": null,
327+
"FontName": null,
328+
"FontSize": null,
321329
"TextScale": 1.0,
322330
"NormalImage": "addstatnormal.png",
323331
"HoveredImage": "addstathover.png",
@@ -357,7 +365,8 @@
357365
"DisabledTextColor": "255,90,90,90",
358366
"TextAlign": "Left, Top",
359367
"AutoSizeToContents": true,
360-
"Font": "sourcesansproblack,8",
368+
"FontName": "sourcesansproblack",
369+
"FontSize": 8,
361370
"TextScale": 1.0
362371
},
363372
"IncreaseSpeedButton": {
@@ -386,7 +395,8 @@
386395
"DisabledTextColor": "255,90,90,90",
387396
"TextAlign": "Center",
388397
"AutoSizeToContents": false,
389-
"Font": null,
398+
"FontName": null,
399+
"FontSize": null,
390400
"TextScale": 1.0,
391401
"NormalImage": "addstatnormal.png",
392402
"HoveredImage": "addstathover.png",
@@ -426,7 +436,8 @@
426436
"DisabledTextColor": "255,90,90,90",
427437
"TextAlign": "Left, Top",
428438
"AutoSizeToContents": true,
429-
"Font": "sourcesansproblack,8",
439+
"FontName": "sourcesansproblack",
440+
"FontSize": 8,
430441
"TextScale": 1.0
431442
},
432443
"IncreaseAbilityPowerButton": {
@@ -455,7 +466,8 @@
455466
"DisabledTextColor": "255,90,90,90",
456467
"TextAlign": "Center",
457468
"AutoSizeToContents": false,
458-
"Font": null,
469+
"FontName": null,
470+
"FontSize": null,
459471
"TextScale": 1.0,
460472
"NormalImage": "addstatnormal.png",
461473
"HoveredImage": "addstathover.png",
@@ -495,7 +507,8 @@
495507
"DisabledTextColor": "255,90,90,90",
496508
"TextAlign": "Left, Top",
497509
"AutoSizeToContents": true,
498-
"Font": "sourcesansproblack,8",
510+
"FontName": "sourcesansproblack",
511+
"FontSize": 8,
499512
"TextScale": 1.0
500513
},
501514
"IncreaseMagicResistButton": {
@@ -524,7 +537,8 @@
524537
"DisabledTextColor": "255,90,90,90",
525538
"TextAlign": "Center",
526539
"AutoSizeToContents": false,
527-
"Font": null,
540+
"FontName": null,
541+
"FontSize": null,
528542
"TextScale": 1.0,
529543
"NormalImage": "addstatnormal.png",
530544
"HoveredImage": "addstathover.png",
@@ -564,7 +578,8 @@
564578
"DisabledTextColor": "255,90,90,90",
565579
"TextAlign": "Left, Top",
566580
"AutoSizeToContents": true,
567-
"Font": "sourcesansproblack,8",
581+
"FontName": "sourcesansproblack",
582+
"FontSize": 8,
568583
"TextScale": 1.0
569584
},
570585
"EquipmentItem0": {
@@ -864,7 +879,8 @@
864879
"DisabledTextColor": "255,90,90,90",
865880
"TextAlign": "Center",
866881
"AutoSizeToContents": false,
867-
"Font": "sourcesansproblack,10",
882+
"FontName": "sourcesansproblack",
883+
"FontSize": 10,
868884
"TextScale": 1.0
869885
},
870886
"HpRegen": {
@@ -894,7 +910,8 @@
894910
"DisabledTextColor": "255,90,90,90",
895911
"TextAlign": "Left, Top",
896912
"AutoSizeToContents": true,
897-
"Font": "sourcesansproblack,8",
913+
"FontName": "sourcesansproblack",
914+
"FontSize": 8,
898915
"TextScale": 1.0
899916
},
900917
"ManaRegen": {
@@ -924,7 +941,8 @@
924941
"DisabledTextColor": "255,90,90,90",
925942
"TextAlign": "Left, Top",
926943
"AutoSizeToContents": true,
927-
"Font": "sourcesansproblack,8",
944+
"FontName": "sourcesansproblack",
945+
"FontSize": 8,
928946
"TextScale": 1.0
929947
},
930948
"Lifesteal": {
@@ -954,7 +972,8 @@
954972
"DisabledTextColor": "255,90,90,90",
955973
"TextAlign": "Left, Top",
956974
"AutoSizeToContents": true,
957-
"Font": "sourcesansproblack,8",
975+
"FontName": "sourcesansproblack",
976+
"FontSize": 8,
958977
"TextScale": 1.0
959978
},
960979
"AttackSpeed": {
@@ -984,7 +1003,8 @@
9841003
"DisabledTextColor": "255,90,90,90",
9851004
"TextAlign": "Left, Top",
9861005
"AutoSizeToContents": true,
987-
"Font": "sourcesansproblack,8",
1006+
"FontName": "sourcesansproblack",
1007+
"FontSize": 8,
9881008
"TextScale": 1.0
9891009
},
9901010
"ExtraExp": {
@@ -1014,7 +1034,8 @@
10141034
"DisabledTextColor": "255,90,90,90",
10151035
"TextAlign": "Left, Top",
10161036
"AutoSizeToContents": true,
1017-
"Font": "sourcesansproblack,8",
1037+
"FontName": "sourcesansproblack",
1038+
"FontSize": 8,
10181039
"TextScale": 1.0
10191040
},
10201041
"Luck": {
@@ -1044,7 +1065,8 @@
10441065
"DisabledTextColor": "255,90,90,90",
10451066
"TextAlign": "Left, Top",
10461067
"AutoSizeToContents": true,
1047-
"Font": "sourcesansproblack,8",
1068+
"FontName": "sourcesansproblack",
1069+
"FontSize": 8,
10481070
"TextScale": 1.0
10491071
},
10501072
"Tenacity": {
@@ -1074,7 +1096,8 @@
10741096
"DisabledTextColor": "255,90,90,90",
10751097
"TextAlign": "Left, Top",
10761098
"AutoSizeToContents": true,
1077-
"Font": "sourcesansproblack,8",
1099+
"FontName": "sourcesansproblack",
1100+
"FontSize": 8,
10781101
"TextScale": 1.0
10791102
},
10801103
"CooldownReduction": {
@@ -1104,7 +1127,8 @@
11041127
"DisabledTextColor": "255,90,90,90",
11051128
"TextAlign": "Left, Top",
11061129
"AutoSizeToContents": true,
1107-
"Font": "sourcesansproblack,8",
1130+
"FontName": "sourcesansproblack",
1131+
"FontSize": 8,
11081132
"TextScale": 1.0
11091133
},
11101134
"Manasteal": {
@@ -1134,7 +1158,8 @@
11341158
"DisabledTextColor": "255,90,90,90",
11351159
"TextAlign": "Left, Top",
11361160
"AutoSizeToContents": true,
1137-
"Font": "sourcesansproblack,8",
1161+
"FontName": "sourcesansproblack",
1162+
"FontSize": 8,
11381163
"TextScale": 1.0
11391164
}
11401165
}
@@ -1221,7 +1246,8 @@
12211246
"DisabledTextColor": null,
12221247
"TextAlign": "Left, Bottom",
12231248
"AutoSizeToContents": false,
1224-
"Font": "sourcesansproblack,12",
1249+
"FontName": "sourcesansproblack",
1250+
"FontSize": 12,
12251251
"TextScale": 1.0
12261252
},
12271253
"CloseButton": {
@@ -1250,7 +1276,8 @@
12501276
"DisabledTextColor": "255,90,90,90",
12511277
"TextAlign": "Center",
12521278
"AutoSizeToContents": false,
1253-
"Font": null,
1279+
"FontName": null,
1280+
"FontSize": null,
12541281
"TextScale": 1.0,
12551282
"NormalImage": null,
12561283
"HoveredImage": null,

0 commit comments

Comments
 (0)