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

This commit is contained in:
guoqing.zhu 2022-05-31 18:30:02 +08:00
commit c120d35831

View File

@ -41,8 +41,8 @@
},
"_scale": {
"__type__": "cc.Vec3",
"x": 0.8027343749999988,
"y": 0.8027343749999988,
"x": 0.9480234059522167,
"y": 0.9480234059522167,
"z": 1
},
"_quat": {
@ -78,13 +78,16 @@
},
{
"__id__": 64
},
{
"__id__": 88
}
],
"_active": true,
"_level": 1,
"_components": [
{
"__id__": 88
"__id__": 112
}
],
"_prefab": null,
@ -3435,6 +3438,811 @@
"fileId": "b42iyyWmFAnLJ4bwF6Dpg0",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "pb_hotfix",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 89
},
{
"__id__": 94
}
],
"_active": true,
"_level": 2,
"_components": [],
"_prefab": {
"__id__": 111
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1024,
"height": 512
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_position": {
"__type__": "cc.Vec3",
"x": -32,
"y": -1239,
"z": 0
},
"_scale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_rotationX": 0,
"_rotationY": 0,
"_quat": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_skewX": 0,
"_skewY": 0,
"groupIndex": 0,
"_id": "ba5SXZ88JJqZF/uZTKaPbs"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 88
},
"_children": [],
"_active": true,
"_level": 2,
"_components": [
{
"__id__": 90
},
{
"__id__": 91
},
{
"__id__": 92
}
],
"_prefab": {
"__id__": 93
},
"_opacity": 180,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1024,
"height": 512
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_position": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_scale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_rotationX": 0,
"_rotationY": 0,
"_quat": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_skewX": 0,
"_skewY": 0,
"groupIndex": 0,
"_id": "36IYfv+JZFu5hoHFA6i5JK"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
},
"_enabled": true,
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_id": "404uRZnndBTJZxO8J9qJEe"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "96jgge4XZF4Ldd26RaAsJF"
},
{
"__type__": "cc.BlockInputEvents",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
},
"_enabled": true,
"_id": "7b3GPOG+NBgK9MXlwo6cB/"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 88
},
"asset": {
"__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47"
},
"fileId": "0bmPoCOyFDjKDtw1BaWy9N",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "uibg",
"_objFlags": 0,
"_parent": {
"__id__": 88
},
"_children": [
{
"__id__": 95
},
{
"__id__": 100
},
{
"__id__": 103
}
],
"_active": true,
"_level": 3,
"_components": [
{
"__id__": 109
}
],
"_prefab": {
"__id__": 110
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 669.5,
"height": 278.3
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_position": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_scale": {
"__type__": "cc.Vec3",
"x": 0.89,
"y": 1.01,
"z": 1
},
"_rotationX": 0,
"_rotationY": 0,
"_quat": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_skewX": 0,
"_skewY": 0,
"groupIndex": 0,
"_id": "d3dG+AuO1IQr6uDIm8a1Uy"
},
{
"__type__": "cc.Node",
"_name": "top",
"_objFlags": 0,
"_parent": {
"__id__": 94
},
"_children": [
{
"__id__": 96
}
],
"_active": true,
"_level": 4,
"_components": [],
"_prefab": {
"__id__": 99
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_position": {
"__type__": "cc.Vec3",
"x": 0,
"y": 95.9405941,
"z": 0
},
"_scale": {
"__type__": "cc.Vec3",
"x": 1.1235955,
"y": 0.990099,
"z": 1
},
"_rotationX": 0,
"_rotationY": 0,
"_quat": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_skewX": 0,
"_skewY": 0,
"groupIndex": 0,
"_id": "3aXsWblXRGboiy5Vi0kabN"
},
{
"__type__": "cc.Node",
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 95
},
"_children": [],
"_active": true,
"_level": 3,
"_components": [
{
"__id__": 97
}
],
"_prefab": {
"__id__": 98
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 247,
"g": 194,
"b": 59,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 470.21,
"height": 80
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_position": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_scale": {
"__type__": "cc.Vec3",
"x": 0.6,
"y": 0.6,
"z": 1
},
"_rotationX": 0,
"_rotationY": 0,
"_quat": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_skewX": 0,
"_skewY": 0,
"groupIndex": 0,
"_id": "53BS+UPdVMb4OHEsZEmKRK"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
},
"_enabled": true,
"_useOriginalSize": false,
"_string": "Switch The Chain",
"_N$string": "Switch The Chain",
"_fontSize": 60,
"_lineHeight": 80,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_N$horizontalAlign": 0,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "78sqW8fbFNGbkmCtVpjohd"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 88
},
"asset": {
"__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47"
},
"fileId": "e2frVL381BGZ8JuiZBMIce",
"sync": false
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 88
},
"asset": {
"__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47"
},
"fileId": "faPZ4q47NIkpE2vTAyb1ex",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 94
},
"_children": [],
"_active": true,
"_level": 4,
"_components": [
{
"__id__": 101
}
],
"_prefab": {
"__id__": 102
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1179.9,
"height": 120
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
},
"_position": {
"__type__": "cc.Vec3",
"x": -305,
"y": 0,
"z": 0
},
"_scale": {
"__type__": "cc.Vec3",
"x": 0.5,
"y": 0.5,
"z": 1
},
"_rotationX": 0,
"_rotationY": 0,
"_quat": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_skewX": 0,
"_skewY": 0,
"groupIndex": 0,
"_id": "2ajzwIcvtMyJnucmpsS/7V"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
},
"_enabled": true,
"_useOriginalSize": true,
"_string": "Sorry, the chain you are currently on is not supported by the game.\nPlease click Confirm to switch your chain.",
"_N$string": "Sorry, the chain you are currently on is not supported by the game.\nPlease click Confirm to switch your chain.",
"_fontSize": 40,
"_lineHeight": 60,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_N$horizontalAlign": 0,
"_N$verticalAlign": 0,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "25eZ4cBXxJEKPFnmsZXrSK"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 88
},
"asset": {
"__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47"
},
"fileId": "69ZPCgVK5H6Iy6ecHdFMdT",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "btnConfirm",
"_objFlags": 0,
"_parent": {
"__id__": 94
},
"_children": [
{
"__id__": 104
}
],
"_active": true,
"_level": 4,
"_components": [
{
"__id__": 107
}
],
"_prefab": {
"__id__": 108
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 109,
"height": 45
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_position": {
"__type__": "cc.Vec3",
"x": 0,
"y": -95.049505,
"z": 0
},
"_scale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_rotationX": 0,
"_rotationY": 0,
"_quat": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_skewX": 0,
"_skewY": 0,
"groupIndex": 0,
"_id": "e8SlJTrHBLUJf1dl9mOJOu"
},
{
"__type__": "cc.Node",
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 103
},
"_children": [],
"_active": true,
"_level": 5,
"_components": [
{
"__id__": 105
}
],
"_prefab": {
"__id__": 106
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 171,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_position": {
"__type__": "cc.Vec3",
"x": 0,
"y": -0.950495,
"z": 0
},
"_scale": {
"__type__": "cc.Vec3",
"x": 0.4,
"y": 0.5,
"z": 1
},
"_rotationX": 0,
"_rotationY": 0,
"_quat": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_skewX": 0,
"_skewY": 0,
"groupIndex": 0,
"_id": "39mh/Kvk5LYq9lbgbPbs9A"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
},
"_enabled": true,
"_useOriginalSize": false,
"_string": "Confirm",
"_N$string": "Confirm",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "ef2a48cc-8f1a-4965-b9ba-3deca921b41a"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "88m5Fol/VBla79o5pD0ZZc"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 88
},
"asset": {
"__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47"
},
"fileId": "28yhHa/TFEpJiBS4NQHtIO",
"sync": false
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
},
"_enabled": true,
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7327600a-7c4e-4fed-a79a-dcf9775e5d9e"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_id": "f8JA/T6xVJU78bJNPS4T3g"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 88
},
"asset": {
"__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47"
},
"fileId": "22zqHiYBhIAZ001CnlQf7Z",
"sync": false
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
},
"_enabled": true,
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "b6189259-190d-4fc6-b890-f104d58a7685"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_id": "12J0Vq4q1JO48CR3VLnr8j"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 88
},
"asset": {
"__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47"
},
"fileId": "7e67v+pp5BirKVLN3Y+Iy5",
"sync": false
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 88
},
"asset": {
"__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47"
},
"fileId": "b42iyyWmFAnLJ4bwF6Dpg0",
"sync": false
},
{
"__type__": "cc.Canvas",
"_name": "",