Commit aff6253c authored by yu's avatar yu

调整

parent ead258bc
......@@ -75,46 +75,46 @@
"__id__": 5
},
{
"__id__": 30
"__id__": 29
},
{
"__id__": 163
"__id__": 162
},
{
"__id__": 174
"__id__": 173
},
{
"__id__": 177
"__id__": 176
},
{
"__id__": 180
"__id__": 179
},
{
"__id__": 183
"__id__": 182
},
{
"__id__": 189
"__id__": 188
},
{
"__id__": 194
"__id__": 193
},
{
"__id__": 206
"__id__": 205
},
{
"__id__": 227
"__id__": 226
}
],
"_active": true,
"_components": [
{
"__id__": 241
"__id__": 240
},
{
"__id__": 242
"__id__": 241
},
{
"__id__": 243
"__id__": 242
}
],
"_prefab": null,
......@@ -278,22 +278,22 @@
"__id__": 9
},
{
"__id__": 12
"__id__": 11
},
{
"__id__": 16
"__id__": 15
},
{
"__id__": 23
"__id__": 22
},
{
"__id__": 26
"__id__": 25
}
],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 28
}
],
"_prefab": null,
......@@ -373,7 +373,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 768
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -428,7 +428,7 @@
"__uuid__": "67267d3c-e438-486b-af1c-54ba71d792ad"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -464,80 +464,18 @@
"hideWidth": 0,
"_id": "38TVHyznRC8bPX4MgraS7J"
},
{
"__type__": "cc.Node",
"_name": "bg_cards",
"_objFlags": 0,
"_parent": {
"__id__": 5
},
"_children": [
{
"__id__": 10
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "b9pWhBAkRBe4a4DZIoojBd"
},
{
"__type__": "cc.Node",
"_name": "bg_card",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 5
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 11
"__id__": 10
}
],
"_prefab": null,
......@@ -552,7 +490,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 750
"height": 768
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -570,8 +508,8 @@
0,
0,
1,
1,
1,
0.95,
0.95,
1
]
},
......@@ -593,7 +531,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
"__id__": 9
},
"_enabled": true,
"_materials": [
......@@ -607,7 +545,7 @@
"__uuid__": "11ab4149-d11b-445b-bb96-9af977e836c9"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 2,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -629,13 +567,13 @@
},
"_children": [
{
"__id__": 13
"__id__": 12
}
],
"_active": true,
"_components": [
{
"__id__": 15
"__id__": 14
}
],
"_prefab": null,
......@@ -662,7 +600,7 @@
"ctor": "Float64Array",
"array": [
-561.486,
332.308,
314.449,
0,
0,
0,
......@@ -691,13 +629,13 @@
"_name": "lable",
"_objFlags": 0,
"_parent": {
"__id__": 12
"__id__": 11
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 14
"__id__": 13
}
],
"_prefab": null,
......@@ -753,7 +691,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 12
},
"_enabled": true,
"_materials": [
......@@ -786,7 +724,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
"__id__": 11
},
"_enabled": true,
"_materials": [
......@@ -822,16 +760,16 @@
},
"_children": [
{
"__id__": 17
"__id__": 16
}
],
"_active": false,
"_components": [
{
"__id__": 21
"__id__": 20
},
{
"__id__": 22
"__id__": 21
}
],
"_prefab": null,
......@@ -887,17 +825,17 @@
"_name": "small_mouse",
"_objFlags": 0,
"_parent": {
"__id__": 16
"__id__": 15
},
"_children": [
{
"__id__": 18
"__id__": 17
}
],
"_active": true,
"_components": [
{
"__id__": 20
"__id__": 19
}
],
"_prefab": null,
......@@ -953,13 +891,13 @@
"_name": "light",
"_objFlags": 0,
"_parent": {
"__id__": 17
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 19
"__id__": 18
}
],
"_prefab": null,
......@@ -1015,7 +953,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 17
},
"_enabled": true,
"_materials": [
......@@ -1047,7 +985,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 16
},
"_enabled": true,
"_materials": [
......@@ -1079,7 +1017,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 15
},
"_enabled": false,
"_materials": [
......@@ -1111,7 +1049,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 15
},
"_enabled": true,
"_layoutSize": {
......@@ -1149,10 +1087,10 @@
"_active": true,
"_components": [
{
"__id__": 24
"__id__": 23
},
{
"__id__": 25
"__id__": 24
}
],
"_prefab": null,
......@@ -1208,7 +1146,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 22
},
"_enabled": true,
"_materials": [
......@@ -1240,7 +1178,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 22
},
"_enabled": true,
"alignMode": 1,
......@@ -1273,10 +1211,10 @@
"_active": true,
"_components": [
{
"__id__": 27
"__id__": 26
},
{
"__id__": 28
"__id__": 27
}
],
"_prefab": null,
......@@ -1332,7 +1270,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 25
},
"_enabled": true,
"_materials": [
......@@ -1364,7 +1302,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 25
},
"_enabled": true,
"alignMode": 1,
......@@ -1422,22 +1360,22 @@
},
"_children": [
{
"__id__": 31
"__id__": 30
},
{
"__id__": 54
"__id__": 53
},
{
"__id__": 77
"__id__": 76
},
{
"__id__": 100
"__id__": 99
},
{
"__id__": 121
"__id__": 120
},
{
"__id__": 142
"__id__": 141
}
],
"_active": true,
......@@ -1495,38 +1433,38 @@
"_name": "type1",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 32
"__id__": 31
},
{
"__id__": 35
"__id__": 34
},
{
"__id__": 38
"__id__": 37
},
{
"__id__": 40
"__id__": 39
},
{
"__id__": 43
"__id__": 42
},
{
"__id__": 45
"__id__": 44
},
{
"__id__": 47
"__id__": 46
},
{
"__id__": 50
"__id__": 49
}
],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 52
}
],
"_prefab": null,
......@@ -1582,16 +1520,16 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 32
},
{
"__id__": 34
"__id__": 33
}
],
"_prefab": null,
......@@ -1647,7 +1585,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 31
},
"_enabled": true,
"_materials": [
......@@ -1679,7 +1617,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 31
},
"_enabled": true,
"alignMode": 2,
......@@ -1706,16 +1644,16 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 36
"__id__": 35
},
{
"__id__": 37
"__id__": 36
}
],
"_prefab": null,
......@@ -1771,7 +1709,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1803,7 +1741,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 34
},
"_enabled": true,
"alignMode": 2,
......@@ -1830,13 +1768,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 38
}
],
"_prefab": null,
......@@ -1892,7 +1830,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1925,16 +1863,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 41
"__id__": 40
},
{
"__id__": 42
"__id__": 41
}
],
"_prefab": null,
......@@ -1990,7 +1928,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -2022,7 +1960,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 39
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2090,13 +2028,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 44
"__id__": 43
}
],
"_prefab": null,
......@@ -2152,7 +2090,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -2184,13 +2122,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 46
"__id__": 45
}
],
"_prefab": null,
......@@ -2246,7 +2184,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -2278,16 +2216,16 @@
"_name": "circle_right",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 47
},
{
"__id__": 49
"__id__": 48
}
],
"_prefab": null,
......@@ -2343,7 +2281,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 46
},
"_enabled": true,
"_materials": [
......@@ -2375,7 +2313,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 46
},
"_enabled": true,
"alignMode": 2,
......@@ -2402,16 +2340,16 @@
"_name": "circle_lift",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 50
},
{
"__id__": 52
"__id__": 51
}
],
"_prefab": null,
......@@ -2467,7 +2405,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2499,7 +2437,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 49
},
"_enabled": true,
"alignMode": 2,
......@@ -2526,7 +2464,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 30
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2587,12 +2525,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 32
"__id__": 31
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 36
"__id__": 35
},
"checkEvents": [],
"_id": "2aCrFmoOVCD59nRlDx4eGs"
......@@ -2602,38 +2540,38 @@
"_name": "type2",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 55
"__id__": 54
},
{
"__id__": 58
"__id__": 57
},
{
"__id__": 61
"__id__": 60
},
{
"__id__": 63
"__id__": 62
},
{
"__id__": 66
"__id__": 65
},
{
"__id__": 68
"__id__": 67
},
{
"__id__": 70
"__id__": 69
},
{
"__id__": 73
"__id__": 72
}
],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 75
}
],
"_prefab": null,
......@@ -2689,16 +2627,16 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 54
"__id__": 53
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 55
},
{
"__id__": 57
"__id__": 56
}
],
"_prefab": null,
......@@ -2754,7 +2692,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2786,7 +2724,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 54
},
"_enabled": true,
"alignMode": 2,
......@@ -2813,16 +2751,16 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 54
"__id__": 53
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 59
"__id__": 58
},
{
"__id__": 60
"__id__": 59
}
],
"_prefab": null,
......@@ -2878,7 +2816,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2910,7 +2848,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 57
},
"_enabled": true,
"alignMode": 2,
......@@ -2937,13 +2875,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 53
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 61
}
],
"_prefab": null,
......@@ -2999,7 +2937,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -3032,16 +2970,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 53
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 64
"__id__": 63
},
{
"__id__": 65
"__id__": 64
}
],
"_prefab": null,
......@@ -3097,7 +3035,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -3129,7 +3067,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 62
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3197,13 +3135,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 53
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 67
"__id__": 66
}
],
"_prefab": null,
......@@ -3259,7 +3197,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3291,13 +3229,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 53
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 69
"__id__": 68
}
],
"_prefab": null,
......@@ -3353,7 +3291,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -3385,16 +3323,16 @@
"_name": "circle_lift",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 53
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 70
},
{
"__id__": 72
"__id__": 71
}
],
"_prefab": null,
......@@ -3450,7 +3388,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 69
},
"_enabled": true,
"_materials": [
......@@ -3482,7 +3420,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 69
},
"_enabled": true,
"alignMode": 2,
......@@ -3509,16 +3447,16 @@
"_name": "circle_right",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 53
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 73
},
{
"__id__": 75
"__id__": 74
}
],
"_prefab": null,
......@@ -3574,7 +3512,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3606,7 +3544,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 72
},
"_enabled": true,
"alignMode": 2,
......@@ -3633,7 +3571,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 53
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3694,12 +3632,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 55
"__id__": 54
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 59
"__id__": 58
},
"checkEvents": [],
"_id": "89N60jXh9AHJj/0pSyJdQy"
......@@ -3709,38 +3647,38 @@
"_name": "type3",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 78
"__id__": 77
},
{
"__id__": 81
"__id__": 80
},
{
"__id__": 84
"__id__": 83
},
{
"__id__": 86
"__id__": 85
},
{
"__id__": 89
"__id__": 88
},
{
"__id__": 91
"__id__": 90
},
{
"__id__": 93
"__id__": 92
},
{
"__id__": 96
"__id__": 95
}
],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 98
}
],
"_prefab": null,
......@@ -3796,16 +3734,16 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 77
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 78
},
{
"__id__": 80
"__id__": 79
}
],
"_prefab": null,
......@@ -3861,7 +3799,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -3893,7 +3831,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 77
},
"_enabled": true,
"alignMode": 2,
......@@ -3920,16 +3858,16 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 77
"__id__": 76
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 82
"__id__": 81
},
{
"__id__": 83
"__id__": 82
}
],
"_prefab": null,
......@@ -3985,7 +3923,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -4017,7 +3955,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 80
},
"_enabled": true,
"alignMode": 2,
......@@ -4044,13 +3982,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 84
}
],
"_prefab": null,
......@@ -4106,7 +4044,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -4139,16 +4077,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 76
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 87
"__id__": 86
},
{
"__id__": 88
"__id__": 87
}
],
"_prefab": null,
......@@ -4204,7 +4142,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -4236,7 +4174,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 85
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4304,13 +4242,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 76
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 90
"__id__": 89
}
],
"_prefab": null,
......@@ -4366,7 +4304,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4398,13 +4336,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 76
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 92
"__id__": 91
}
],
"_prefab": null,
......@@ -4460,7 +4398,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4492,16 +4430,16 @@
"_name": "circle_right",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 93
},
{
"__id__": 95
"__id__": 94
}
],
"_prefab": null,
......@@ -4557,7 +4495,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -4589,7 +4527,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 92
},
"_enabled": true,
"alignMode": 2,
......@@ -4616,16 +4554,16 @@
"_name": "circle_lift",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 96
},
{
"__id__": 98
"__id__": 97
}
],
"_prefab": null,
......@@ -4681,7 +4619,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -4713,7 +4651,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 95
},
"_enabled": true,
"alignMode": 2,
......@@ -4740,7 +4678,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 76
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4801,12 +4739,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 78
"__id__": 77
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 82
"__id__": 81
},
"checkEvents": [],
"_id": "b5yftj0ARET71vY4W4KKEP"
......@@ -4816,38 +4754,38 @@
"_name": "type4",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 101
"__id__": 100
},
{
"__id__": 103
"__id__": 102
},
{
"__id__": 105
"__id__": 104
},
{
"__id__": 107
"__id__": 106
},
{
"__id__": 110
"__id__": 109
},
{
"__id__": 112
"__id__": 111
},
{
"__id__": 114
"__id__": 113
},
{
"__id__": 117
"__id__": 116
}
],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 119
}
],
"_prefab": null,
......@@ -4903,13 +4841,13 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 100
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 101
}
],
"_prefab": null,
......@@ -4965,7 +4903,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -4997,13 +4935,13 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 100
"__id__": 99
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 104
"__id__": 103
}
],
"_prefab": null,
......@@ -5059,7 +4997,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -5091,13 +5029,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 105
}
],
"_prefab": null,
......@@ -5153,7 +5091,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 104
},
"_enabled": true,
"_materials": [
......@@ -5186,16 +5124,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 99
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 108
"__id__": 107
},
{
"__id__": 109
"__id__": 108
}
],
"_prefab": null,
......@@ -5251,7 +5189,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 106
},
"_enabled": true,
"_materials": [
......@@ -5283,7 +5221,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 106
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5351,13 +5289,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 99
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 111
"__id__": 110
}
],
"_prefab": null,
......@@ -5413,7 +5351,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 109
},
"_enabled": true,
"_materials": [
......@@ -5445,13 +5383,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 99
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 113
"__id__": 112
}
],
"_prefab": null,
......@@ -5507,7 +5445,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 111
},
"_enabled": true,
"_materials": [
......@@ -5539,16 +5477,16 @@
"_name": "circle_right",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 114
},
{
"__id__": 116
"__id__": 115
}
],
"_prefab": null,
......@@ -5604,7 +5542,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 113
},
"_enabled": true,
"_materials": [
......@@ -5636,7 +5574,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 113
},
"_enabled": true,
"alignMode": 2,
......@@ -5663,16 +5601,16 @@
"_name": "circle_lift",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 117
},
{
"__id__": 119
"__id__": 118
}
],
"_prefab": null,
......@@ -5728,7 +5666,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 116
},
"_enabled": true,
"_materials": [
......@@ -5760,7 +5698,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 116
},
"_enabled": true,
"alignMode": 2,
......@@ -5787,7 +5725,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 99
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5848,12 +5786,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 101
"__id__": 100
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 104
"__id__": 103
},
"checkEvents": [],
"_id": "e3dcc2d29FGagWFI0mKFNN"
......@@ -5863,38 +5801,38 @@
"_name": "type5",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 122
"__id__": 121
},
{
"__id__": 124
"__id__": 123
},
{
"__id__": 126
"__id__": 125
},
{
"__id__": 128
"__id__": 127
},
{
"__id__": 131
"__id__": 130
},
{
"__id__": 133
"__id__": 132
},
{
"__id__": 135
"__id__": 134
},
{
"__id__": 138
"__id__": 137
}
],
"_active": true,
"_components": [
{
"__id__": 141
"__id__": 140
}
],
"_prefab": null,
......@@ -5950,13 +5888,13 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 121
"__id__": 120
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 123
"__id__": 122
}
],
"_prefab": null,
......@@ -6012,7 +5950,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -6044,13 +5982,13 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 121
"__id__": 120
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 125
"__id__": 124
}
],
"_prefab": null,
......@@ -6106,7 +6044,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 123
},
"_enabled": true,
"_materials": [
......@@ -6138,13 +6076,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 121
"__id__": 120
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 127
"__id__": 126
}
],
"_prefab": null,
......@@ -6200,7 +6138,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 125
},
"_enabled": true,
"_materials": [
......@@ -6233,16 +6171,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 121
"__id__": 120
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 129
"__id__": 128
},
{
"__id__": 130
"__id__": 129
}
],
"_prefab": null,
......@@ -6298,7 +6236,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 128
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -6330,7 +6268,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 128
"__id__": 127
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6398,13 +6336,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 121
"__id__": 120
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 132
"__id__": 131
}
],
"_prefab": null,
......@@ -6460,7 +6398,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 130
},
"_enabled": true,
"_materials": [
......@@ -6492,13 +6430,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 121
"__id__": 120
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 134
"__id__": 133
}
],
"_prefab": null,
......@@ -6554,7 +6492,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
"__id__": 132
},
"_enabled": true,
"_materials": [
......@@ -6586,16 +6524,16 @@
"_name": "circle_right",
"_objFlags": 0,
"_parent": {
"__id__": 121
"__id__": 120
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 135
},
{
"__id__": 137
"__id__": 136
}
],
"_prefab": null,
......@@ -6651,7 +6589,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -6683,7 +6621,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 134
},
"_enabled": true,
"alignMode": 2,
......@@ -6710,16 +6648,16 @@
"_name": "circle_lift",
"_objFlags": 0,
"_parent": {
"__id__": 121
"__id__": 120
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 139
"__id__": 138
},
{
"__id__": 140
"__id__": 139
}
],
"_prefab": null,
......@@ -6775,7 +6713,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 137
},
"_enabled": true,
"_materials": [
......@@ -6807,7 +6745,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 137
},
"_enabled": true,
"alignMode": 2,
......@@ -6834,7 +6772,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
"__id__": 120
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6895,12 +6833,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 122
"__id__": 121
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 125
"__id__": 124
},
"checkEvents": [],
"_id": "faECyFJlpCSJFwTLFjx6v5"
......@@ -6910,38 +6848,38 @@
"_name": "type6",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 143
"__id__": 142
},
{
"__id__": 145
"__id__": 144
},
{
"__id__": 147
"__id__": 146
},
{
"__id__": 149
"__id__": 148
},
{
"__id__": 152
"__id__": 151
},
{
"__id__": 154
"__id__": 153
},
{
"__id__": 156
"__id__": 155
},
{
"__id__": 159
"__id__": 158
}
],
"_active": true,
"_components": [
{
"__id__": 162
"__id__": 161
}
],
"_prefab": null,
......@@ -6997,13 +6935,13 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 142
"__id__": 141
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 144
"__id__": 143
}
],
"_prefab": null,
......@@ -7059,7 +6997,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 143
"__id__": 142
},
"_enabled": true,
"_materials": [
......@@ -7091,13 +7029,13 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 142
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 146
"__id__": 145
}
],
"_prefab": null,
......@@ -7153,7 +7091,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 144
},
"_enabled": true,
"_materials": [
......@@ -7185,13 +7123,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 142
"__id__": 141
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 148
"__id__": 147
}
],
"_prefab": null,
......@@ -7247,7 +7185,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 146
},
"_enabled": true,
"_materials": [
......@@ -7280,16 +7218,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 142
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 150
"__id__": 149
},
{
"__id__": 151
"__id__": 150
}
],
"_prefab": null,
......@@ -7345,7 +7283,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
"__id__": 148
},
"_enabled": true,
"_materials": [
......@@ -7377,7 +7315,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
"__id__": 148
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7445,13 +7383,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 142
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 153
"__id__": 152
}
],
"_prefab": null,
......@@ -7507,7 +7445,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 151
},
"_enabled": true,
"_materials": [
......@@ -7539,13 +7477,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 142
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 155
"__id__": 154
}
],
"_prefab": null,
......@@ -7601,7 +7539,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 153
},
"_enabled": true,
"_materials": [
......@@ -7633,16 +7571,16 @@
"_name": "circle_right",
"_objFlags": 0,
"_parent": {
"__id__": 142
"__id__": 141
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 157
"__id__": 156
},
{
"__id__": 158
"__id__": 157
}
],
"_prefab": null,
......@@ -7698,7 +7636,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 155
},
"_enabled": true,
"_materials": [
......@@ -7730,7 +7668,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 155
},
"_enabled": true,
"alignMode": 2,
......@@ -7757,16 +7695,16 @@
"_name": "circle_lift",
"_objFlags": 0,
"_parent": {
"__id__": 142
"__id__": 141
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 160
"__id__": 159
},
{
"__id__": 161
"__id__": 160
}
],
"_prefab": null,
......@@ -7822,7 +7760,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 159
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7854,7 +7792,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 159
"__id__": 158
},
"_enabled": true,
"alignMode": 2,
......@@ -7881,7 +7819,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 141
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7942,12 +7880,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 143
"__id__": 142
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 146
"__id__": 145
},
"checkEvents": [],
"_id": "14APVHVfdO2LefVZ8Uy7FJ"
......@@ -7961,22 +7899,22 @@
},
"_children": [
{
"__id__": 164
"__id__": 163
},
{
"__id__": 166
"__id__": 165
},
{
"__id__": 169
"__id__": 168
},
{
"__id__": 171
"__id__": 170
}
],
"_active": true,
"_components": [
{
"__id__": 173
"__id__": 172
}
],
"_prefab": null,
......@@ -8002,7 +7940,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-5.729,
0,
271.194,
0,
0,
......@@ -8032,13 +7970,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 165
"__id__": 164
}
],
"_prefab": null,
......@@ -8094,7 +8032,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 163
},
"_enabled": true,
"_materials": [
......@@ -8127,16 +8065,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 167
"__id__": 166
},
{
"__id__": 168
"__id__": 167
}
],
"_prefab": null,
......@@ -8192,7 +8130,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 165
},
"_enabled": true,
"_materials": [
......@@ -8224,7 +8162,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 165
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8292,13 +8230,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 162
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 170
"__id__": 169
}
],
"_prefab": null,
......@@ -8354,7 +8292,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 168
},
"_enabled": true,
"_materials": [
......@@ -8386,13 +8324,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 162
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 172
"__id__": 171
}
],
"_prefab": null,
......@@ -8448,7 +8386,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 170
},
"_enabled": true,
"_materials": [
......@@ -8480,7 +8418,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 162
},
"_enabled": true,
"_materials": [
......@@ -8518,10 +8456,10 @@
"_active": true,
"_components": [
{
"__id__": 175
"__id__": 174
},
{
"__id__": 176
"__id__": 175
}
],
"_prefab": null,
......@@ -8577,7 +8515,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 173
},
"_enabled": true,
"_materials": [
......@@ -8610,7 +8548,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 173
},
"_enabled": true,
"alignMode": 1,
......@@ -8643,10 +8581,10 @@
"_active": true,
"_components": [
{
"__id__": 178
"__id__": 177
},
{
"__id__": 179
"__id__": 178
}
],
"_prefab": null,
......@@ -8702,7 +8640,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 176
},
"_enabled": true,
"_layoutSize": {
......@@ -8720,10 +8658,10 @@
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingTop": 10,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 35,
"_N$spacingY": 30,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
......@@ -8734,7 +8672,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 176
},
"_enabled": true,
"allowSwitchOff": true,
......@@ -8752,10 +8690,10 @@
"_active": true,
"_components": [
{
"__id__": 181
"__id__": 180
},
{
"__id__": 182
"__id__": 181
}
],
"_prefab": null,
......@@ -8811,7 +8749,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 179
},
"_enabled": true,
"_layoutSize": {
......@@ -8843,7 +8781,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 179
},
"_enabled": true,
"allowSwitchOff": true,
......@@ -8859,7 +8797,7 @@
},
"_children": [
{
"__id__": 184
"__id__": 183
}
],
"_active": true,
......@@ -8917,14 +8855,14 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 183
"__id__": 182
},
"_children": [
{
"__id__": 185
"__id__": 184
},
{
"__id__": 187
"__id__": 186
}
],
"_active": true,
......@@ -8982,13 +8920,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 184
"__id__": 183
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 186
"__id__": 185
}
],
"_prefab": null,
......@@ -9044,7 +8982,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 185
"__id__": 184
},
"_enabled": true,
"_clip": {
......@@ -9063,13 +9001,13 @@
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 184
"__id__": 183
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 188
"__id__": 187
}
],
"_prefab": null,
......@@ -9125,7 +9063,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 186
},
"_enabled": true,
"_clip": {
......@@ -9148,13 +9086,13 @@
},
"_children": [
{
"__id__": 190
"__id__": 189
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 193
"__id__": 192
},
"_opacity": 255,
"_color": {
......@@ -9208,17 +9146,17 @@
"_name": "particle_star",
"_objFlags": 0,
"_parent": {
"__id__": 189
"__id__": 188
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 191
"__id__": 190
}
],
"_prefab": {
"__id__": 192
"__id__": 191
},
"_opacity": 255,
"_color": {
......@@ -9272,7 +9210,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 189
},
"_enabled": true,
"_materials": [
......@@ -9373,7 +9311,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 189
"__id__": 188
},
"asset": {
"__uuid__": "d09bc553-5bcd-4ca6-a1f3-ac3c614315d2"
......@@ -9384,7 +9322,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 189
"__id__": 188
},
"asset": {
"__uuid__": "d09bc553-5bcd-4ca6-a1f3-ac3c614315d2"
......@@ -9401,23 +9339,23 @@
},
"_children": [
{
"__id__": 195
"__id__": 194
},
{
"__id__": 198
"__id__": 197
},
{
"__id__": 201
"__id__": 200
}
],
"_active": false,
"_components": [
{
"__id__": 204
"__id__": 203
}
],
"_prefab": {
"__id__": 205
"__id__": 204
},
"_opacity": 255,
"_color": {
......@@ -9471,17 +9409,17 @@
"_name": "ske_candy",
"_objFlags": 0,
"_parent": {
"__id__": 194
"__id__": 193
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 196
"__id__": 195
}
],
"_prefab": {
"__id__": 197
"__id__": 196
},
"_opacity": 255,
"_color": {
......@@ -9535,7 +9473,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 194
},
"_enabled": true,
"_materials": [
......@@ -9573,7 +9511,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 194
"__id__": 193
},
"asset": {
"__uuid__": "baf374f1-c8c5-4e57-a484-1fd6b41fb37b"
......@@ -9586,17 +9524,17 @@
"_name": "ske",
"_objFlags": 0,
"_parent": {
"__id__": 194
"__id__": 193
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 199
"__id__": 198
}
],
"_prefab": {
"__id__": 200
"__id__": 199
},
"_opacity": 255,
"_color": {
......@@ -9650,7 +9588,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 198
"__id__": 197
},
"_enabled": true,
"_materials": [
......@@ -9688,7 +9626,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 194
"__id__": 193
},
"asset": {
"__uuid__": "baf374f1-c8c5-4e57-a484-1fd6b41fb37b"
......@@ -9701,17 +9639,17 @@
"_name": "block",
"_objFlags": 0,
"_parent": {
"__id__": 194
"__id__": 193
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 202
"__id__": 201
}
],
"_prefab": {
"__id__": 203
"__id__": 202
},
"_opacity": 255,
"_color": {
......@@ -9765,7 +9703,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 201
"__id__": 200
},
"_enabled": true,
"_id": "274cyj0VBBIZjdn5np2Z+3"
......@@ -9773,7 +9711,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 194
"__id__": 193
},
"asset": {
"__uuid__": "baf374f1-c8c5-4e57-a484-1fd6b41fb37b"
......@@ -9786,7 +9724,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 194
"__id__": 193
},
"_enabled": true,
"startPosition": {
......@@ -9805,7 +9743,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 194
"__id__": 193
},
"asset": {
"__uuid__": "baf374f1-c8c5-4e57-a484-1fd6b41fb37b"
......@@ -9822,26 +9760,26 @@
},
"_children": [
{
"__id__": 207
"__id__": 206
},
{
"__id__": 210
"__id__": 209
},
{
"__id__": 213
"__id__": 212
},
{
"__id__": 217
"__id__": 216
}
],
"_active": true,
"_components": [
{
"__id__": 225
"__id__": 224
}
],
"_prefab": {
"__id__": 226
"__id__": 225
},
"_opacity": 255,
"_color": {
......@@ -9895,17 +9833,17 @@
"_name": "shadow",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 205
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 208
"__id__": 207
}
],
"_prefab": {
"__id__": 209
"__id__": 208
},
"_opacity": 255,
"_color": {
......@@ -9959,7 +9897,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 207
"__id__": 206
},
"_enabled": true,
"_materials": [
......@@ -9987,7 +9925,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 206
"__id__": 205
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -10000,17 +9938,17 @@
"_name": "ske",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 205
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 211
"__id__": 210
}
],
"_prefab": {
"__id__": 212
"__id__": 211
},
"_opacity": 255,
"_color": {
......@@ -10064,7 +10002,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 210
"__id__": 209
},
"_enabled": true,
"_materials": [
......@@ -10102,7 +10040,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 206
"__id__": 205
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -10115,20 +10053,20 @@
"_name": "block",
"_objFlags": 512,
"_parent": {
"__id__": 206
"__id__": 205
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 214
"__id__": 213
},
{
"__id__": 215
"__id__": 214
}
],
"_prefab": {
"__id__": 216
"__id__": 215
},
"_opacity": 100,
"_color": {
......@@ -10182,7 +10120,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 213
"__id__": 212
},
"_enabled": true,
"_id": "e74iLL2ftDd7amkVjGOFpW"
......@@ -10192,7 +10130,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 213
"__id__": 212
},
"_enabled": false,
"_materials": [
......@@ -10222,7 +10160,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 206
"__id__": 205
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -10235,20 +10173,20 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 205
},
"_children": [
{
"__id__": 218
"__id__": 217
},
{
"__id__": 221
"__id__": 220
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 224
"__id__": 223
},
"_opacity": 255,
"_color": {
......@@ -10302,17 +10240,17 @@
"_name": "enter",
"_objFlags": 0,
"_parent": {
"__id__": 217
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 219
"__id__": 218
}
],
"_prefab": {
"__id__": 220
"__id__": 219
},
"_opacity": 255,
"_color": {
......@@ -10366,7 +10304,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 218
"__id__": 217
},
"_enabled": true,
"_clip": {
......@@ -10383,7 +10321,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 206
"__id__": 205
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -10396,17 +10334,17 @@
"_name": "leave",
"_objFlags": 0,
"_parent": {
"__id__": 217
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 222
"__id__": 221
}
],
"_prefab": {
"__id__": 223
"__id__": 222
},
"_opacity": 255,
"_color": {
......@@ -10460,7 +10398,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 220
},
"_enabled": true,
"_clip": {
......@@ -10477,7 +10415,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 206
"__id__": 205
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -10488,7 +10426,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 206
"__id__": 205
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -10501,7 +10439,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
"__id__": 205
},
"_enabled": true,
"startPosition": {
......@@ -10520,7 +10458,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 206
"__id__": 205
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -10537,17 +10475,17 @@
},
"_children": [
{
"__id__": 228
"__id__": 227
}
],
"_active": true,
"_components": [
{
"__id__": 239
"__id__": 238
}
],
"_prefab": {
"__id__": 240
"__id__": 239
},
"_opacity": 255,
"_color": {
......@@ -10601,23 +10539,23 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 227
"__id__": 226
},
"_children": [
{
"__id__": 229
"__id__": 228
},
{
"__id__": 232
"__id__": 231
},
{
"__id__": 235
"__id__": 234
}
],
"_active": false,
"_components": [],
"_prefab": {
"__id__": 238
"__id__": 237
},
"_opacity": 255,
"_color": {
......@@ -10671,17 +10609,17 @@
"_name": "star_bg",
"_objFlags": 0,
"_parent": {
"__id__": 228
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 230
"__id__": 229
}
],
"_prefab": {
"__id__": 231
"__id__": 230
},
"_opacity": 255,
"_color": {
......@@ -10735,7 +10673,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 229
"__id__": 228
},
"_enabled": true,
"_materials": [
......@@ -10765,7 +10703,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 227
"__id__": 226
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......@@ -10778,17 +10716,17 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 228
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 233
"__id__": 232
}
],
"_prefab": {
"__id__": 234
"__id__": 233
},
"_opacity": 255,
"_color": {
......@@ -10842,7 +10780,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 232
"__id__": 231
},
"_enabled": true,
"_materials": [
......@@ -10872,7 +10810,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 227
"__id__": 226
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......@@ -10885,17 +10823,17 @@
"_name": "icon_bigstar",
"_objFlags": 0,
"_parent": {
"__id__": 228
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 236
"__id__": 235
}
],
"_prefab": {
"__id__": 237
"__id__": 236
},
"_opacity": 255,
"_color": {
......@@ -10949,7 +10887,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 235
"__id__": 234
},
"_enabled": true,
"_materials": [
......@@ -10979,7 +10917,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 227
"__id__": 226
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......@@ -10990,7 +10928,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 227
"__id__": 226
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......@@ -11003,13 +10941,13 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 226
},
"_enabled": true,
"position": {
"__type__": "cc.Vec2",
"x": 595,
"y": 335
"y": 325
},
"bigStarClip": {
"__uuid__": "96ca71f8-e1b4-4da4-be4f-7859178a9f44"
......@@ -11022,7 +10960,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 227
"__id__": 226
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......
......@@ -274,7 +274,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.showLayout();
}
private checkisPicOrText() {
if (this.upArr.length != 4) return false;
if (this.upArr.length == 5) return false;
let t1 = this.upArr[0].type == 1;
let t2 = this.downArr[0].type == 1;
return t1 && t2;
......@@ -286,8 +286,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
lift.removeAllChildren();
right.removeAllChildren();
let isSpY = this.checkisPicOrText();
right.getComponent(cc.Layout).spacingY = isSpY ? 30 : 10;
lift.getComponent(cc.Layout).spacingY = isSpY ? 30 : 10;
right.getComponent(cc.Layout).spacingY = isSpY ? this.upArr.length == 3 ? 60 : 30 : 10;
lift.getComponent(cc.Layout).spacingY = isSpY ? this.upArr.length == 3 ? 60 : 30 : 10;
right.getComponent(cc.Layout).paddingTop = isSpY ? this.upArr.length == 3 ? 30 : 10 : 0;
lift.getComponent(cc.Layout).paddingTop = isSpY ? this.upArr.length == 3 ? 30 : 10 : 0;
this.upArr.forEach((item) => {
if (item.type == 1) {
......@@ -585,9 +587,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
} else if (this.upArr.length == 3) {
if (type == 1) {
item = cc.instantiate(cc.find("items/type6", this.node));
if (isSpY) item = cc.instantiate(cc.find("items/type1", this.node));
else item = cc.instantiate(cc.find("items/type6", this.node));
} else {
item = cc.instantiate(cc.find("items/type6", this.node));
if (isSpY) item = cc.instantiate(cc.find("items/type4", this.node));
else item = cc.instantiate(cc.find("items/type6", this.node));
}
}
return item;
......
......@@ -55,34 +55,34 @@ export const defaultData = {
"audio_url": ""
}
},
{
"up": {
"type": 1,
"pic_url": "",
"text": "郭德付个",
"audio_url": ""
},
"down": {
"type": 1,
"pic_url": "",
"text": "能不能看",
"audio_url": ""
}
},
{
"up": {
"type": 1,
"pic_url": "",
"text": "女包",
"audio_url": ""
},
"down": {
"type": 1,
"pic_url": "",
"text": "牛牛斯蒂芬",
"audio_url": ""
}
}
// {
// "up": {
// "type": 1,
// "pic_url": "",
// "text": "郭德付个",
// "audio_url": ""
// },
// "down": {
// "type": 1,
// "pic_url": "",
// "text": "能不能看",
// "audio_url": ""
// }
// },
// {
// "up": {
// "type": 1,
// "pic_url": "",
// "text": "女包",
// "audio_url": ""
// },
// "down": {
// "type": 1,
// "pic_url": "",
// "text": "牛牛斯蒂芬",
// "audio_url": ""
// }
// }
]
}, {
"title": "非凡哥的",
......
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