client/pubgv3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'package_530' of git.kingsome.cn:client/pubgv3 into package_530

Browse Source
This commit is contained in:
guoqing.zhu 2022-05-30 21:37:18 +08:00
commit 9a3185ef7c
4 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/res/prefabs/NUI/UIGuninfo.prefab
View File

@ -2933,8 +2933,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "18", "_string": "1",
"_N$string": "18", "_N$string": "1",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
@ -2944,7 +2944,7 @@
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
"_batchAsBitmap": false, "_batchAsBitmap": false,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 2,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
@ -3050,8 +3050,8 @@
}, },
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 157.5, "x": 170,
"y": 40.5, "y": 41,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {

40
assets/res/prefabs/NUI/UINheroinfo.prefab
View File

@ -5087,8 +5087,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "18", "_string": "1",
"_N$string": "18", "_N$string": "1",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
@ -5098,7 +5098,7 @@
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
"_batchAsBitmap": false, "_batchAsBitmap": false,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 2,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 3, "_N$overflow": 3,
@ -5409,8 +5409,8 @@
}, },
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 100, "x": 123,
"y": 39.6, "y": 40,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8321,7 +8321,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 400, "width": 400,
"height": 144 "height": 54
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -9254,7 +9254,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -9354,7 +9354,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -9454,7 +9454,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -9554,7 +9554,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -9654,7 +9654,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -9754,7 +9754,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -9854,7 +9854,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -9954,7 +9954,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -10054,7 +10054,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -10154,7 +10154,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -10254,7 +10254,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -10354,7 +10354,7 @@
"__id__": 234 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -10457,7 +10457,7 @@
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 400, "width": 400,
"height": 144 "height": 54
}, },
"_resize": 1, "_resize": 1,
"_N$layoutType": 3, "_N$layoutType": 3,
@ -10922,7 +10922,7 @@
}, },
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -127.8, "x": -70.5,
"y": -15.1, "y": -15.1,
"z": 0 "z": 0
}, },

24
assets/res/prefabs/NUI/cell_HeroItemGroup.prefab
View File

@ -3867,7 +3867,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 108.56, "width": 94.76,
"height": 60 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
@ -3910,8 +3910,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "LV 2", "_string": "LV 1",
"_N$string": "LV 2", "_N$string": "LV 1",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 60, "_lineHeight": 60,
"_enableWrapText": true, "_enableWrapText": true,
@ -8479,7 +8479,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 108.56, "width": 94.76,
"height": 60 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
@ -8522,8 +8522,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "LV 2", "_string": "LV 1",
"_N$string": "LV 2", "_N$string": "LV 1",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 60, "_lineHeight": 60,
"_enableWrapText": true, "_enableWrapText": true,
@ -13091,7 +13091,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 108.56, "width": 94.76,
"height": 60 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
@ -13134,8 +13134,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "LV 2", "_string": "LV 1",
"_N$string": "LV 2", "_N$string": "LV 1",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 60, "_lineHeight": 60,
"_enableWrapText": true, "_enableWrapText": true,
@ -17703,7 +17703,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 108.56, "width": 94.76,
"height": 60 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
@ -17746,8 +17746,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "LV 2", "_string": "LV 1",
"_N$string": "LV 2", "_N$string": "LV 1",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 60, "_lineHeight": 60,
"_enableWrapText": true, "_enableWrapText": true,

18
assets/res/prefabs/NUI/cell_guns.prefab
View File

@ -2439,7 +2439,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 108.56, "width": 94.76,
"height": 60 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
@ -2482,8 +2482,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "LV 2", "_string": "LV 1",
"_N$string": "LV 2", "_N$string": "LV 1",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 60, "_lineHeight": 60,
"_enableWrapText": true, "_enableWrapText": true,
@ -5803,7 +5803,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 108.56, "width": 94.76,
"height": 60 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
@ -5846,8 +5846,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "LV 2", "_string": "LV 1",
"_N$string": "LV 2", "_N$string": "LV 1",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 60, "_lineHeight": 60,
"_enableWrapText": true, "_enableWrapText": true,
@ -9167,7 +9167,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 108.56, "width": 94.76,
"height": 60 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
@ -9210,8 +9210,8 @@
}, },
"_enabled": true, "_enabled": true,
"_useOriginalSize": false, "_useOriginalSize": false,
"_string": "LV 2", "_string": "LV 1",
"_N$string": "LV 2", "_N$string": "LV 1",
"_fontSize": 40, "_fontSize": 40,
"_lineHeight": 60, "_lineHeight": 60,
"_enableWrapText": true, "_enableWrapText": true,