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-31 19:51:07 +08:00
commit de30010a34
3 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6860,7 +6860,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 280, "width": 280,
"height": 324 "height": 234
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -6936,7 +6936,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": -1.2, "y": -32.9,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -6993,7 +6993,7 @@
"__id__": 192 "__id__": 192
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -7093,7 +7093,7 @@
"__id__": 192 "__id__": 192
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -7224,7 +7224,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -40, "y": -10,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -7324,7 +7324,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -40, "y": -10,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -7424,7 +7424,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -70, "y": -40,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -7524,7 +7524,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -70, "y": -40,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -7624,7 +7624,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -100, "y": -70,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -7724,7 +7724,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -100, "y": -70,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -7824,7 +7824,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -130, "y": -100,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -7924,7 +7924,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -130, "y": -100,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8024,7 +8024,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -160, "y": -130,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8124,7 +8124,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -160, "y": -130,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8224,7 +8224,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -190, "y": -160,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8324,7 +8324,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -190, "y": -160,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8393,7 +8393,7 @@
"__id__": 192 "__id__": 192
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -8424,7 +8424,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -220, "y": -190,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8493,7 +8493,7 @@
"__id__": 192 "__id__": 192
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -8524,7 +8524,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -220, "y": -190,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8624,7 +8624,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -250, "y": -190,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8724,7 +8724,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -250, "y": -190,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8824,7 +8824,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -280, "y": -220,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8924,7 +8924,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -280, "y": -220,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -8993,7 +8993,7 @@
"__id__": 192 "__id__": 192
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -9024,7 +9024,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -130, "x": -130,
"y": -310, "y": -280,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -9093,7 +9093,7 @@
"__id__": 192 "__id__": 192
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_level": 1, "_level": 1,
"_components": [ "_components": [
{ {
@ -9124,7 +9124,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 10, "x": 10,
"y": -310, "y": -280,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -9196,7 +9196,7 @@
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 280, "width": 280,
"height": 324 "height": 234
}, },
"_resize": 1, "_resize": 1,
"_N$layoutType": 3, "_N$layoutType": 3,

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

@ -2849,8 +2849,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.2, "x": 0.3,
"y": 0.2, "y": 0.3,
"z": 1 "z": 1
}, },
"_rotationX": 0, "_rotationX": 0,
@ -3045,8 +3045,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.2, "x": 0.3,
"y": 0.2, "y": 0.3,
"z": 1 "z": 1
}, },
"_rotationX": 0, "_rotationX": 0,
@ -7467,8 +7467,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.2, "x": 0.3,
"y": 0.2, "y": 0.3,
"z": 1 "z": 1
}, },
"_rotationX": 0, "_rotationX": 0,
@ -7663,8 +7663,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.2, "x": 0.3,
"y": 0.2, "y": 0.3,
"z": 1 "z": 1
}, },
"_rotationX": 0, "_rotationX": 0,
@ -12085,8 +12085,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.2, "x": 0.3,
"y": 0.2, "y": 0.3,
"z": 1 "z": 1
}, },
"_rotationX": 0, "_rotationX": 0,
@ -12281,8 +12281,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.2, "x": 0.3,
"y": 0.2, "y": 0.3,
"z": 1 "z": 1
}, },
"_rotationX": 0, "_rotationX": 0,
@ -16703,8 +16703,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.2, "x": 0.3,
"y": 0.2, "y": 0.3,
"z": 1 "z": 1
}, },
"_rotationX": 0, "_rotationX": 0,
@ -16899,8 +16899,8 @@
}, },
"_scale": { "_scale": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0.2, "x": 0.3,
"y": 0.2, "y": 0.3,
"z": 1 "z": 1
}, },
"_rotationX": 0, "_rotationX": 0,

32
assets/res/prefabs/game/GameOverNew.prefab
View File

@ -3964,7 +3964,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 260, "x": 260,
"y": 46.7, "y": 45,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -4780,7 +4780,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 180, "x": 180,
"y": 45.6, "y": 45,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -5084,7 +5084,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 260.3, "x": 260.3,
"y": 51.5, "y": 50,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -5182,7 +5182,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -190, "x": -190,
"y": 49.2, "y": 50,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -5280,7 +5280,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 20, "x": 20,
"y": 49.2, "y": 50,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -5385,7 +5385,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 180, "x": 180,
"y": 49.8, "y": 50,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -5429,9 +5429,9 @@
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 33, "r": 201,
"g": 255, "g": 75,
"b": 24, "b": 224,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
@ -6204,7 +6204,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 259.4, "x": 259.4,
"y": 64.4, "y": 60,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -6302,7 +6302,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": -190, "x": -190,
"y": 60.3, "y": 60,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -6400,7 +6400,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 20, "x": 20,
"y": 60.3, "y": 60,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -6505,7 +6505,7 @@
"_position": { "_position": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 180.8, "x": 180.8,
"y": 62.5, "y": 60,
"z": 0 "z": 0
}, },
"_scale": { "_scale": {
@ -6549,9 +6549,9 @@
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 33, "r": 201,
"g": 255, "g": 75,
"b": 24, "b": 224,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {