Commit b183f6c6 authored by Chen Jiping's avatar Chen Jiping

fix:修复排版问题

parent 5be745cc
......@@ -78,25 +78,28 @@
"__id__": 7
},
{
"__id__": 18
"__id__": 26
},
{
"__id__": 72
"__id__": 29
},
{
"__id__": 85
"__id__": 83
},
{
"__id__": 96
}
],
"_active": true,
"_components": [
{
"__id__": 139
"__id__": 150
},
{
"__id__": 140
"__id__": 151
},
{
"__id__": 141
"__id__": 152
}
],
"_prefab": null,
......@@ -357,10 +360,16 @@
"__id__": 12
},
{
"__id__": 14
"__id__": 15
},
{
"__id__": 16
"__id__": 18
},
{
"__id__": 21
},
{
"__id__": 24
}
],
"_active": true,
......@@ -613,6 +622,9 @@
"_components": [
{
"__id__": 13
},
{
"__id__": 14
}
],
"_prefab": null,
......@@ -695,6 +707,33 @@
"_atlas": null,
"_id": "e0Q4xrW8tFXrK91tXQGUow"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 33,
"_left": 0,
"_right": -640,
"_top": -362.5,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "80B2J7fN5ONI6nmx5q5IuM"
},
{
"__type__": "cc.Node",
"_name": "l_curtain",
......@@ -706,7 +745,10 @@
"_active": true,
"_components": [
{
"__id__": 15
"__id__": 16
},
{
"__id__": 17
}
],
"_prefab": null,
......@@ -755,14 +797,383 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f8ITFiYBZHLpSlysaUqJiF"
"_id": "f8ITFiYBZHLpSlysaUqJiF"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "42998bc9-e010-4a63-bc8f-f1e82cfaa1b9"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "33Ha5Z6cNA37iqIgAY9nfl"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": -640,
"_right": 0,
"_top": -363,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "ef9XZNOhdJxZK+oxhyglwq"
},
{
"__type__": "cc.Node",
"_name": "bg_lt",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 19
},
{
"__id__": 20
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 285,
"height": 205
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-499.298,
259.798,
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": "5a1JfvjWxDx7xoO0VPdkUe"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d4aba120-0e61-4836-853a-0a38433ffc04"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "f4QNepLfJHzKTrXOinALvs"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": -641.798,
"_right": 0,
"_top": -362.298,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "31g4Rsc9ROxrRiSjaRCOdk"
},
{
"__type__": "cc.Node",
"_name": "bg_rt",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 22
},
{
"__id__": 23
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 285,
"height": 205
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
495.23900000000003,
259.798,
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": "30ERIxuKxBRYKuyAco5kbq"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a76c2fa5-6864-4076-8209-2abfac0ffdf3"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "2eYafHJqZJOrmS332kHLvz"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 33,
"_left": 0,
"_right": -637.739,
"_top": -362.298,
"_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",
"_name": "bg_star",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 25
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 990,
"height": 345
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
187.5,
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": "3fKdEhgIRGtrHsAgXj/Dv4"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
"__id__": 24
},
"_enabled": true,
"_materials": [
......@@ -773,7 +1184,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "42998bc9-e010-4a63-bc8f-f1e82cfaa1b9"
"__uuid__": "d53bf7c7-6195-4009-a62b-3aa2557b51e4"
},
"_type": 0,
"_sizeMode": 1,
......@@ -787,20 +1198,23 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "33Ha5Z6cNA37iqIgAY9nfl"
"_id": "d6r5zVDo1OlbR84/s2bf4A"
},
{
"__type__": "cc.Node",
"_name": "bg_star",
"_name": "title_bg",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 17
"__id__": 27
},
{
"__id__": 28
}
],
"_prefab": null,
......@@ -814,8 +1228,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 990,
"height": 345
"width": 517,
"height": 128
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -826,8 +1240,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
187.5,
-383.60799999999995,
298.361,
0,
0,
0,
......@@ -849,14 +1263,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "3fKdEhgIRGtrHsAgXj/Dv4"
"_id": "87j+awKa5DvZi99JuNX5CX"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 26
},
"_enabled": true,
"_materials": [
......@@ -867,7 +1281,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d53bf7c7-6195-4009-a62b-3aa2557b51e4"
"__uuid__": "14e7fe89-0579-40cd-80a9-b226f20c1a55"
},
"_type": 0,
"_sizeMode": 1,
......@@ -881,7 +1295,34 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d6r5zVDo1OlbR84/s2bf4A"
"_id": "98417Al/pEhpFuZc19T6jU"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": -2.1079999999999472,
"_right": 0,
"_top": -2.36099999999999,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "eeMOHEC4VBe4c37M1NCxyC"
},
{
"__type__": "cc.Node",
......@@ -892,16 +1333,16 @@
},
"_children": [
{
"__id__": 19
"__id__": 30
},
{
"__id__": 21
"__id__": 32
},
{
"__id__": 34
"__id__": 45
},
{
"__id__": 51
"__id__": 62
}
],
"_active": true,
......@@ -959,11 +1400,11 @@
"_name": "centerPart",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 29
},
"_children": [
{
"__id__": 20
"__id__": 31
}
],
"_active": true,
......@@ -1021,7 +1462,7 @@
"_name": "bubble_bg",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 30
},
"_children": [],
"_active": true,
......@@ -1079,17 +1520,17 @@
"_name": "answer_3",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 29
},
"_children": [
{
"__id__": 22
"__id__": 33
},
{
"__id__": 26
"__id__": 37
},
{
"__id__": 30
"__id__": 41
}
],
"_active": false,
......@@ -1147,17 +1588,17 @@
"_name": "option_board_3",
"_objFlags": 0,
"_parent": {
"__id__": 21
"__id__": 32
},
"_children": [
{
"__id__": 23
"__id__": 34
}
],
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 36
}
],
"_prefab": null,
......@@ -1213,13 +1654,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 33
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 24
"__id__": 35
}
],
"_prefab": null,
......@@ -1275,7 +1716,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1297,7 +1738,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 33
},
"_enabled": true,
"_materials": [
......@@ -1329,17 +1770,17 @@
"_name": "option_board_2",
"_objFlags": 0,
"_parent": {
"__id__": 21
"__id__": 32
},
"_children": [
{
"__id__": 27
"__id__": 38
}
],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 40
}
],
"_prefab": null,
......@@ -1395,13 +1836,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 37
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 28
"__id__": 39
}
],
"_prefab": null,
......@@ -1457,7 +1898,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 38
},
"_enabled": true,
"_materials": [
......@@ -1479,7 +1920,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1511,17 +1952,17 @@
"_name": "option_board_1",
"_objFlags": 0,
"_parent": {
"__id__": 21
"__id__": 32
},
"_children": [
{
"__id__": 31
"__id__": 42
}
],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 44
}
],
"_prefab": null,
......@@ -1577,13 +2018,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 43
}
],
"_prefab": null,
......@@ -1639,7 +2080,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -1661,7 +2102,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 41
},
"_enabled": true,
"_materials": [],
......@@ -1689,20 +2130,20 @@
"_name": "answer_4",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 29
},
"_children": [
{
"__id__": 35
"__id__": 46
},
{
"__id__": 39
"__id__": 50
},
{
"__id__": 43
"__id__": 54
},
{
"__id__": 47
"__id__": 58
}
],
"_active": false,
......@@ -1760,17 +2201,17 @@
"_name": "option_board_1",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 45
},
"_children": [
{
"__id__": 36
"__id__": 47
}
],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 49
}
],
"_prefab": null,
......@@ -1826,13 +2267,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 46
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 37
"__id__": 48
}
],
"_prefab": null,
......@@ -1888,7 +2329,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -1910,7 +2351,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 46
},
"_enabled": true,
"_materials": [
......@@ -1942,17 +2383,17 @@
"_name": "option_board_2",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 45
},
"_children": [
{
"__id__": 40
"__id__": 51
}
],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 53
}
],
"_prefab": null,
......@@ -2008,13 +2449,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 52
}
],
"_prefab": null,
......@@ -2070,7 +2511,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2092,7 +2533,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -2124,17 +2565,17 @@
"_name": "option_board_3",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 45
},
"_children": [
{
"__id__": 44
"__id__": 55
}
],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 57
}
],
"_prefab": null,
......@@ -2190,13 +2631,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 43
"__id__": 54
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 56
}
],
"_prefab": null,
......@@ -2252,7 +2693,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2274,7 +2715,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2306,17 +2747,17 @@
"_name": "option_board_4",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 45
},
"_children": [
{
"__id__": 48
"__id__": 59
}
],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 61
}
],
"_prefab": null,
......@@ -2372,13 +2813,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 47
"__id__": 58
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 60
}
],
"_prefab": null,
......@@ -2434,7 +2875,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -2456,7 +2897,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -2488,23 +2929,23 @@
"_name": "answer_5",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 29
},
"_children": [
{
"__id__": 52
"__id__": 63
},
{
"__id__": 56
"__id__": 67
},
{
"__id__": 60
"__id__": 71
},
{
"__id__": 64
"__id__": 75
},
{
"__id__": 68
"__id__": 79
}
],
"_active": false,
......@@ -2562,17 +3003,17 @@
"_name": "option_board_1",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 62
},
"_children": [
{
"__id__": 53
"__id__": 64
}
],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 66
}
],
"_prefab": null,
......@@ -2628,13 +3069,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 52
"__id__": 63
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 65
}
],
"_prefab": null,
......@@ -2690,7 +3131,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -2712,7 +3153,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 63
},
"_enabled": true,
"_materials": [
......@@ -2744,17 +3185,17 @@
"_name": "option_board_2",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 62
},
"_children": [
{
"__id__": 57
"__id__": 68
}
],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 70
}
],
"_prefab": null,
......@@ -2810,13 +3251,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 56
"__id__": 67
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 69
}
],
"_prefab": null,
......@@ -2872,7 +3313,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -2894,7 +3335,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -2926,17 +3367,17 @@
"_name": "option_board_3",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 62
},
"_children": [
{
"__id__": 61
"__id__": 72
}
],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 74
}
],
"_prefab": null,
......@@ -2992,13 +3433,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 71
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 73
}
],
"_prefab": null,
......@@ -3054,7 +3495,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3076,7 +3517,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 71
},
"_enabled": true,
"_materials": [
......@@ -3108,17 +3549,17 @@
"_name": "option_board_4",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 62
},
"_children": [
{
"__id__": 65
"__id__": 76
}
],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 78
}
],
"_prefab": null,
......@@ -3174,13 +3615,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 64
"__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 77
}
],
"_prefab": null,
......@@ -3236,7 +3677,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -3258,7 +3699,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3290,17 +3731,17 @@
"_name": "option_board_5",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 62
},
"_children": [
{
"__id__": 69
"__id__": 80
}
],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 82
}
],
"_prefab": null,
......@@ -3356,13 +3797,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 68
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 81
}
],
"_prefab": null,
......@@ -3418,7 +3859,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3440,7 +3881,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3476,16 +3917,16 @@
},
"_children": [
{
"__id__": 73
"__id__": 84
},
{
"__id__": 76
"__id__": 87
},
{
"__id__": 79
"__id__": 90
},
{
"__id__": 82
"__id__": 93
}
],
"_active": true,
......@@ -3543,16 +3984,16 @@
"_name": "btn_last",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 85
},
{
"__id__": 75
"__id__": 86
}
],
"_prefab": null,
......@@ -3608,7 +4049,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -3640,7 +4081,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 84
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3708,16 +4149,16 @@
"_name": "btn_close",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 88
},
{
"__id__": 78
"__id__": 89
}
],
"_prefab": null,
......@@ -3773,7 +4214,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -3805,7 +4246,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 87
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3873,16 +4314,16 @@
"_name": "btn_next",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 91
},
{
"__id__": 81
"__id__": 92
}
],
"_prefab": null,
......@@ -3938,7 +4379,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -3970,7 +4411,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 90
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4038,16 +4479,16 @@
"_name": "btn_refresh",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 83
"__id__": 94
},
{
"__id__": 84
"__id__": 95
}
],
"_prefab": null,
......@@ -4103,7 +4544,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 93
},
"_enabled": true,
"_materials": [
......@@ -4135,7 +4576,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 93
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4207,13 +4648,13 @@
},
"_children": [
{
"__id__": 86
"__id__": 97
},
{
"__id__": 91
"__id__": 102
},
{
"__id__": 128
"__id__": 139
}
],
"_active": false,
......@@ -4271,14 +4712,14 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 96
},
"_children": [
{
"__id__": 87
"__id__": 98
},
{
"__id__": 89
"__id__": 100
}
],
"_active": true,
......@@ -4336,13 +4777,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 99
}
],
"_prefab": null,
......@@ -4398,7 +4839,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 98
},
"_enabled": true,
"_materials": [],
......@@ -4430,13 +4871,13 @@
"_name": "FatMarker",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 101
}
],
"_prefab": null,
......@@ -4492,7 +4933,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 100
},
"_enabled": true,
"_materials": [],
......@@ -4524,62 +4965,62 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 96
},
"_children": [
{
"__id__": 92
"__id__": 103
},
{
"__id__": 94
"__id__": 105
},
{
"__id__": 96
"__id__": 107
},
{
"__id__": 98
"__id__": 109
},
{
"__id__": 100
"__id__": 111
},
{
"__id__": 102
"__id__": 113
},
{
"__id__": 104
"__id__": 115
},
{
"__id__": 106
"__id__": 117
},
{
"__id__": 108
"__id__": 119
},
{
"__id__": 110
"__id__": 121
},
{
"__id__": 112
"__id__": 123
},
{
"__id__": 114
"__id__": 125
},
{
"__id__": 116
"__id__": 127
},
{
"__id__": 118
"__id__": 129
},
{
"__id__": 120
"__id__": 131
},
{
"__id__": 122
"__id__": 133
},
{
"__id__": 124
"__id__": 135
},
{
"__id__": 126
"__id__": 137
}
],
"_active": true,
......@@ -4637,13 +5078,13 @@
"_name": "shadow",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 104
}
],
"_prefab": null,
......@@ -4699,7 +5140,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 103
},
"_enabled": true,
"_materials": [],
......@@ -4727,13 +5168,13 @@
"_name": "loudspeaker_playing",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 106
}
],
"_prefab": null,
......@@ -4789,7 +5230,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 105
},
"_enabled": true,
"_materials": [],
......@@ -4817,13 +5258,13 @@
"_name": "loudspeaker",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 108
}
],
"_prefab": null,
......@@ -4879,7 +5320,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 107
},
"_enabled": true,
"_materials": [],
......@@ -4907,13 +5348,13 @@
"_name": "option_board",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 110
}
],
"_prefab": null,
......@@ -4969,7 +5410,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 109
},
"_enabled": true,
"_materials": [],
......@@ -4997,13 +5438,13 @@
"_name": "option_board2",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 101
"__id__": 112
}
],
"_prefab": null,
......@@ -5059,7 +5500,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 111
},
"_enabled": true,
"_materials": [],
......@@ -5087,13 +5528,13 @@
"_name": "title_bg",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 114
}
],
"_prefab": null,
......@@ -5149,7 +5590,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 113
},
"_enabled": true,
"_materials": [],
......@@ -5177,13 +5618,13 @@
"_name": "close",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 105
"__id__": 116
}
],
"_prefab": null,
......@@ -5239,7 +5680,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 115
},
"_enabled": true,
"_materials": [],
......@@ -5265,13 +5706,13 @@
"_name": "l_curtain",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 118
}
],
"_prefab": null,
......@@ -5327,7 +5768,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 117
},
"_enabled": true,
"_materials": [],
......@@ -5355,13 +5796,13 @@
"_name": "bg_top",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 120
}
],
"_prefab": null,
......@@ -5417,7 +5858,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 119
},
"_enabled": true,
"_materials": [],
......@@ -5445,13 +5886,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 122
}
],
"_prefab": null,
......@@ -5507,7 +5948,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 121
},
"_enabled": true,
"_materials": [],
......@@ -5535,13 +5976,13 @@
"_name": "r_curtain",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 124
}
],
"_prefab": null,
......@@ -5597,7 +6038,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 123
},
"_enabled": true,
"_materials": [],
......@@ -5625,13 +6066,13 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 126
}
],
"_prefab": null,
......@@ -5687,7 +6128,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 125
},
"_enabled": true,
"_materials": [],
......@@ -5715,13 +6156,13 @@
"_name": "bg_floor",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 128
}
],
"_prefab": null,
......@@ -5777,7 +6218,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -5809,13 +6250,13 @@
"_name": "bg_rt",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 130
}
],
"_prefab": null,
......@@ -5871,7 +6312,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 129
},
"_enabled": true,
"_materials": [],
......@@ -5899,13 +6340,13 @@
"_name": "bg_lt",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 132
}
],
"_prefab": null,
......@@ -5961,7 +6402,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 131
},
"_enabled": true,
"_materials": [],
......@@ -5989,13 +6430,13 @@
"_name": "bg_star",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 123
"__id__": 134
}
],
"_prefab": null,
......@@ -6051,7 +6492,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
"__id__": 133
},
"_enabled": true,
"_materials": [],
......@@ -6079,13 +6520,13 @@
"_name": "circle_x",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 136
}
],
"_prefab": null,
......@@ -6141,7 +6582,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 135
},
"_enabled": true,
"_materials": [],
......@@ -6169,13 +6610,13 @@
"_name": "black",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 127
"__id__": 138
}
],
"_prefab": null,
......@@ -6231,7 +6672,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 137
},
"_enabled": true,
"_materials": [],
......@@ -6259,23 +6700,23 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 96
},
"_children": [
{
"__id__": 129
"__id__": 140
},
{
"__id__": 131
"__id__": 142
},
{
"__id__": 133
"__id__": 144
},
{
"__id__": 135
"__id__": 146
},
{
"__id__": 137
"__id__": 148
}
],
"_active": true,
......@@ -6333,13 +6774,13 @@
"_name": "appear",
"_objFlags": 0,
"_parent": {
"__id__": 128
"__id__": 139
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 130
"__id__": 141
}
],
"_prefab": null,
......@@ -6395,7 +6836,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 129
"__id__": 140
},
"_enabled": true,
"_clip": {
......@@ -6413,13 +6854,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 128
"__id__": 139
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 132
"__id__": 143
}
],
"_prefab": null,
......@@ -6475,7 +6916,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 142
},
"_enabled": true,
"_clip": {
......@@ -6493,13 +6934,13 @@
"_name": "error",
"_objFlags": 0,
"_parent": {
"__id__": 128
"__id__": 139
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 134
"__id__": 145
}
],
"_prefab": null,
......@@ -6555,7 +6996,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
"__id__": 144
},
"_enabled": true,
"_clip": {
......@@ -6573,13 +7014,13 @@
"_name": "good_job",
"_objFlags": 0,
"_parent": {
"__id__": 128
"__id__": 139
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 147
}
],
"_prefab": null,
......@@ -6635,7 +7076,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 146
},
"_enabled": true,
"_clip": {
......@@ -6653,13 +7094,13 @@
"_name": "try_again",
"_objFlags": 0,
"_parent": {
"__id__": 128
"__id__": 139
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 138
"__id__": 149
}
],
"_prefab": null,
......@@ -6715,7 +7156,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 148
},
"_enabled": true,
"_clip": {
......
......@@ -282,17 +282,9 @@ cc.Class({
cc.find('Canvas/decorate').scale = this._mapScaleMin;
const canvasNode = cc.find('Canvas');
const bgFloorNode = cc.find('Canvas/decorate/bg_floor');
bgFloorNode.scaleX = this._frameSize.width / bgFloorNode.width;
const lCurtainNode = cc.find('Canvas/decorate/l_curtain');
lCurtainNode.x = - canvasNode.width / 2;
const rCurtainNode = cc.find('Canvas/decorate/r_curtain');
rCurtainNode.x = canvasNode.width / 2;
const bgTopNode = cc.find('Canvas/decorate/bg_top');
bgTopNode.scaleX = this._frameSize.width / bgTopNode.width;
......@@ -306,6 +298,7 @@ cc.Class({
titleLabel: null,
initTitle() {
/*
const titleBgNode = this.getSprNode('title_bg');
titleBgNode.parent = cc.find('Canvas');
titleBgNode.scale = this._mapScaleMin;
......@@ -314,6 +307,8 @@ cc.Class({
titleBgNode.x = -titleBgNode.parent.width / 2
titleBgNode.y = titleBgNode.parent.height / 2;
*/
const titleBgNode = cc.find('Canvas/title_bg');
const labelNode = new cc.Node();
labelNode.parent = titleBgNode;
......
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