Skip to content

Commit 6978caa

Browse files
author
hollislu
committed
fix:修复中文字体不显示
1 parent 0857f9a commit 6978caa

24 files changed

+1202
-521
lines changed

‎Demo/API_V2/Assets/API/GUI/Menu/MenuSO.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ MonoBehaviour:
2121
setStatusBarStyle
2222
2323
'
24-
entryDescription: "\u4F7F\u7528setStatusBarStyle\uFF0C\u9700\u8981\u5728json\u91CC\u6DFB\u52A0showStatusBarStyle"
24+
entryDescription: "\u4F7F\u7528setStatusBarStyle\uFF0C\u9700\u8981\u5728json\u91CC\u6DFB\u52A0showStatusBar"
2525
optionList: []
2626
initialButtonText: "\u8BBE\u7F6E\u83DC\u5355\u6837\u5F0F"
2727
extraButtonList:

‎Demo/API_V2/Assets/Fonts/hongmengsansscmediumziti.ttf

7.85 MB
Binary file not shown.

‎Demo/API_V2/Assets/Fonts/hongmengsansscmediumziti.ttf.meta

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

‎Demo/API_V2/Assets/Prefabs/Ability.prefab

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ RectTransform:
2828
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2929
m_LocalPosition: {x: 0, y: 0, z: 0}
3030
m_LocalScale: {x: 0.55, y: 0.55, z: 0.55}
31+
m_ConstrainProportionsScale: 0
3132
m_Children: []
3233
m_Father: {fileID: 1387410314252973452}
3334
m_RootOrder: 1
@@ -54,12 +55,14 @@ MonoBehaviour:
5455
m_GameObject: {fileID: 1398599643064608945}
5556
m_Enabled: 1
5657
m_EditorHideFlags: 0
57-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
58+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
5859
m_Name:
5960
m_EditorClassIdentifier:
6061
m_Material: {fileID: 0}
6162
m_Color: {r: 1, g: 1, b: 1, a: 1}
6263
m_RaycastTarget: 1
64+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
65+
m_Maskable: 1
6366
m_OnCullStateChanged:
6467
m_PersistentCalls:
6568
m_Calls: []
@@ -72,6 +75,7 @@ MonoBehaviour:
7275
m_FillClockwise: 1
7376
m_FillOrigin: 0
7477
m_UseSpriteMesh: 0
78+
m_PixelsPerUnitMultiplier: 1
7579
--- !u!1 &4360298906807689726
7680
GameObject:
7781
m_ObjectHideFlags: 0
@@ -101,6 +105,7 @@ RectTransform:
101105
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
102106
m_LocalPosition: {x: 0, y: 0, z: 0}
103107
m_LocalScale: {x: 1, y: 1, z: 1}
108+
m_ConstrainProportionsScale: 0
104109
m_Children: []
105110
m_Father: {fileID: 1387410314252973452}
106111
m_RootOrder: 0
@@ -127,20 +132,22 @@ MonoBehaviour:
127132
m_GameObject: {fileID: 4360298906807689726}
128133
m_Enabled: 1
129134
m_EditorHideFlags: 0
130-
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
135+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
131136
m_Name:
132137
m_EditorClassIdentifier:
133138
m_Material: {fileID: 0}
134139
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
135140
m_RaycastTarget: 1
141+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
142+
m_Maskable: 1
136143
m_OnCullStateChanged:
137144
m_PersistentCalls:
138145
m_Calls: []
139146
m_FontData:
140-
m_Font: {fileID: 12800000, guid: 0d86ab7b6dd6846b5a18c087cfa9b5fe, type: 3}
147+
m_Font: {fileID: 12800000, guid: 04a37534e45184b62bc44e172e5fe81e, type: 3}
141148
m_FontSize: 45
142149
m_FontStyle: 0
143-
m_BestFit: 1
150+
m_BestFit: 0
144151
m_MinSize: 0
145152
m_MaxSize: 230
146153
m_Alignment: 3
@@ -192,6 +199,7 @@ RectTransform:
192199
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
193200
m_LocalPosition: {x: 0, y: 0, z: 0}
194201
m_LocalScale: {x: 1, y: 1, z: 1}
202+
m_ConstrainProportionsScale: 0
195203
m_Children:
196204
- {fileID: 2482170350657338367}
197205
- {fileID: 6416165306534269223}
@@ -220,12 +228,14 @@ MonoBehaviour:
220228
m_GameObject: {fileID: 5356110359762591211}
221229
m_Enabled: 1
222230
m_EditorHideFlags: 0
223-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
231+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
224232
m_Name:
225233
m_EditorClassIdentifier:
226234
m_Material: {fileID: 0}
227235
m_Color: {r: 1, g: 1, b: 1, a: 1}
228236
m_RaycastTarget: 1
237+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
238+
m_Maskable: 1
229239
m_OnCullStateChanged:
230240
m_PersistentCalls:
231241
m_Calls: []
@@ -238,6 +248,7 @@ MonoBehaviour:
238248
m_FillClockwise: 1
239249
m_FillOrigin: 0
240250
m_UseSpriteMesh: 0
251+
m_PixelsPerUnitMultiplier: 1
241252
--- !u!114 &5673094843149234471
242253
MonoBehaviour:
243254
m_ObjectHideFlags: 0
@@ -247,11 +258,12 @@ MonoBehaviour:
247258
m_GameObject: {fileID: 5356110359762591211}
248259
m_Enabled: 1
249260
m_EditorHideFlags: 0
250-
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
261+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
251262
m_Name:
252263
m_EditorClassIdentifier:
253264
m_Navigation:
254265
m_Mode: 3
266+
m_WrapAround: 0
255267
m_SelectOnUp: {fileID: 0}
256268
m_SelectOnDown: {fileID: 0}
257269
m_SelectOnLeft: {fileID: 0}
@@ -261,17 +273,20 @@ MonoBehaviour:
261273
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
262274
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
263275
m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
276+
m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
264277
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
265278
m_ColorMultiplier: 1
266279
m_FadeDuration: 0.1
267280
m_SpriteState:
268281
m_HighlightedSprite: {fileID: 0}
269282
m_PressedSprite: {fileID: 0}
283+
m_SelectedSprite: {fileID: 0}
270284
m_DisabledSprite: {fileID: 0}
271285
m_AnimationTriggers:
272286
m_NormalTrigger: Normal
273287
m_HighlightedTrigger: Highlighted
274288
m_PressedTrigger: Pressed
289+
m_SelectedTrigger: Highlighted
275290
m_DisabledTrigger: Disabled
276291
m_Interactable: 1
277292
m_TargetGraphic: {fileID: 533907837322733997}
@@ -287,7 +302,7 @@ MonoBehaviour:
287302
m_GameObject: {fileID: 5356110359762591211}
288303
m_Enabled: 1
289304
m_EditorHideFlags: 0
290-
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
305+
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
291306
m_Name:
292307
m_EditorClassIdentifier:
293308
m_IgnoreLayout: 0
@@ -329,6 +344,7 @@ RectTransform:
329344
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
330345
m_LocalPosition: {x: 0, y: 0, z: 0}
331346
m_LocalScale: {x: 1, y: 1, z: 1}
347+
m_ConstrainProportionsScale: 0
332348
m_Children:
333349
- {fileID: 1387410314252973452}
334350
m_Father: {fileID: 0}
@@ -356,12 +372,14 @@ MonoBehaviour:
356372
m_GameObject: {fileID: 8961799125077020349}
357373
m_Enabled: 1
358374
m_EditorHideFlags: 0
359-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
375+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
360376
m_Name:
361377
m_EditorClassIdentifier:
362378
m_Material: {fileID: 0}
363379
m_Color: {r: 0.96470594, g: 0.96470594, b: 0.96470594, a: 0}
364380
m_RaycastTarget: 1
381+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
382+
m_Maskable: 1
365383
m_OnCullStateChanged:
366384
m_PersistentCalls:
367385
m_Calls: []
@@ -374,6 +392,7 @@ MonoBehaviour:
374392
m_FillClockwise: 1
375393
m_FillOrigin: 0
376394
m_UseSpriteMesh: 0
395+
m_PixelsPerUnitMultiplier: 1
377396
--- !u!114 &61042277063886071
378397
MonoBehaviour:
379398
m_ObjectHideFlags: 0
@@ -383,7 +402,7 @@ MonoBehaviour:
383402
m_GameObject: {fileID: 8961799125077020349}
384403
m_Enabled: 1
385404
m_EditorHideFlags: 0
386-
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
405+
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
387406
m_Name:
388407
m_EditorClassIdentifier:
389408
m_Padding:
@@ -397,6 +416,9 @@ MonoBehaviour:
397416
m_ChildForceExpandHeight: 1
398417
m_ChildControlWidth: 1
399418
m_ChildControlHeight: 1
419+
m_ChildScaleWidth: 0
420+
m_ChildScaleHeight: 0
421+
m_ReverseArrangement: 0
400422
--- !u!114 &4278678516505489495
401423
MonoBehaviour:
402424
m_ObjectHideFlags: 0
@@ -406,7 +428,7 @@ MonoBehaviour:
406428
m_GameObject: {fileID: 8961799125077020349}
407429
m_Enabled: 1
408430
m_EditorHideFlags: 0
409-
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
431+
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
410432
m_Name:
411433
m_EditorClassIdentifier:
412434
m_IgnoreLayout: 0

‎Demo/API_V2/Assets/Prefabs/Button Block.prefab

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ RectTransform:
3030
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3131
m_LocalPosition: {x: 0, y: 0, z: 0}
3232
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_ConstrainProportionsScale: 0
3334
m_Children:
3435
- {fileID: 8396944022309100060}
3536
m_Father: {fileID: 0}
@@ -49,7 +50,7 @@ MonoBehaviour:
4950
m_GameObject: {fileID: 8396944020726690285}
5051
m_Enabled: 1
5152
m_EditorHideFlags: 0
52-
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
53+
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
5354
m_Name:
5455
m_EditorClassIdentifier:
5556
m_IgnoreLayout: 0
@@ -89,12 +90,14 @@ MonoBehaviour:
8990
m_GameObject: {fileID: 8396944020726690285}
9091
m_Enabled: 1
9192
m_EditorHideFlags: 0
92-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
93+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
9394
m_Name:
9495
m_EditorClassIdentifier:
9596
m_Material: {fileID: 0}
9697
m_Color: {r: 1, g: 1, b: 1, a: 0}
9798
m_RaycastTarget: 1
99+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
100+
m_Maskable: 1
98101
m_OnCullStateChanged:
99102
m_PersistentCalls:
100103
m_Calls: []
@@ -107,6 +110,7 @@ MonoBehaviour:
107110
m_FillClockwise: 1
108111
m_FillOrigin: 0
109112
m_UseSpriteMesh: 0
113+
m_PixelsPerUnitMultiplier: 1
110114
--- !u!1 &8396944021317043555
111115
GameObject:
112116
m_ObjectHideFlags: 0
@@ -136,6 +140,7 @@ RectTransform:
136140
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
137141
m_LocalPosition: {x: 0, y: 0, z: 0}
138142
m_LocalScale: {x: 1, y: 1, z: 1}
143+
m_ConstrainProportionsScale: 0
139144
m_Children: []
140145
m_Father: {fileID: 8396944022309100060}
141146
m_RootOrder: 0
@@ -162,22 +167,24 @@ MonoBehaviour:
162167
m_GameObject: {fileID: 8396944021317043555}
163168
m_Enabled: 1
164169
m_EditorHideFlags: 0
165-
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
170+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
166171
m_Name:
167172
m_EditorClassIdentifier:
168173
m_Material: {fileID: 0}
169174
m_Color: {r: 1, g: 1, b: 1, a: 1}
170175
m_RaycastTarget: 1
176+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
177+
m_Maskable: 1
171178
m_OnCullStateChanged:
172179
m_PersistentCalls:
173180
m_Calls: []
174181
m_FontData:
175-
m_Font: {fileID: 12800000, guid: 0d86ab7b6dd6846b5a18c087cfa9b5fe, type: 3}
182+
m_Font: {fileID: 12800000, guid: 04a37534e45184b62bc44e172e5fe81e, type: 3}
176183
m_FontSize: 45
177184
m_FontStyle: 0
178185
m_BestFit: 0
179186
m_MinSize: 4
180-
m_MaxSize: 45
187+
m_MaxSize: 50
181188
m_Alignment: 4
182189
m_AlignByGeometry: 1
183190
m_RichText: 1
@@ -226,6 +233,7 @@ RectTransform:
226233
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
227234
m_LocalPosition: {x: 0, y: 0, z: 0}
228235
m_LocalScale: {x: 1, y: 1, z: 1}
236+
m_ConstrainProportionsScale: 0
229237
m_Children:
230238
- {fileID: 8396944021317043554}
231239
m_Father: {fileID: 8396944020726690284}
@@ -253,12 +261,14 @@ MonoBehaviour:
253261
m_GameObject: {fileID: 8396944022309100061}
254262
m_Enabled: 1
255263
m_EditorHideFlags: 0
256-
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
264+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
257265
m_Name:
258266
m_EditorClassIdentifier:
259267
m_Material: {fileID: 0}
260268
m_Color: {r: 0.10196079, g: 0.6784314, b: 0.098039225, a: 1}
261269
m_RaycastTarget: 1
270+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
271+
m_Maskable: 1
262272
m_OnCullStateChanged:
263273
m_PersistentCalls:
264274
m_Calls: []
@@ -271,6 +281,7 @@ MonoBehaviour:
271281
m_FillClockwise: 1
272282
m_FillOrigin: 0
273283
m_UseSpriteMesh: 0
284+
m_PixelsPerUnitMultiplier: 1
274285
--- !u!114 &8396944022309100063
275286
MonoBehaviour:
276287
m_ObjectHideFlags: 0
@@ -280,11 +291,12 @@ MonoBehaviour:
280291
m_GameObject: {fileID: 8396944022309100061}
281292
m_Enabled: 1
282293
m_EditorHideFlags: 0
283-
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
294+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
284295
m_Name:
285296
m_EditorClassIdentifier:
286297
m_Navigation:
287298
m_Mode: 3
299+
m_WrapAround: 0
288300
m_SelectOnUp: {fileID: 0}
289301
m_SelectOnDown: {fileID: 0}
290302
m_SelectOnLeft: {fileID: 0}
@@ -294,17 +306,20 @@ MonoBehaviour:
294306
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
295307
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
296308
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
309+
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
297310
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
298311
m_ColorMultiplier: 1
299312
m_FadeDuration: 0.1
300313
m_SpriteState:
301314
m_HighlightedSprite: {fileID: 0}
302315
m_PressedSprite: {fileID: 0}
316+
m_SelectedSprite: {fileID: 0}
303317
m_DisabledSprite: {fileID: 0}
304318
m_AnimationTriggers:
305319
m_NormalTrigger: Normal
306320
m_HighlightedTrigger: Highlighted
307321
m_PressedTrigger: Pressed
322+
m_SelectedTrigger: Highlighted
308323
m_DisabledTrigger: Disabled
309324
m_Interactable: 1
310325
m_TargetGraphic: {fileID: 8396944022309100062}

0 commit comments

Comments
 (0)