Commit ff27e656 authored by Chen Jiping's avatar Chen Jiping

fix:调整装饰物的布局

parent 532952f4
......@@ -78,28 +78,28 @@
"__id__": 7
},
{
"__id__": 26
"__id__": 27
},
{
"__id__": 29
"__id__": 30
},
{
"__id__": 83
"__id__": 84
},
{
"__id__": 96
"__id__": 97
}
],
"_active": true,
"_components": [
{
"__id__": 150
},
{
"__id__": 151
},
{
"__id__": 152
},
{
"__id__": 153
}
],
"_prefab": null,
......@@ -424,7 +424,7 @@
},
{
"__type__": "cc.Node",
"_name": "bg_floor",
"_name": "bg_star",
"_objFlags": 0,
"_parent": {
"__id__": 7
......@@ -447,8 +447,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 388
"width": 990,
"height": 345
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -460,7 +460,7 @@
"ctor": "Float64Array",
"array": [
0,
-161,
187.5,
0,
0,
0,
......@@ -482,7 +482,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f8wnB1XrNIpL/fyIKcFZqw"
"_id": "3fKdEhgIRGtrHsAgXj/Dv4"
},
{
"__type__": "cc.Sprite",
......@@ -500,7 +500,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "129b0bf8-e9a1-4f43-b3c5-a8783dd27b44"
"__uuid__": "d53bf7c7-6195-4009-a62b-3aa2557b51e4"
},
"_type": 0,
"_sizeMode": 1,
......@@ -514,11 +514,11 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "18uAAdH/ZK4LSiOGm7mG7M"
"_id": "d6r5zVDo1OlbR84/s2bf4A"
},
{
"__type__": "cc.Node",
"_name": "bg_top",
"_name": "bg_floor",
"_objFlags": 0,
"_parent": {
"__id__": 7
......@@ -542,7 +542,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 102
"height": 388
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -554,7 +554,7 @@
"ctor": "Float64Array",
"array": [
0,
309,
-161,
0,
0,
0,
......@@ -576,7 +576,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d435to7R1Bw5jdQw1p3HTc"
"_id": "f8wnB1XrNIpL/fyIKcFZqw"
},
{
"__type__": "cc.Sprite",
......@@ -594,7 +594,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "760864d5-b4bf-4f7a-929b-833fdd1ed24c"
"__uuid__": "129b0bf8-e9a1-4f43-b3c5-a8783dd27b44"
},
"_type": 0,
"_sizeMode": 1,
......@@ -608,7 +608,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "676qRlUFRI84uixU0Aq2Ge"
"_id": "18uAAdH/ZK4LSiOGm7mG7M"
},
{
"__type__": "cc.Node",
......@@ -864,7 +864,7 @@
},
{
"__type__": "cc.Node",
"_name": "bg_lt",
"_name": "bg_top",
"_objFlags": 0,
"_parent": {
"__id__": 7
......@@ -890,8 +890,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 285,
"height": 205
"width": 1280,
"height": 102
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -902,8 +902,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-499.298,
259.798,
0,
309,
0,
0,
0,
......@@ -925,7 +925,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "5a1JfvjWxDx7xoO0VPdkUe"
"_id": "d435to7R1Bw5jdQw1p3HTc"
},
{
"__type__": "cc.Sprite",
......@@ -943,7 +943,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d4aba120-0e61-4836-853a-0a38433ffc04"
"__uuid__": "760864d5-b4bf-4f7a-929b-833fdd1ed24c"
},
"_type": 0,
"_sizeMode": 1,
......@@ -957,7 +957,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "f4QNepLfJHzKTrXOinALvs"
"_id": "676qRlUFRI84uixU0Aq2Ge"
},
{
"__type__": "cc.Widget",
......@@ -968,13 +968,11 @@
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 2
},
"_alignFlags": 9,
"_left": -1.7980000000000018,
"_target": null,
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": -2.298000000000002,
"_top": -360,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -986,11 +984,11 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "31g4Rsc9ROxrRiSjaRCOdk"
"_id": "e7dgcnajZHm6SXsTKM9/g6"
},
{
"__type__": "cc.Node",
"_name": "bg_rt",
"_name": "bg_lt",
"_objFlags": 0,
"_parent": {
"__id__": 7
......@@ -1028,7 +1026,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
495.23900000000003,
-499.298,
259.798,
0,
0,
......@@ -1051,7 +1049,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "30ERIxuKxBRYKuyAco5kbq"
"_id": "5a1JfvjWxDx7xoO0VPdkUe"
},
{
"__type__": "cc.Sprite",
......@@ -1069,7 +1067,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a76c2fa5-6864-4076-8209-2abfac0ffdf3"
"__uuid__": "d4aba120-0e61-4836-853a-0a38433ffc04"
},
"_type": 0,
"_sizeMode": 1,
......@@ -1083,7 +1081,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "2eYafHJqZJOrmS332kHLvz"
"_id": "f4QNepLfJHzKTrXOinALvs"
},
{
"__type__": "cc.Widget",
......@@ -1097,9 +1095,9 @@
"_target": {
"__id__": 2
},
"_alignFlags": 33,
"_left": 0,
"_right": 2.2609999999999673,
"_alignFlags": 9,
"_left": -1.7980000000000018,
"_right": 0,
"_top": -2.298000000000002,
"_bottom": 0,
"_verticalCenter": 0,
......@@ -1112,11 +1110,11 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "f2HtqJkBFB7amE99+keJy6"
"_id": "31g4Rsc9ROxrRiSjaRCOdk"
},
{
"__type__": "cc.Node",
"_name": "bg_star",
"_name": "bg_rt",
"_objFlags": 0,
"_parent": {
"__id__": 7
......@@ -1126,6 +1124,9 @@
"_components": [
{
"__id__": 25
},
{
"__id__": 26
}
],
"_prefab": null,
......@@ -1139,8 +1140,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 990,
"height": 345
"width": 285,
"height": 205
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1151,8 +1152,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
187.5,
495.23900000000003,
259.798,
0,
0,
0,
......@@ -1174,7 +1175,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "3fKdEhgIRGtrHsAgXj/Dv4"
"_id": "30ERIxuKxBRYKuyAco5kbq"
},
{
"__type__": "cc.Sprite",
......@@ -1192,7 +1193,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d53bf7c7-6195-4009-a62b-3aa2557b51e4"
"__uuid__": "a76c2fa5-6864-4076-8209-2abfac0ffdf3"
},
"_type": 0,
"_sizeMode": 1,
......@@ -1206,7 +1207,36 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d6r5zVDo1OlbR84/s2bf4A"
"_id": "2eYafHJqZJOrmS332kHLvz"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 2
},
"_alignFlags": 33,
"_left": 0,
"_right": 2.2609999999999673,
"_top": -2.298000000000002,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "f2HtqJkBFB7amE99+keJy6"
},
{
"__type__": "cc.Node",
......@@ -1219,10 +1249,10 @@
"_active": true,
"_components": [
{
"__id__": 27
"__id__": 28
},
{
"__id__": 28
"__id__": 29
}
],
"_prefab": null,
......@@ -1278,7 +1308,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 27
},
"_enabled": true,
"_materials": [
......@@ -1310,7 +1340,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 27
},
"_enabled": true,
"alignMode": 1,
......@@ -1341,16 +1371,16 @@
},
"_children": [
{
"__id__": 30
"__id__": 31
},
{
"__id__": 32
"__id__": 33
},
{
"__id__": 45
"__id__": 46
},
{
"__id__": 62
"__id__": 63
}
],
"_active": true,
......@@ -1408,11 +1438,11 @@
"_name": "centerPart",
"_objFlags": 0,
"_parent": {
"__id__": 29
"__id__": 30
},
"_children": [
{
"__id__": 31
"__id__": 32
}
],
"_active": true,
......@@ -1470,7 +1500,7 @@
"_name": "bubble_bg",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 31
},
"_children": [],
"_active": true,
......@@ -1528,17 +1558,17 @@
"_name": "answer_3",
"_objFlags": 0,
"_parent": {
"__id__": 29
"__id__": 30
},
"_children": [
{
"__id__": 33
"__id__": 34
},
{
"__id__": 37
"__id__": 38
},
{
"__id__": 41
"__id__": 42
}
],
"_active": false,
......@@ -1596,17 +1626,17 @@
"_name": "option_board_3",
"_objFlags": 0,
"_parent": {
"__id__": 32
"__id__": 33
},
"_children": [
{
"__id__": 34
"__id__": 35
}
],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 37
}
],
"_prefab": null,
......@@ -1662,13 +1692,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 36
}
],
"_prefab": null,
......@@ -1724,7 +1754,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1746,7 +1776,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1778,17 +1808,17 @@
"_name": "option_board_2",
"_objFlags": 0,
"_parent": {
"__id__": 32
"__id__": 33
},
"_children": [
{
"__id__": 38
"__id__": 39
}
],
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 41
}
],
"_prefab": null,
......@@ -1844,13 +1874,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 40
}
],
"_prefab": null,
......@@ -1906,7 +1936,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1928,7 +1958,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 38
},
"_enabled": true,
"_materials": [
......@@ -1960,17 +1990,17 @@
"_name": "option_board_1",
"_objFlags": 0,
"_parent": {
"__id__": 32
"__id__": 33
},
"_children": [
{
"__id__": 42
"__id__": 43
}
],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 45
}
],
"_prefab": null,
......@@ -2026,13 +2056,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 44
}
],
"_prefab": null,
......@@ -2088,7 +2118,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2110,7 +2140,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 42
},
"_enabled": true,
"_materials": [],
......@@ -2138,20 +2168,20 @@
"_name": "answer_4",
"_objFlags": 0,
"_parent": {
"__id__": 29
"__id__": 30
},
"_children": [
{
"__id__": 46
"__id__": 47
},
{
"__id__": 50
"__id__": 51
},
{
"__id__": 54
"__id__": 55
},
{
"__id__": 58
"__id__": 59
}
],
"_active": false,
......@@ -2209,17 +2239,17 @@
"_name": "option_board_1",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 46
},
"_children": [
{
"__id__": 47
"__id__": 48
}
],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 50
}
],
"_prefab": null,
......@@ -2275,13 +2305,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 46
"__id__": 47
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 49
}
],
"_prefab": null,
......@@ -2337,7 +2367,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2359,7 +2389,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2391,17 +2421,17 @@
"_name": "option_board_2",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 46
},
"_children": [
{
"__id__": 51
"__id__": 52
}
],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 54
}
],
"_prefab": null,
......@@ -2457,13 +2487,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 50
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 53
}
],
"_prefab": null,
......@@ -2519,7 +2549,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2541,7 +2571,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2573,17 +2603,17 @@
"_name": "option_board_3",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 46
},
"_children": [
{
"__id__": 55
"__id__": 56
}
],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 58
}
],
"_prefab": null,
......@@ -2639,13 +2669,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 55
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 57
}
],
"_prefab": null,
......@@ -2701,7 +2731,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -2723,7 +2753,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2755,17 +2785,17 @@
"_name": "option_board_4",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 46
},
"_children": [
{
"__id__": 59
"__id__": 60
}
],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 62
}
],
"_prefab": null,
......@@ -2821,13 +2851,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 60
"__id__": 61
}
],
"_prefab": null,
......@@ -2883,7 +2913,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -2905,7 +2935,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -2937,23 +2967,23 @@
"_name": "answer_5",
"_objFlags": 0,
"_parent": {
"__id__": 29
"__id__": 30
},
"_children": [
{
"__id__": 63
"__id__": 64
},
{
"__id__": 67
"__id__": 68
},
{
"__id__": 71
"__id__": 72
},
{
"__id__": 75
"__id__": 76
},
{
"__id__": 79
"__id__": 80
}
],
"_active": false,
......@@ -3011,17 +3041,17 @@
"_name": "option_board_1",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 63
},
"_children": [
{
"__id__": 64
"__id__": 65
}
],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 67
}
],
"_prefab": null,
......@@ -3077,13 +3107,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 63
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 65
"__id__": 66
}
],
"_prefab": null,
......@@ -3139,7 +3169,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3161,7 +3191,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3193,17 +3223,17 @@
"_name": "option_board_2",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 63
},
"_children": [
{
"__id__": 68
"__id__": 69
}
],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 71
}
],
"_prefab": null,
......@@ -3259,13 +3289,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 67
"__id__": 68
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 70
}
],
"_prefab": null,
......@@ -3321,7 +3351,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 69
},
"_enabled": true,
"_materials": [
......@@ -3343,7 +3373,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -3375,17 +3405,17 @@
"_name": "option_board_3",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 63
},
"_children": [
{
"__id__": 72
"__id__": 73
}
],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 75
}
],
"_prefab": null,
......@@ -3441,13 +3471,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 72
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 74
}
],
"_prefab": null,
......@@ -3503,7 +3533,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3525,7 +3555,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3557,17 +3587,17 @@
"_name": "option_board_4",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 63
},
"_children": [
{
"__id__": 76
"__id__": 77
}
],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 79
}
],
"_prefab": null,
......@@ -3623,13 +3653,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 78
}
],
"_prefab": null,
......@@ -3685,7 +3715,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -3707,7 +3737,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -3739,17 +3769,17 @@
"_name": "option_board_5",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 63
},
"_children": [
{
"__id__": 80
"__id__": 81
}
],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 83
}
],
"_prefab": null,
......@@ -3805,13 +3835,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 80
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 82
}
],
"_prefab": null,
......@@ -3867,7 +3897,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -3889,7 +3919,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3925,16 +3955,16 @@
},
"_children": [
{
"__id__": 84
"__id__": 85
},
{
"__id__": 87
"__id__": 88
},
{
"__id__": 90
"__id__": 91
},
{
"__id__": 93
"__id__": 94
}
],
"_active": true,
......@@ -3992,16 +4022,16 @@
"_name": "btn_last",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 84
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 86
},
{
"__id__": 86
"__id__": 87
}
],
"_prefab": null,
......@@ -4057,7 +4087,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -4089,7 +4119,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 85
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4157,16 +4187,16 @@
"_name": "btn_close",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 84
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 89
},
{
"__id__": 89
"__id__": 90
}
],
"_prefab": null,
......@@ -4222,7 +4252,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4254,7 +4284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 88
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4322,16 +4352,16 @@
"_name": "btn_next",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 84
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 92
},
{
"__id__": 92
"__id__": 93
}
],
"_prefab": null,
......@@ -4387,7 +4417,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -4419,7 +4449,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 91
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4487,16 +4517,16 @@
"_name": "btn_refresh",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 84
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 95
},
{
"__id__": 95
"__id__": 96
}
],
"_prefab": null,
......@@ -4552,7 +4582,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4584,7 +4614,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 94
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4656,13 +4686,13 @@
},
"_children": [
{
"__id__": 97
"__id__": 98
},
{
"__id__": 102
"__id__": 103
},
{
"__id__": 139
"__id__": 140
}
],
"_active": false,
......@@ -4720,14 +4750,14 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 97
},
"_children": [
{
"__id__": 98
"__id__": 99
},
{
"__id__": 100
"__id__": 101
}
],
"_active": true,
......@@ -4785,13 +4815,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 98
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 100
}
],
"_prefab": null,
......@@ -4847,7 +4877,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 99
},
"_enabled": true,
"_materials": [],
......@@ -4879,13 +4909,13 @@
"_name": "FatMarker",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 98
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 101
"__id__": 102
}
],
"_prefab": null,
......@@ -4941,7 +4971,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 101
},
"_enabled": true,
"_materials": [],
......@@ -4973,62 +5003,62 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 97
},
"_children": [
{
"__id__": 103
"__id__": 104
},
{
"__id__": 105
"__id__": 106
},
{
"__id__": 107
"__id__": 108
},
{
"__id__": 109
"__id__": 110
},
{
"__id__": 111
"__id__": 112
},
{
"__id__": 113
"__id__": 114
},
{
"__id__": 115
"__id__": 116
},
{
"__id__": 117
"__id__": 118
},
{
"__id__": 119
"__id__": 120
},
{
"__id__": 121
"__id__": 122
},
{
"__id__": 123
"__id__": 124
},
{
"__id__": 125
"__id__": 126
},
{
"__id__": 127
"__id__": 128
},
{
"__id__": 129
"__id__": 130
},
{
"__id__": 131
"__id__": 132
},
{
"__id__": 133
"__id__": 134
},
{
"__id__": 135
"__id__": 136
},
{
"__id__": 137
"__id__": 138
}
],
"_active": true,
......@@ -5086,13 +5116,13 @@
"_name": "shadow",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 105
}
],
"_prefab": null,
......@@ -5148,7 +5178,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 104
},
"_enabled": true,
"_materials": [],
......@@ -5176,13 +5206,13 @@
"_name": "loudspeaker_playing",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 107
}
],
"_prefab": null,
......@@ -5238,7 +5268,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 106
},
"_enabled": true,
"_materials": [],
......@@ -5266,13 +5296,13 @@
"_name": "loudspeaker",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 108
"__id__": 109
}
],
"_prefab": null,
......@@ -5328,7 +5358,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 108
},
"_enabled": true,
"_materials": [],
......@@ -5356,13 +5386,13 @@
"_name": "option_board",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 111
}
],
"_prefab": null,
......@@ -5418,7 +5448,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 110
},
"_enabled": true,
"_materials": [],
......@@ -5446,13 +5476,13 @@
"_name": "option_board2",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 112
"__id__": 113
}
],
"_prefab": null,
......@@ -5508,7 +5538,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 112
},
"_enabled": true,
"_materials": [],
......@@ -5536,13 +5566,13 @@
"_name": "title_bg",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 115
}
],
"_prefab": null,
......@@ -5598,7 +5628,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 114
},
"_enabled": true,
"_materials": [],
......@@ -5626,13 +5656,13 @@
"_name": "close",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 117
}
],
"_prefab": null,
......@@ -5688,7 +5718,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 116
},
"_enabled": true,
"_materials": [],
......@@ -5714,13 +5744,13 @@
"_name": "l_curtain",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 119
}
],
"_prefab": null,
......@@ -5776,7 +5806,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 118
},
"_enabled": true,
"_materials": [],
......@@ -5804,13 +5834,13 @@
"_name": "bg_top",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 121
}
],
"_prefab": null,
......@@ -5866,7 +5896,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 120
},
"_enabled": true,
"_materials": [],
......@@ -5894,13 +5924,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 123
}
],
"_prefab": null,
......@@ -5956,7 +5986,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
"__id__": 122
},
"_enabled": true,
"_materials": [],
......@@ -5984,13 +6014,13 @@
"_name": "r_curtain",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 124
"__id__": 125
}
],
"_prefab": null,
......@@ -6046,7 +6076,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 124
},
"_enabled": true,
"_materials": [],
......@@ -6074,13 +6104,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 127
}
],
"_prefab": null,
......@@ -6136,7 +6166,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 126
},
"_enabled": true,
"_materials": [],
......@@ -6164,13 +6194,13 @@
"_name": "bg_floor",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 128
"__id__": 129
}
],
"_prefab": null,
......@@ -6226,7 +6256,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 128
},
"_enabled": true,
"_materials": [
......@@ -6258,13 +6288,13 @@
"_name": "bg_rt",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 130
"__id__": 131
}
],
"_prefab": null,
......@@ -6320,7 +6350,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 129
"__id__": 130
},
"_enabled": true,
"_materials": [],
......@@ -6348,13 +6378,13 @@
"_name": "bg_lt",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 132
"__id__": 133
}
],
"_prefab": null,
......@@ -6410,7 +6440,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 132
},
"_enabled": true,
"_materials": [],
......@@ -6438,13 +6468,13 @@
"_name": "bg_star",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 134
"__id__": 135
}
],
"_prefab": null,
......@@ -6500,7 +6530,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
"__id__": 134
},
"_enabled": true,
"_materials": [],
......@@ -6528,13 +6558,13 @@
"_name": "circle_x",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 137
}
],
"_prefab": null,
......@@ -6590,7 +6620,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 136
},
"_enabled": true,
"_materials": [],
......@@ -6618,13 +6648,13 @@
"_name": "black",
"_objFlags": 0,
"_parent": {
"__id__": 102
"__id__": 103
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 138
"__id__": 139
}
],
"_prefab": null,
......@@ -6680,7 +6710,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 138
},
"_enabled": true,
"_materials": [],
......@@ -6708,23 +6738,23 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 97
},
"_children": [
{
"__id__": 140
"__id__": 141
},
{
"__id__": 142
"__id__": 143
},
{
"__id__": 144
"__id__": 145
},
{
"__id__": 146
"__id__": 147
},
{
"__id__": 148
"__id__": 149
}
],
"_active": true,
......@@ -6782,13 +6812,13 @@
"_name": "appear",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 141
"__id__": 142
}
],
"_prefab": null,
......@@ -6844,7 +6874,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 141
},
"_enabled": true,
"_clip": {
......@@ -6862,13 +6892,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 144
}
],
"_prefab": null,
......@@ -6924,7 +6954,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 143
},
"_enabled": true,
"_clip": {
......@@ -6942,13 +6972,13 @@
"_name": "error",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 145
"__id__": 146
}
],
"_prefab": null,
......@@ -7004,7 +7034,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 145
},
"_enabled": true,
"_clip": {
......@@ -7022,13 +7052,13 @@
"_name": "good_job",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 147
"__id__": 148
}
],
"_prefab": null,
......@@ -7084,7 +7114,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 147
},
"_enabled": true,
"_clip": {
......@@ -7102,13 +7132,13 @@
"_name": "try_again",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 149
"__id__": 150
}
],
"_prefab": null,
......@@ -7164,7 +7194,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 149
},
"_enabled": true,
"_clip": {
......
......@@ -290,7 +290,7 @@ cc.Class({
bgFloorNode.scaleX = this._frameSize.width / bgFloorNode.width;
const bgTopNode = cc.find('Canvas/decorate/bg_top');
bgTopNode.scaleX = this._frameSize.width / bgTopNode.width;
bgTopNode.scale = this._frameSize.width / bgTopNode.width * this._cocosScale;
const titleBgNode = this.getSprNode('bg');
titleBgNode.parent = bgNode;
......
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