Commit 7aa5f95f authored by limingzhe's avatar limingzhe

fix: 宽屏适配

parent 95376d65
...@@ -78,25 +78,28 @@ ...@@ -78,25 +78,28 @@
"__id__": 8 "__id__": 8
}, },
{ {
"__id__": 53 "__id__": 11
}, },
{ {
"__id__": 56 "__id__": 59
}, },
{ {
"__id__": 68 "__id__": 62
},
{
"__id__": 74
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 110
}, },
{ {
"__id__": 105 "__id__": 111
}, },
{ {
"__id__": 106 "__id__": 112
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -247,13 +250,13 @@ ...@@ -247,13 +250,13 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_sky", "_name": "bg_sky_old",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 6 "__id__": 6
...@@ -285,7 +288,7 @@ ...@@ -285,7 +288,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, -1.1368683772161603e-13,
199, 199,
0, 0,
0, 0,
...@@ -353,8 +356,8 @@ ...@@ -353,8 +356,8 @@
"alignMode": 2, "alignMode": 2,
"_target": null, "_target": null,
"_alignFlags": 1, "_alignFlags": 1,
"_left": 0, "_left": -59.999999999999886,
"_right": 0, "_right": -59.999999999999886,
"_top": 0.35000000000002274, "_top": 0.35000000000002274,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -365,41 +368,168 @@ ...@@ -365,41 +368,168 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 2000,
"_originalHeight": 0, "_originalHeight": 0,
"_id": "39gtsfUrhFQ7ITzBgs/JwO" "_id": "39gtsfUrhFQ7ITzBgs/JwO"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_ground", "_name": "bg_sky",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [],
"_active": true,
"_components": [
{ {
"__id__": 9 "__id__": 9
}, },
{
"__id__": 10
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 600
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
60,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "7axUvlcLxFapGTZ1Aeq+Rh"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "26cfcd53-ee9b-4c45-ab2a-ab13afdb9240"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "5f3X5n3RZFqZEo+ko8YL+f"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 1,
"_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": 1280,
"_originalHeight": 0,
"_id": "e7Ib7jL2NIX5OrK30vjzn3"
},
{
"__type__": "cc.Node",
"_name": "bg_ground",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{ {
"__id__": 12 "__id__": 12
}, },
{ {
"__id__": 27 "__id__": 15
}, },
{ {
"__id__": 39 "__id__": 18
}, },
{ {
"__id__": 42 "__id__": 33
},
{
"__id__": 45
},
{
"__id__": 48
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 57
}, },
{ {
"__id__": 52 "__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -450,21 +580,145 @@ ...@@ -450,21 +580,145 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "0fQTgiyiJLe6axE6EwVBsJ" "_id": "0fQTgiyiJLe6axE6EwVBsJ"
}, },
{
"__type__": "cc.Node",
"_name": "bg_bg_new",
"_objFlags": 0,
"_parent": {
"__id__": 11
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 13
},
{
"__id__": 14
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 595
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-5,
0,
0,
0,
0,
1,
2,
2,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b9GD5YhPRApISec7DWE0Ci"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "23da7e17-e46e-46c0-a4b4-f47c7a23a98c"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "55AbrvcIVKW61tmTuaNdGo"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_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": 0,
"_originalHeight": 0,
"_id": "73Jy9AhuNATZKu0gJIg14g"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_balloon", "_name": "bg_balloon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 10 "__id__": 16
}, },
{ {
"__id__": 11 "__id__": 17
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -520,7 +774,7 @@ ...@@ -520,7 +774,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 9 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -552,7 +806,7 @@ ...@@ -552,7 +806,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 9 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_id": "ff9uNaGnhEcLHHfM+YJKBe" "_id": "ff9uNaGnhEcLHHfM+YJKBe"
...@@ -562,29 +816,29 @@ ...@@ -562,29 +816,29 @@
"_name": "bg_grass", "_name": "bg_grass",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 11
}, },
"_children": [ "_children": [
{ {
"__id__": 13 "__id__": 19
}, },
{ {
"__id__": 16 "__id__": 22
}, },
{ {
"__id__": 19 "__id__": 25
}, },
{ {
"__id__": 22 "__id__": 28
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 31
}, },
{ {
"__id__": 26 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -640,16 +894,16 @@ ...@@ -640,16 +894,16 @@
"_name": "btn_quwen", "_name": "btn_quwen",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 12 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 14 "__id__": 20
}, },
{ {
"__id__": 15 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -705,7 +959,7 @@ ...@@ -705,7 +959,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 13 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -737,7 +991,7 @@ ...@@ -737,7 +991,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 13 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -805,16 +1059,16 @@ ...@@ -805,16 +1059,16 @@
"_name": "btn_familypindu", "_name": "btn_familypindu",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 12 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 17 "__id__": 23
}, },
{ {
"__id__": 18 "__id__": 24
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -870,7 +1124,7 @@ ...@@ -870,7 +1124,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -902,7 +1156,7 @@ ...@@ -902,7 +1156,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -970,16 +1224,16 @@ ...@@ -970,16 +1224,16 @@
"_name": "btn_yuedu", "_name": "btn_yuedu",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 12 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 26
}, },
{ {
"__id__": 21 "__id__": 27
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1035,7 +1289,7 @@ ...@@ -1035,7 +1289,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1067,7 +1321,7 @@ ...@@ -1067,7 +1321,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1135,16 +1389,16 @@ ...@@ -1135,16 +1389,16 @@
"_name": "btn_pindu", "_name": "btn_pindu",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 12 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 23 "__id__": 29
}, },
{ {
"__id__": 24 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1200,7 +1454,7 @@ ...@@ -1200,7 +1454,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1232,7 +1486,7 @@ ...@@ -1232,7 +1486,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1300,7 +1554,7 @@ ...@@ -1300,7 +1554,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 12 "__id__": 18
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1332,7 +1586,7 @@ ...@@ -1332,7 +1586,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 12 "__id__": 18
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -1359,26 +1613,26 @@ ...@@ -1359,26 +1613,26 @@
"_name": "bg_grass_lite", "_name": "bg_grass_lite",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 11
}, },
"_children": [ "_children": [
{ {
"__id__": 28 "__id__": 34
}, },
{ {
"__id__": 31 "__id__": 37
}, },
{ {
"__id__": 34 "__id__": 40
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 43
}, },
{ {
"__id__": 38 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1434,16 +1688,16 @@ ...@@ -1434,16 +1688,16 @@
"_name": "btn_quwen", "_name": "btn_quwen",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 29 "__id__": 35
}, },
{ {
"__id__": 30 "__id__": 36
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1499,7 +1753,7 @@ ...@@ -1499,7 +1753,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 28 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1531,7 +1785,7 @@ ...@@ -1531,7 +1785,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 28 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1599,16 +1853,16 @@ ...@@ -1599,16 +1853,16 @@
"_name": "btn_yuedu", "_name": "btn_yuedu",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 38
}, },
{ {
"__id__": 33 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1664,7 +1918,7 @@ ...@@ -1664,7 +1918,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1696,7 +1950,7 @@ ...@@ -1696,7 +1950,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1764,16 +2018,16 @@ ...@@ -1764,16 +2018,16 @@
"_name": "btn_pindu", "_name": "btn_pindu",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 41
}, },
{ {
"__id__": 36 "__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1829,7 +2083,7 @@ ...@@ -1829,7 +2083,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1861,7 +2115,7 @@ ...@@ -1861,7 +2115,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1929,7 +2183,7 @@ ...@@ -1929,7 +2183,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1961,7 +2215,7 @@ ...@@ -1961,7 +2215,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -1988,16 +2242,16 @@ ...@@ -1988,16 +2242,16 @@
"_name": "bg_bottom2", "_name": "bg_bottom2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 46
}, },
{ {
"__id__": 41 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2053,7 +2307,7 @@ ...@@ -2053,7 +2307,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2085,12 +2339,12 @@ ...@@ -2085,12 +2339,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": { "_target": {
"__id__": 8 "__id__": 11
}, },
"_alignFlags": 12, "_alignFlags": 12,
"_left": 0, "_left": 0,
...@@ -2114,23 +2368,23 @@ ...@@ -2114,23 +2368,23 @@
"_name": "bg_bottom", "_name": "bg_bottom",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 11
}, },
"_children": [ "_children": [
{ {
"__id__": 43 "__id__": 49
}, },
{ {
"__id__": 46 "__id__": 52
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 55
}, },
{ {
"__id__": 50 "__id__": 56
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2144,8 +2398,8 @@ ...@@ -2144,8 +2398,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 971, "width": 1268,
"height": 721 "height": 719
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2156,7 +2410,7 @@ ...@@ -2156,7 +2410,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
514.5, 660.6499999999999,
-239.5, -239.5,
0, 0,
0, 0,
...@@ -2186,16 +2440,16 @@ ...@@ -2186,16 +2440,16 @@
"_name": "btn_last", "_name": "btn_last",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 42 "__id__": 48
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 50
}, },
{ {
"__id__": 45 "__id__": 51
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2221,8 +2475,8 @@ ...@@ -2221,8 +2475,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-124, -276.259,
-272, -243.682,
0, 0,
0, 0,
0, 0,
...@@ -2251,7 +2505,7 @@ ...@@ -2251,7 +2505,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 43 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2283,7 +2537,7 @@ ...@@ -2283,7 +2537,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 43 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2351,16 +2605,16 @@ ...@@ -2351,16 +2605,16 @@
"_name": "btn_center", "_name": "btn_center",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 42 "__id__": 48
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 47 "__id__": 53
}, },
{ {
"__id__": 48 "__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2386,8 +2640,8 @@ ...@@ -2386,8 +2640,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
90, -67.922,
-272, -243.682,
0, 0,
0, 0,
0, 0,
...@@ -2416,7 +2670,7 @@ ...@@ -2416,7 +2670,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 46 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2448,7 +2702,7 @@ ...@@ -2448,7 +2702,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 46 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2516,7 +2770,7 @@ ...@@ -2516,7 +2770,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2527,7 +2781,7 @@ ...@@ -2527,7 +2781,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "715cf873-7964-4e30-a4ce-be8ccf0db483" "__uuid__": "d7895aa2-3fa0-43a6-900f-f640061ee72c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2548,16 +2802,16 @@ ...@@ -2548,16 +2802,16 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 36, "_alignFlags": 36,
"_left": 0, "_left": 0,
"_right": 0, "_right": -294.64999999999986,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 1,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -2575,9 +2829,9 @@ ...@@ -2575,9 +2829,9 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 8 "__id__": 11
}, },
"_enabled": true, "_enabled": false,
"_materials": [ "_materials": [
{ {
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
...@@ -2585,9 +2839,7 @@ ...@@ -2585,9 +2839,7 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": null,
"__uuid__": "f6502baa-917f-4f80-95f8-c28abe2a5dfa"
},
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
...@@ -2607,7 +2859,7 @@ ...@@ -2607,7 +2859,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 8 "__id__": 11
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -2640,10 +2892,10 @@ ...@@ -2640,10 +2892,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 60
}, },
{ {
"__id__": 55 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2699,7 +2951,7 @@ ...@@ -2699,7 +2951,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2731,7 +2983,7 @@ ...@@ -2731,7 +2983,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2762,25 +3014,25 @@ ...@@ -2762,25 +3014,25 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 57 "__id__": 63
}, },
{ {
"__id__": 59 "__id__": 65
}, },
{ {
"__id__": 61 "__id__": 67
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 71
}, },
{ {
"__id__": 66 "__id__": 72
}, },
{ {
"__id__": 67 "__id__": 73
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2836,13 +3088,13 @@ ...@@ -2836,13 +3088,13 @@
"_name": "nick_name", "_name": "nick_name",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 56 "__id__": 62
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2898,7 +3150,7 @@ ...@@ -2898,7 +3150,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2931,13 +3183,13 @@ ...@@ -2931,13 +3183,13 @@
"_name": "defaulte_avatar", "_name": "defaulte_avatar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 56 "__id__": 62
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2993,7 +3245,7 @@ ...@@ -2993,7 +3245,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3025,17 +3277,17 @@ ...@@ -3025,17 +3277,17 @@
"_name": "goldBg", "_name": "goldBg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 56 "__id__": 62
}, },
"_children": [ "_children": [
{ {
"__id__": 62 "__id__": 68
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3091,13 +3343,13 @@ ...@@ -3091,13 +3343,13 @@
"_name": "goldLabel", "_name": "goldLabel",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 69
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3153,7 +3405,7 @@ ...@@ -3153,7 +3405,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3186,7 +3438,7 @@ ...@@ -3186,7 +3438,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3218,7 +3470,7 @@ ...@@ -3218,7 +3470,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3250,7 +3502,7 @@ ...@@ -3250,7 +3502,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3277,7 +3529,7 @@ ...@@ -3277,7 +3529,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3338,7 +3590,7 @@ ...@@ -3338,7 +3590,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 56 "__id__": 62
}, },
"_id": "9dG7baF/9HzqX1HgbFVbkE" "_id": "9dG7baF/9HzqX1HgbFVbkE"
}, },
...@@ -3351,22 +3603,22 @@ ...@@ -3351,22 +3603,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 69 "__id__": 75
}, },
{ {
"__id__": 74 "__id__": 80
}, },
{ {
"__id__": 95 "__id__": 101
}, },
{ {
"__id__": 99 "__id__": 105
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3422,22 +3674,22 @@ ...@@ -3422,22 +3674,22 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 68 "__id__": 74
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 76
}, },
{ {
"__id__": 71 "__id__": 77
}, },
{ {
"__id__": 72 "__id__": 78
}, },
{ {
"__id__": 73 "__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3493,7 +3745,7 @@ ...@@ -3493,7 +3745,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3525,7 +3777,7 @@ ...@@ -3525,7 +3777,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -3552,7 +3804,7 @@ ...@@ -3552,7 +3804,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3620,7 +3872,7 @@ ...@@ -3620,7 +3872,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_id": "a7oMGWaYRMiKv9fGk1f76I" "_id": "a7oMGWaYRMiKv9fGk1f76I"
...@@ -3630,32 +3882,32 @@ ...@@ -3630,32 +3882,32 @@
"_name": "frame", "_name": "frame",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 68 "__id__": 74
}, },
"_children": [ "_children": [
{ {
"__id__": 75 "__id__": 81
}, },
{ {
"__id__": 77 "__id__": 83
}, },
{ {
"__id__": 81 "__id__": 87
}, },
{ {
"__id__": 83 "__id__": 89
}, },
{ {
"__id__": 85 "__id__": 91
}, },
{ {
"__id__": 89 "__id__": 95
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3711,13 +3963,13 @@ ...@@ -3711,13 +3963,13 @@
"_name": "headBack", "_name": "headBack",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 80
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3773,7 +4025,7 @@ ...@@ -3773,7 +4025,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 81
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3805,17 +4057,17 @@ ...@@ -3805,17 +4057,17 @@
"_name": "mask", "_name": "mask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 80
}, },
"_children": [ "_children": [
{ {
"__id__": 78 "__id__": 84
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 86
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3871,13 +4123,13 @@ ...@@ -3871,13 +4123,13 @@
"_name": "headImg", "_name": "headImg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 83
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3933,7 +4185,7 @@ ...@@ -3933,7 +4185,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 84
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3965,7 +4217,7 @@ ...@@ -3965,7 +4217,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3987,13 +4239,13 @@ ...@@ -3987,13 +4239,13 @@
"_name": "headTop", "_name": "headTop",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 80
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4049,7 +4301,7 @@ ...@@ -4049,7 +4301,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4081,13 +4333,13 @@ ...@@ -4081,13 +4333,13 @@
"_name": "nickname", "_name": "nickname",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 80
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 90
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4143,7 +4395,7 @@ ...@@ -4143,7 +4395,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4176,17 +4428,17 @@ ...@@ -4176,17 +4428,17 @@
"_name": "goldBg", "_name": "goldBg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 80
}, },
"_children": [ "_children": [
{ {
"__id__": 86 "__id__": 92
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 94
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4242,13 +4494,13 @@ ...@@ -4242,13 +4494,13 @@
"_name": "goldNumber", "_name": "goldNumber",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 85 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4304,7 +4556,7 @@ ...@@ -4304,7 +4556,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 92
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4337,7 +4589,7 @@ ...@@ -4337,7 +4589,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4369,20 +4621,20 @@ ...@@ -4369,20 +4621,20 @@
"_name": "BtnLogout", "_name": "BtnLogout",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 80
}, },
"_children": [ "_children": [
{ {
"__id__": 90 "__id__": 96
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 98
}, },
{ {
"__id__": 93 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4438,13 +4690,13 @@ ...@@ -4438,13 +4690,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 89 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4500,7 +4752,7 @@ ...@@ -4500,7 +4752,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 90 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4533,7 +4785,7 @@ ...@@ -4533,7 +4785,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4565,7 +4817,7 @@ ...@@ -4565,7 +4817,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4633,7 +4885,7 @@ ...@@ -4633,7 +4885,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4665,19 +4917,19 @@ ...@@ -4665,19 +4917,19 @@
"_name": "btnClose", "_name": "btnClose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 68 "__id__": 74
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 102
}, },
{ {
"__id__": 97 "__id__": 103
}, },
{ {
"__id__": 98 "__id__": 104
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4733,7 +4985,7 @@ ...@@ -4733,7 +4985,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4765,7 +5017,7 @@ ...@@ -4765,7 +5017,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4833,7 +5085,7 @@ ...@@ -4833,7 +5085,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4860,19 +5112,19 @@ ...@@ -4860,19 +5112,19 @@
"_name": "deleteAccount", "_name": "deleteAccount",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 68 "__id__": 74
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 106
}, },
{ {
"__id__": 101 "__id__": 107
}, },
{ {
"__id__": 102 "__id__": 108
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4928,7 +5180,7 @@ ...@@ -4928,7 +5180,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4961,7 +5213,7 @@ ...@@ -4961,7 +5213,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4988,7 +5240,7 @@ ...@@ -4988,7 +5240,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5056,7 +5308,7 @@ ...@@ -5056,7 +5308,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 68 "__id__": 74
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
......
...@@ -60,7 +60,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -60,7 +60,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
); );
const ground = cc.find('Canvas/bg_ground'); const ground = cc.find('Canvas/bg_ground');
ground.scale = canvas.width / ground.width; const gsx = canvas.width / ground.width;
const gsy = canvas.height / ground.height;
ground.scale = Math.min(gsx, gsy);
const grass = cc.find('Canvas/bg_ground/bg_grass'); const grass = cc.find('Canvas/bg_ground/bg_grass');
const box = grass.getBoundingBox(); const box = grass.getBoundingBox();
......
{
"ver": "2.3.5",
"uuid": "379cb164-2bd3-47a5-b08e-7b9c2424d079",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 1280,
"height": 600,
"platformSettings": {},
"subMetas": {
"bg_bg_new": {
"ver": "1.0.4",
"uuid": "23da7e17-e46e-46c0-a4b4-f47c7a23a98c",
"rawTextureUuid": "379cb164-2bd3-47a5-b08e-7b9c2424d079",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": -2.5,
"trimX": 0,
"trimY": 5,
"width": 1280,
"height": 595,
"rawWidth": 1280,
"rawHeight": 600,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b7124037-7f4c-46bd-b4c7-0b4cbd4193b6", "uuid": "462e506b-9760-4df1-99fe-db2e18ae21f0",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 971, "width": 634,
"height": 721, "height": 360,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bg_bottom": { "bg_bottom": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "715cf873-7964-4e30-a4ce-be8ccf0db483", "uuid": "d7895aa2-3fa0-43a6-900f-f640061ee72c",
"rawTextureUuid": "b7124037-7f4c-46bd-b4c7-0b4cbd4193b6", "rawTextureUuid": "462e506b-9760-4df1-99fe-db2e18ae21f0",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": 0,
"offsetY": 0, "offsetY": -0.5,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 1,
"width": 971, "width": 1268,
"height": 721, "height": 719,
"rawWidth": 971, "rawWidth": 1268,
"rawHeight": 721, "rawHeight": 720,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "b7124037-7f4c-46bd-b4c7-0b4cbd4193b6",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 971,
"height": 721,
"platformSettings": {},
"subMetas": {
"bg_bottom_old": {
"ver": "1.0.4",
"uuid": "715cf873-7964-4e30-a4ce-be8ccf0db483",
"rawTextureUuid": "b7124037-7f4c-46bd-b4c7-0b4cbd4193b6",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 971,
"height": 721,
"rawWidth": 971,
"rawHeight": 721,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "f4523bc5-8c79-4fc6-ad1f-c36ac48dbf7f",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 2560,
"height": 1200,
"platformSettings": {},
"subMetas": {
"bg_sky_new": {
"ver": "1.0.4",
"uuid": "26cfcd53-ee9b-4c45-ab2a-ab13afdb9240",
"rawTextureUuid": "f4523bc5-8c79-4fc6-ad1f-c36ac48dbf7f",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1280,
"height": 600,
"rawWidth": 1280,
"rawHeight": 600,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment