Commit 9b7bade4 authored by yu's avatar yu

适配

parent 3ba05101
......@@ -75,46 +75,46 @@
"__id__": 5
},
{
"__id__": 26
"__id__": 30
},
{
"__id__": 123
"__id__": 127
},
{
"__id__": 134
"__id__": 138
},
{
"__id__": 137
"__id__": 141
},
{
"__id__": 140
"__id__": 144
},
{
"__id__": 143
"__id__": 147
},
{
"__id__": 149
"__id__": 153
},
{
"__id__": 154
"__id__": 158
},
{
"__id__": 166
"__id__": 170
},
{
"__id__": 187
"__id__": 191
}
],
"_active": true,
"_components": [
{
"__id__": 201
"__id__": 205
},
{
"__id__": 202
"__id__": 206
},
{
"__id__": 203
"__id__": 207
}
],
"_prefab": null,
......@@ -275,23 +275,27 @@
"__id__": 6
},
{
"__id__": 8
"__id__": 9
},
{
"__id__": 11
"__id__": 12
},
{
"__id__": 15
"__id__": 16
},
{
"__id__": 22
"__id__": 23
},
{
"__id__": 24
"__id__": 26
}
],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 29
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -303,8 +307,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
"width": 1280,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -352,6 +356,9 @@
"_components": [
{
"__id__": 7
},
{
"__id__": 8
}
],
"_prefab": null,
......@@ -434,6 +441,29 @@
"_atlas": null,
"_id": "f8Z7pf8plL5bcI7uvCYh2a"
},
{
"__type__": "41ab1NDhspKnK71tVa12tmb",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
},
"_enabled": true,
"r_width": 1,
"r_height": 1,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 0,
"p_bottom": 0,
"black": 0,
"noHead": 0,
"debug": 0,
"hideHeight": 0,
"hideWidth": 0,
"_id": "38TVHyznRC8bPX4MgraS7J"
},
{
"__type__": "cc.Node",
"_name": "bg_cards",
......@@ -443,7 +473,7 @@
},
"_children": [
{
"__id__": 9
"__id__": 10
}
],
"_active": true,
......@@ -501,13 +531,13 @@
"_name": "bg_card",
"_objFlags": 0,
"_parent": {
"__id__": 8
"__id__": 9
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 10
"__id__": 11
}
],
"_prefab": null,
......@@ -563,7 +593,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
"__id__": 10
},
"_enabled": true,
"_materials": [
......@@ -599,13 +629,13 @@
},
"_children": [
{
"__id__": 12
"__id__": 13
}
],
"_active": true,
"_components": [
{
"__id__": 14
"__id__": 15
}
],
"_prefab": null,
......@@ -661,13 +691,13 @@
"_name": "lable",
"_objFlags": 0,
"_parent": {
"__id__": 11
"__id__": 12
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 13
"__id__": 14
}
],
"_prefab": null,
......@@ -723,7 +753,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
"__id__": 13
},
"_enabled": true,
"_materials": [
......@@ -756,7 +786,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 12
},
"_enabled": true,
"_materials": [
......@@ -792,16 +822,16 @@
},
"_children": [
{
"__id__": 16
"__id__": 17
}
],
"_active": false,
"_components": [
{
"__id__": 20
"__id__": 21
},
{
"__id__": 21
"__id__": 22
}
],
"_prefab": null,
......@@ -857,17 +887,17 @@
"_name": "small_mouse",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [
{
"__id__": 17
"__id__": 18
}
],
"_active": true,
"_components": [
{
"__id__": 19
"__id__": 20
}
],
"_prefab": null,
......@@ -923,13 +953,13 @@
"_name": "light",
"_objFlags": 0,
"_parent": {
"__id__": 16
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 18
"__id__": 19
}
],
"_prefab": null,
......@@ -985,7 +1015,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 18
},
"_enabled": true,
"_materials": [
......@@ -1017,7 +1047,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 17
},
"_enabled": true,
"_materials": [
......@@ -1049,7 +1079,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 16
},
"_enabled": false,
"_materials": [
......@@ -1081,7 +1111,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 16
},
"_enabled": true,
"_layoutSize": {
......@@ -1119,7 +1149,10 @@
"_active": true,
"_components": [
{
"__id__": 23
"__id__": 24
},
{
"__id__": 25
}
],
"_prefab": null,
......@@ -1145,8 +1178,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
501.928,
-282.454,
502.5,
-264.5,
0,
0,
0,
......@@ -1175,7 +1208,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 23
},
"_enabled": true,
"_materials": [
......@@ -1202,6 +1235,33 @@
"_atlas": null,
"_id": "e0jwRatoRL+qkUzwwQgYyw"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 36,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "ca5tVvwQNACppwM+AiE9A0"
},
{
"__type__": "cc.Node",
"_name": "bg_mushroom_left",
......@@ -1213,7 +1273,10 @@
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 27
},
{
"__id__": 28
}
],
"_prefab": null,
......@@ -1239,8 +1302,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-504.19,
-294.111,
-503.5,
-274,
0,
0,
0,
......@@ -1269,7 +1332,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 26
},
"_enabled": true,
"_materials": [
......@@ -1296,6 +1359,60 @@
"_atlas": null,
"_id": "96r2VB9/9IH7tNBQCUVZh1"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 12,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "2coOor3xlHl7kTh5uFABvF"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1280,
"_originalHeight": 720,
"_id": "b3Ucs71eNLdazCm7W+0bWL"
},
{
"__type__": "cc.Node",
"_name": "items",
......@@ -1305,22 +1422,22 @@
},
"_children": [
{
"__id__": 27
"__id__": 31
},
{
"__id__": 44
"__id__": 48
},
{
"__id__": 61
"__id__": 65
},
{
"__id__": 78
"__id__": 82
},
{
"__id__": 93
"__id__": 97
},
{
"__id__": 108
"__id__": 112
}
],
"_active": true,
......@@ -1378,32 +1495,32 @@
"_name": "type1",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 30
},
"_children": [
{
"__id__": 28
"__id__": 32
},
{
"__id__": 31
"__id__": 35
},
{
"__id__": 34
"__id__": 38
},
{
"__id__": 36
"__id__": 40
},
{
"__id__": 39
"__id__": 43
},
{
"__id__": 41
"__id__": 45
}
],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 47
}
],
"_prefab": null,
......@@ -1459,16 +1576,16 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 27
"__id__": 31
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 33
},
{
"__id__": 30
"__id__": 34
}
],
"_prefab": null,
......@@ -1524,7 +1641,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 32
},
"_enabled": true,
"_materials": [
......@@ -1556,7 +1673,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 32
},
"_enabled": true,
"alignMode": 2,
......@@ -1583,16 +1700,16 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 27
"__id__": 31
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 32
"__id__": 36
},
{
"__id__": 33
"__id__": 37
}
],
"_prefab": null,
......@@ -1648,7 +1765,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1680,7 +1797,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 35
},
"_enabled": true,
"alignMode": 2,
......@@ -1707,13 +1824,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 31
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 39
}
],
"_prefab": null,
......@@ -1769,7 +1886,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 38
},
"_enabled": true,
"_materials": [
......@@ -1802,16 +1919,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 31
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 37
"__id__": 41
},
{
"__id__": 38
"__id__": 42
}
],
"_prefab": null,
......@@ -1867,7 +1984,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 40
},
"_enabled": true,
"_materials": [
......@@ -1899,7 +2016,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 40
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1967,13 +2084,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 31
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 40
"__id__": 44
}
],
"_prefab": null,
......@@ -2029,7 +2146,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2061,13 +2178,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 31
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 42
"__id__": 46
}
],
"_prefab": null,
......@@ -2123,7 +2240,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2155,7 +2272,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 31
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2216,12 +2333,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 28
"__id__": 32
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 32
"__id__": 36
},
"checkEvents": [],
"_id": "2aCrFmoOVCD59nRlDx4eGs"
......@@ -2231,32 +2348,32 @@
"_name": "type2",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 30
},
"_children": [
{
"__id__": 45
"__id__": 49
},
{
"__id__": 48
"__id__": 52
},
{
"__id__": 51
"__id__": 55
},
{
"__id__": 53
"__id__": 57
},
{
"__id__": 56
"__id__": 60
},
{
"__id__": 58
"__id__": 62
}
],
"_active": true,
"_components": [
{
"__id__": 60
"__id__": 64
}
],
"_prefab": null,
......@@ -2312,16 +2429,16 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 44
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 50
},
{
"__id__": 47
"__id__": 51
}
],
"_prefab": null,
......@@ -2377,7 +2494,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2409,7 +2526,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 49
},
"_enabled": true,
"alignMode": 2,
......@@ -2436,16 +2553,16 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 44
"__id__": 48
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 49
"__id__": 53
},
{
"__id__": 50
"__id__": 54
}
],
"_prefab": null,
......@@ -2501,7 +2618,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2533,7 +2650,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 52
},
"_enabled": true,
"alignMode": 2,
......@@ -2560,13 +2677,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 56
}
],
"_prefab": null,
......@@ -2622,7 +2739,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2655,16 +2772,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 48
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 54
"__id__": 58
},
{
"__id__": 55
"__id__": 59
}
],
"_prefab": null,
......@@ -2720,7 +2837,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2752,7 +2869,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 57
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2820,13 +2937,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 48
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 57
"__id__": 61
}
],
"_prefab": null,
......@@ -2882,7 +2999,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -2914,13 +3031,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 48
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 59
"__id__": 63
}
],
"_prefab": null,
......@@ -2976,7 +3093,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -3008,7 +3125,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 48
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3069,12 +3186,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 45
"__id__": 49
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 49
"__id__": 53
},
"checkEvents": [],
"_id": "89N60jXh9AHJj/0pSyJdQy"
......@@ -3084,32 +3201,32 @@
"_name": "type3",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 30
},
"_children": [
{
"__id__": 62
"__id__": 66
},
{
"__id__": 65
"__id__": 69
},
{
"__id__": 68
"__id__": 72
},
{
"__id__": 70
"__id__": 74
},
{
"__id__": 73
"__id__": 77
},
{
"__id__": 75
"__id__": 79
}
],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 81
}
],
"_prefab": null,
......@@ -3165,16 +3282,16 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 61
"__id__": 65
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 67
},
{
"__id__": 64
"__id__": 68
}
],
"_prefab": null,
......@@ -3230,7 +3347,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -3262,7 +3379,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 66
},
"_enabled": true,
"alignMode": 2,
......@@ -3289,16 +3406,16 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 61
"__id__": 65
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 66
"__id__": 70
},
{
"__id__": 67
"__id__": 71
}
],
"_prefab": null,
......@@ -3354,7 +3471,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 69
},
"_enabled": true,
"_materials": [
......@@ -3386,7 +3503,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 69
},
"_enabled": true,
"alignMode": 2,
......@@ -3413,13 +3530,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 65
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 73
}
],
"_prefab": null,
......@@ -3475,7 +3592,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3508,16 +3625,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 65
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 71
"__id__": 75
},
{
"__id__": 72
"__id__": 76
}
],
"_prefab": null,
......@@ -3573,7 +3690,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 74
},
"_enabled": true,
"_materials": [
......@@ -3605,7 +3722,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 74
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3673,13 +3790,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 65
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 74
"__id__": 78
}
],
"_prefab": null,
......@@ -3735,7 +3852,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -3767,13 +3884,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 65
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 76
"__id__": 80
}
],
"_prefab": null,
......@@ -3829,7 +3946,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3861,7 +3978,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 65
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3922,12 +4039,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 62
"__id__": 66
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 66
"__id__": 70
},
"checkEvents": [],
"_id": "b5yftj0ARET71vY4W4KKEP"
......@@ -3937,32 +4054,32 @@
"_name": "type4",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 30
},
"_children": [
{
"__id__": 79
"__id__": 83
},
{
"__id__": 81
"__id__": 85
},
{
"__id__": 83
"__id__": 87
},
{
"__id__": 85
"__id__": 89
},
{
"__id__": 88
"__id__": 92
},
{
"__id__": 90
"__id__": 94
}
],
"_active": true,
"_components": [
{
"__id__": 92
"__id__": 96
}
],
"_prefab": null,
......@@ -4018,13 +4135,13 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 78
"__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 84
}
],
"_prefab": null,
......@@ -4080,7 +4197,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -4112,13 +4229,13 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 78
"__id__": 82
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 82
"__id__": 86
}
],
"_prefab": null,
......@@ -4174,7 +4291,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -4206,13 +4323,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 88
}
],
"_prefab": null,
......@@ -4268,7 +4385,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -4301,16 +4418,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 82
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 86
"__id__": 90
},
{
"__id__": 87
"__id__": 91
}
],
"_prefab": null,
......@@ -4366,7 +4483,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4398,7 +4515,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 89
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4466,13 +4583,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 82
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 89
"__id__": 93
}
],
"_prefab": null,
......@@ -4528,7 +4645,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -4560,13 +4677,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 82
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 91
"__id__": 95
}
],
"_prefab": null,
......@@ -4622,7 +4739,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4654,7 +4771,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 82
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4715,12 +4832,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 79
"__id__": 83
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 82
"__id__": 86
},
"checkEvents": [],
"_id": "e3dcc2d29FGagWFI0mKFNN"
......@@ -4730,32 +4847,32 @@
"_name": "type5",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 30
},
"_children": [
{
"__id__": 94
"__id__": 98
},
{
"__id__": 96
"__id__": 100
},
{
"__id__": 98
"__id__": 102
},
{
"__id__": 100
"__id__": 104
},
{
"__id__": 103
"__id__": 107
},
{
"__id__": 105
"__id__": 109
}
],
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 111
}
],
"_prefab": null,
......@@ -4811,13 +4928,13 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 93
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 99
}
],
"_prefab": null,
......@@ -4873,7 +4990,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 98
},
"_enabled": true,
"_materials": [
......@@ -4905,13 +5022,13 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 93
"__id__": 97
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 97
"__id__": 101
}
],
"_prefab": null,
......@@ -4967,7 +5084,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -4999,13 +5116,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 103
}
],
"_prefab": null,
......@@ -5061,7 +5178,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -5094,16 +5211,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 97
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 101
"__id__": 105
},
{
"__id__": 102
"__id__": 106
}
],
"_prefab": null,
......@@ -5159,7 +5276,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 104
},
"_enabled": true,
"_materials": [
......@@ -5191,7 +5308,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 104
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5259,13 +5376,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 97
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 104
"__id__": 108
}
],
"_prefab": null,
......@@ -5321,7 +5438,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 107
},
"_enabled": true,
"_materials": [
......@@ -5353,13 +5470,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 97
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 106
"__id__": 110
}
],
"_prefab": null,
......@@ -5415,7 +5532,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 109
},
"_enabled": true,
"_materials": [
......@@ -5447,7 +5564,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 97
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5508,12 +5625,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 94
"__id__": 98
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 97
"__id__": 101
},
"checkEvents": [],
"_id": "faECyFJlpCSJFwTLFjx6v5"
......@@ -5523,32 +5640,32 @@
"_name": "type6",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 30
},
"_children": [
{
"__id__": 109
"__id__": 113
},
{
"__id__": 111
"__id__": 115
},
{
"__id__": 113
"__id__": 117
},
{
"__id__": 115
"__id__": 119
},
{
"__id__": 118
"__id__": 122
},
{
"__id__": 120
"__id__": 124
}
],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 126
}
],
"_prefab": null,
......@@ -5604,13 +5721,13 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 108
"__id__": 112
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 114
}
],
"_prefab": null,
......@@ -5666,7 +5783,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 113
},
"_enabled": true,
"_materials": [
......@@ -5698,13 +5815,13 @@
"_name": "checkmark",
"_objFlags": 512,
"_parent": {
"__id__": 108
"__id__": 112
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 112
"__id__": 116
}
],
"_prefab": null,
......@@ -5760,7 +5877,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5792,13 +5909,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 112
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 118
}
],
"_prefab": null,
......@@ -5854,7 +5971,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 117
},
"_enabled": true,
"_materials": [
......@@ -5887,16 +6004,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 112
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 116
"__id__": 120
},
{
"__id__": 117
"__id__": 121
}
],
"_prefab": null,
......@@ -5952,7 +6069,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 119
},
"_enabled": true,
"_materials": [
......@@ -5984,7 +6101,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 119
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6052,13 +6169,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 112
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 119
"__id__": 123
}
],
"_prefab": null,
......@@ -6114,7 +6231,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 122
},
"_enabled": true,
"_materials": [
......@@ -6146,13 +6263,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 112
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 121
"__id__": 125
}
],
"_prefab": null,
......@@ -6208,7 +6325,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 124
},
"_enabled": true,
"_materials": [
......@@ -6240,7 +6357,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 112
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6301,12 +6418,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 109
"__id__": 113
},
"_N$isChecked": false,
"toggleGroup": null,
"checkMark": {
"__id__": 112
"__id__": 116
},
"checkEvents": [],
"_id": "14APVHVfdO2LefVZ8Uy7FJ"
......@@ -6320,22 +6437,22 @@
},
"_children": [
{
"__id__": 124
"__id__": 128
},
{
"__id__": 126
"__id__": 130
},
{
"__id__": 129
"__id__": 133
},
{
"__id__": 131
"__id__": 135
}
],
"_active": true,
"_components": [
{
"__id__": 133
"__id__": 137
}
],
"_prefab": null,
......@@ -6391,13 +6508,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 127
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 129
}
],
"_prefab": null,
......@@ -6453,7 +6570,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 128
},
"_enabled": true,
"_materials": [
......@@ -6486,16 +6603,16 @@
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 127
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 127
"__id__": 131
},
{
"__id__": 128
"__id__": 132
}
],
"_prefab": null,
......@@ -6551,7 +6668,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 130
},
"_enabled": true,
"_materials": [
......@@ -6583,7 +6700,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 130
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6651,13 +6768,13 @@
"_name": "img_open",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 127
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 130
"__id__": 134
}
],
"_prefab": null,
......@@ -6713,7 +6830,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 129
"__id__": 133
},
"_enabled": true,
"_materials": [
......@@ -6745,13 +6862,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 127
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 132
"__id__": 136
}
],
"_prefab": null,
......@@ -6807,7 +6924,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 135
},
"_enabled": true,
"_materials": [
......@@ -6839,7 +6956,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -6868,7 +6985,7 @@
},
{
"__type__": "cc.Node",
"_name": "lift",
"_name": "graphics",
"_objFlags": 0,
"_parent": {
"__id__": 2
......@@ -6877,10 +6994,10 @@
"_active": true,
"_components": [
{
"__id__": 135
"__id__": 139
},
{
"__id__": 136
"__id__": 140
}
],
"_prefab": null,
......@@ -6894,20 +7011,20 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 300,
"height": 480
"width": 1280,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 1
"x": 0,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-285.336,
195,
-640,
-360,
0,
0,
0,
......@@ -6929,55 +7046,71 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "cbVfacmstMqayF2Fri/zHu"
"_id": "33arzo7z5O0Kun7vjI1Dgr"
},
{
"__type__": "cc.Layout",
"__type__": "cc.Graphics",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 138
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 300,
"height": 480
"_materials": [
{
"__uuid__": "a153945d-2511-4c14-be7b-05d242f47d57"
}
],
"_lineWidth": 10,
"_strokeColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_resize": 0,
"_N$layoutType": 2,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
"_lineJoin": 2,
"_lineCap": 0,
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 10,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "010gqOoPZIs41PlRwASsWL"
"_miterLimit": 10,
"_id": "21zmrIBZZJd7RgqRs4beuL"
},
{
"__type__": "cc.ToggleContainer",
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 138
},
"_enabled": true,
"allowSwitchOff": true,
"checkEvents": [],
"_id": "89OW0HJmVI16o7UY3CzzFH"
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "8fRyKt5I1ID4jSjoXMJamG"
},
{
"__type__": "cc.Node",
"_name": "right",
"_name": "lift",
"_objFlags": 0,
"_parent": {
"__id__": 2
......@@ -6986,10 +7119,10 @@
"_active": true,
"_components": [
{
"__id__": 138
"__id__": 142
},
{
"__id__": 139
"__id__": 143
}
],
"_prefab": null,
......@@ -7015,7 +7148,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
293.023,
-285.336,
195,
0,
0,
......@@ -7038,14 +7171,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "29OzgazmJELbPiyO5cOzZ5"
"_id": "cbVfacmstMqayF2Fri/zHu"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 141
},
"_enabled": true,
"_layoutSize": {
......@@ -7070,23 +7203,23 @@
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "8cSEa/NFFKrbEdt60f6dag"
"_id": "010gqOoPZIs41PlRwASsWL"
},
{
"__type__": "cc.ToggleContainer",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 141
},
"_enabled": true,
"allowSwitchOff": true,
"checkEvents": [],
"_id": "c1wsAOdWJG5I9AXTaApRKF"
"_id": "89OW0HJmVI16o7UY3CzzFH"
},
{
"__type__": "cc.Node",
"_name": "graphics",
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 2
......@@ -7095,10 +7228,10 @@
"_active": true,
"_components": [
{
"__id__": 141
"__id__": 145
},
{
"__id__": 142
"__id__": 146
}
],
"_prefab": null,
......@@ -7112,20 +7245,20 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
"width": 300,
"height": 480
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
"x": 0.5,
"y": 1
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-640,
-360,
293.023,
195,
0,
0,
0,
......@@ -7147,67 +7280,51 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "33arzo7z5O0Kun7vjI1Dgr"
"_id": "29OzgazmJELbPiyO5cOzZ5"
},
{
"__type__": "cc.Graphics",
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 144
},
"_enabled": true,
"_materials": [
{
"__uuid__": "a153945d-2511-4c14-be7b-05d242f47d57"
}
],
"_lineWidth": 10,
"_strokeColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_lineJoin": 2,
"_lineCap": 0,
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
"_layoutSize": {
"__type__": "cc.Size",
"width": 300,
"height": 480
},
"_miterLimit": 10,
"_id": "21zmrIBZZJd7RgqRs4beuL"
"_resize": 0,
"_N$layoutType": 2,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 10,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "8cSEa/NFFKrbEdt60f6dag"
},
{
"__type__": "cc.Widget",
"__type__": "cc.ToggleContainer",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 144
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "8fRyKt5I1ID4jSjoXMJamG"
"allowSwitchOff": true,
"checkEvents": [],
"_id": "c1wsAOdWJG5I9AXTaApRKF"
},
{
"__type__": "cc.Node",
......@@ -7218,7 +7335,7 @@
},
"_children": [
{
"__id__": 144
"__id__": 148
}
],
"_active": true,
......@@ -7276,14 +7393,14 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 143
"__id__": 147
},
"_children": [
{
"__id__": 145
"__id__": 149
},
{
"__id__": 147
"__id__": 151
}
],
"_active": true,
......@@ -7341,13 +7458,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 146
"__id__": 150
}
],
"_prefab": null,
......@@ -7403,7 +7520,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 149
},
"_enabled": true,
"_clip": {
......@@ -7422,13 +7539,13 @@
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 148
"__id__": 152
}
],
"_prefab": null,
......@@ -7484,7 +7601,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 151
},
"_enabled": true,
"_clip": {
......@@ -7507,13 +7624,13 @@
},
"_children": [
{
"__id__": 150
"__id__": 154
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 153
"__id__": 157
},
"_opacity": 255,
"_color": {
......@@ -7567,17 +7684,17 @@
"_name": "particle_star",
"_objFlags": 0,
"_parent": {
"__id__": 149
"__id__": 153
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 151
"__id__": 155
}
],
"_prefab": {
"__id__": 152
"__id__": 156
},
"_opacity": 255,
"_color": {
......@@ -7631,7 +7748,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -7732,7 +7849,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 149
"__id__": 153
},
"asset": {
"__uuid__": "d09bc553-5bcd-4ca6-a1f3-ac3c614315d2"
......@@ -7743,7 +7860,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 149
"__id__": 153
},
"asset": {
"__uuid__": "d09bc553-5bcd-4ca6-a1f3-ac3c614315d2"
......@@ -7760,23 +7877,23 @@
},
"_children": [
{
"__id__": 155
"__id__": 159
},
{
"__id__": 158
"__id__": 162
},
{
"__id__": 161
"__id__": 165
}
],
"_active": false,
"_components": [
{
"__id__": 164
"__id__": 168
}
],
"_prefab": {
"__id__": 165
"__id__": 169
},
"_opacity": 255,
"_color": {
......@@ -7830,17 +7947,17 @@
"_name": "ske_candy",
"_objFlags": 0,
"_parent": {
"__id__": 154
"__id__": 158
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 156
"__id__": 160
}
],
"_prefab": {
"__id__": 157
"__id__": 161
},
"_opacity": 255,
"_color": {
......@@ -7894,7 +8011,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 159
},
"_enabled": true,
"_materials": [
......@@ -7932,7 +8049,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 154
"__id__": 158
},
"asset": {
"__uuid__": "baf374f1-c8c5-4e57-a484-1fd6b41fb37b"
......@@ -7945,17 +8062,17 @@
"_name": "ske",
"_objFlags": 0,
"_parent": {
"__id__": 154
"__id__": 158
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 163
}
],
"_prefab": {
"__id__": 160
"__id__": 164
},
"_opacity": 255,
"_color": {
......@@ -8009,7 +8126,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 162
},
"_enabled": true,
"_materials": [
......@@ -8047,7 +8164,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 154
"__id__": 158
},
"asset": {
"__uuid__": "baf374f1-c8c5-4e57-a484-1fd6b41fb37b"
......@@ -8060,17 +8177,17 @@
"_name": "block",
"_objFlags": 0,
"_parent": {
"__id__": 154
"__id__": 158
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 162
"__id__": 166
}
],
"_prefab": {
"__id__": 163
"__id__": 167
},
"_opacity": 255,
"_color": {
......@@ -8124,7 +8241,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 161
"__id__": 165
},
"_enabled": true,
"_id": "274cyj0VBBIZjdn5np2Z+3"
......@@ -8132,7 +8249,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 154
"__id__": 158
},
"asset": {
"__uuid__": "baf374f1-c8c5-4e57-a484-1fd6b41fb37b"
......@@ -8145,7 +8262,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 158
},
"_enabled": true,
"startPosition": {
......@@ -8164,7 +8281,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 154
"__id__": 158
},
"asset": {
"__uuid__": "baf374f1-c8c5-4e57-a484-1fd6b41fb37b"
......@@ -8181,26 +8298,26 @@
},
"_children": [
{
"__id__": 167
"__id__": 171
},
{
"__id__": 170
"__id__": 174
},
{
"__id__": 173
"__id__": 177
},
{
"__id__": 177
"__id__": 181
}
],
"_active": true,
"_components": [
{
"__id__": 185
"__id__": 189
}
],
"_prefab": {
"__id__": 186
"__id__": 190
},
"_opacity": 255,
"_color": {
......@@ -8254,17 +8371,17 @@
"_name": "shadow",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 170
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 168
"__id__": 172
}
],
"_prefab": {
"__id__": 169
"__id__": 173
},
"_opacity": 255,
"_color": {
......@@ -8318,7 +8435,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -8346,7 +8463,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 166
"__id__": 170
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -8359,17 +8476,17 @@
"_name": "ske",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 170
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 171
"__id__": 175
}
],
"_prefab": {
"__id__": 172
"__id__": 176
},
"_opacity": 255,
"_color": {
......@@ -8423,7 +8540,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 170
"__id__": 174
},
"_enabled": true,
"_materials": [
......@@ -8461,7 +8578,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 166
"__id__": 170
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -8474,20 +8591,20 @@
"_name": "block",
"_objFlags": 512,
"_parent": {
"__id__": 166
"__id__": 170
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 174
"__id__": 178
},
{
"__id__": 175
"__id__": 179
}
],
"_prefab": {
"__id__": 176
"__id__": 180
},
"_opacity": 100,
"_color": {
......@@ -8541,7 +8658,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 177
},
"_enabled": true,
"_id": "e74iLL2ftDd7amkVjGOFpW"
......@@ -8551,7 +8668,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 177
},
"_enabled": false,
"_materials": [
......@@ -8581,7 +8698,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 166
"__id__": 170
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -8594,20 +8711,20 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 170
},
"_children": [
{
"__id__": 178
"__id__": 182
},
{
"__id__": 181
"__id__": 185
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 184
"__id__": 188
},
"_opacity": 255,
"_color": {
......@@ -8661,17 +8778,17 @@
"_name": "enter",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 183
}
],
"_prefab": {
"__id__": 180
"__id__": 184
},
"_opacity": 255,
"_color": {
......@@ -8725,7 +8842,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 182
},
"_enabled": true,
"_clip": {
......@@ -8742,7 +8859,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 166
"__id__": 170
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -8755,17 +8872,17 @@
"_name": "leave",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 182
"__id__": 186
}
],
"_prefab": {
"__id__": 183
"__id__": 187
},
"_opacity": 255,
"_color": {
......@@ -8819,7 +8936,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 181
"__id__": 185
},
"_enabled": true,
"_clip": {
......@@ -8836,7 +8953,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 166
"__id__": 170
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -8847,7 +8964,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 166
"__id__": 170
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -8860,7 +8977,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 170
},
"_enabled": true,
"startPosition": {
......@@ -8879,7 +8996,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 166
"__id__": 170
},
"asset": {
"__uuid__": "57753175-db68-4aab-a973-8abce1f1664a"
......@@ -8896,17 +9013,17 @@
},
"_children": [
{
"__id__": 188
"__id__": 192
}
],
"_active": true,
"_components": [
{
"__id__": 199
"__id__": 203
}
],
"_prefab": {
"__id__": 200
"__id__": 204
},
"_opacity": 255,
"_color": {
......@@ -8960,23 +9077,23 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 187
"__id__": 191
},
"_children": [
{
"__id__": 189
"__id__": 193
},
{
"__id__": 192
"__id__": 196
},
{
"__id__": 195
"__id__": 199
}
],
"_active": false,
"_components": [],
"_prefab": {
"__id__": 198
"__id__": 202
},
"_opacity": 255,
"_color": {
......@@ -9030,17 +9147,17 @@
"_name": "star_bg",
"_objFlags": 0,
"_parent": {
"__id__": 188
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 190
"__id__": 194
}
],
"_prefab": {
"__id__": 191
"__id__": 195
},
"_opacity": 255,
"_color": {
......@@ -9094,7 +9211,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 189
"__id__": 193
},
"_enabled": true,
"_materials": [
......@@ -9124,7 +9241,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 187
"__id__": 191
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......@@ -9137,17 +9254,17 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 188
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 193
"__id__": 197
}
],
"_prefab": {
"__id__": 194
"__id__": 198
},
"_opacity": 255,
"_color": {
......@@ -9201,7 +9318,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 196
},
"_enabled": true,
"_materials": [
......@@ -9231,7 +9348,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 187
"__id__": 191
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......@@ -9244,17 +9361,17 @@
"_name": "icon_bigstar",
"_objFlags": 0,
"_parent": {
"__id__": 188
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 196
"__id__": 200
}
],
"_prefab": {
"__id__": 197
"__id__": 201
},
"_opacity": 255,
"_color": {
......@@ -9308,7 +9425,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 199
},
"_enabled": true,
"_materials": [
......@@ -9338,7 +9455,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 187
"__id__": 191
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......@@ -9349,7 +9466,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 187
"__id__": 191
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......@@ -9362,7 +9479,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 191
},
"_enabled": true,
"position": {
......@@ -9381,7 +9498,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 187
"__id__": 191
},
"asset": {
"__uuid__": "564dd930-80a8-4d89-bf96-f0f5be1e92cb"
......
......@@ -468,7 +468,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let pos1 = null;
let pos2 = null;
// if (point1.type == 0) {
pos1 = lift.convertToWorldSpaceAR(cc.v2(lift.x + lift.width / 2, 0));
pos1 = lift.convertToWorldSpaceAR(cc.v2(lift.x + lift.width / 2 - 10, 0));
pos2 = right.convertToWorldSpaceAR(cc.v2(right.x - right.width / 2, 0));
// } else {
// pos1 = this.upOps.node.children[point2.lineIndex].convertToWorldSpaceAR(cc.v2(0, -85));
......
class CalculativeResize {
static resizeInfo() {
//0.设计尺寸
let baseSize = cc.size(2280, 1242);
//1.获取屏幕尺寸
let canvasSize = cc.view.getCanvasSize();
//2.将屏幕宽高 以高度对齐的方式 换算出场景 宽度
let sumSizeW = cc.size(canvasSize.width * baseSize.height / canvasSize.height, baseSize.height)
//3.计算场景宽度与设计宽度比率
let scaleX = sumSizeW.width / baseSize.width;
//高屏幕适配
if (scaleX <= 1) {
let sumSizeY = cc.size(baseSize.width, canvasSize.height * (baseSize.width / canvasSize.width))
let scaleY = sumSizeY.height / baseSize.height;
let posY = sumSizeY.height - baseSize.height;
return {
scaleX: 1,
posX: 0,
moveX: 0,
scaleY: scaleY,
posY: posY,
moveY: - posY / 2
}
} else {
let posX = sumSizeW.width - baseSize.width;
//需要拓展的宽度缩放比
return {
scaleX: scaleX,
posX: posX,
moveX: - posX / 2,
scaleY: 1,
posY: 0,
moveY: 0
};
}
}
}
//关于齐刘海的适配方案。
//1.需要获取对应的手机型号
//2.需要写上安全间距标记(主要是中间部分)
//3.不同的手机安全间距可能不同。(主要适配iPhone X)
const { ccclass, property } = cc._decorator;
@ccclass
export default class NewClass extends cc.Component {
@property
r_width = 1;
@property
r_height = 1;
@property
r_top = 0
@property
r_bottom = 0
@property
p_left = 0
@property
p_right = 0
@property
p_top = 0
@property
p_bottom = 0
@property
black = 0
@property
noHead = 0
@property
debug = 0
@property
hideHeight = 0
@property
hideWidth = 0
private resizeScaleX;
private resizeScaleY;
private posX;
private posY;
private nodeWidth;
private nodeHeight;
private nodeX;
private nodeY;
// LIFE-CYCLE CALLBACKS:
onLoad() {
let { scaleX, posX, scaleY, posY } = CalculativeResize.resizeInfo();
this.resizeScaleX = scaleX;
this.resizeScaleY = scaleY;
this.posX = posX;
this.posY = posY;
let { width, height, x, y } = this.node;
this.nodeWidth = width;
this.nodeHeight = height;
this.nodeX = x;
this.nodeY = y;
//增加一个resize的监听,当屏幕出现宽高比变化的时候,进行一次重新适配。
//主要用于刘海屏的重置,以及动态屏幕变化的控制(虚拟按键屏)。
}
start() {
this.resize();
}
update(dt) {
}
onDestroy() {
// if (this.black1)
// pg.view.removChildren(this.black1);
// if (this.black2)
// pg.view.removChildren(this.black2);
// this.black1 = null;
// this.black2 = null;
}
resize() {
if (!this.resizeScaleX && !this.nodeWidth) {
console.warn("手动调用此方法时,不能再onLoad中使用");
return;
}
this.resizeHeight();
this.resizeWidth();
}
//高屏幕适配
resizeHeight() {
if (this.resizeScaleY <= 1) return;
let scaleY = this.resizeScaleY;
let posY = this.posY;
let nodeWidth = this.nodeWidth;
let nodeHeight = this.nodeHeight;
let nodeX = this.nodeX;
let nodeY = this.nodeY;
if (this.debug == 1) {
console.log("断点调试点");
}
if (this.hideHeight) {
this.node.active = false;
}
//宽度拉伸
if (this.r_width == 1) {
this.node.width = nodeWidth * scaleY * 1.1;
}
//高度拉升
if (this.r_height == 1) {
this.node.height = nodeHeight * scaleY * 1.1;
}
//动态上移
if (this.p_top == 1) {
this.node.y = nodeY + posY / 2
}
//动态下移
if (this.p_bottom == 1) {
this.node.y = nodeY - posY / 2
}
}
//长屏幕适配
resizeWidth() {
if (this.resizeScaleX <= 1) return;
let resizeScaleX = this.resizeScaleX;
let posX = this.posX;
let nodeWidth = this.nodeWidth;
let nodeHeight = this.nodeHeight;
let nodeX = this.nodeX;
let nodeY = this.nodeY;
if (this.debug == 1) {
console.log("断点调试点");
}
if (this.hideWidth) {
this.node.active = false;
}
//宽度拉伸
if (this.r_width == 1) {
this.node.width = nodeWidth * resizeScaleX * 1.1;
}
//高度拉升
if (this.r_height == 1) {
this.node.height = nodeHeight * resizeScaleX * 1.1;
//高度拉伸后,图片顶部齐边【坐标下移】 y坐标下移
if (this.r_top == 1) {
this.node.y = nodeY - nodeHeight * (resizeScaleX - 1) / 2;
}
//高度拉伸后,图片底部齐边【坐标上移】 y坐标上移
if (this.r_bottom == 1) {
this.node.y = nodeY + nodeHeight * (resizeScaleX - 1) / 2;
}
}
//如果是刘海屏,减去对应的刘海屏的宽度
let lhpSize = { top: 0, bottom: 0 };
if (!this.noHead && posX != 0) lhpSize = { top: 44 * 1.5, bottom: 34 * 1.5 };
//动态左移
if (this.p_left == 1) {
this.node.x = nodeX - posX / 2 + lhpSize.top;
}
//动态右移
if (this.p_right == 1) {
this.node.x = nodeX + posX / 2 - lhpSize.bottom;
}
}
//屏幕适配--end
createBalck() {
let black = cc.instantiate(cc.find('Canvas/blackBg'));
return black;
}
setBlackActive(val) {
// if (this.black1)
// this.black1.active = val;
// if (this.black2)
// this.black2.active = val;
}
}
\ No newline at end of file
{
"ver": "1.0.8",
"uuid": "41ab1343-86ca-4a9c-aef5-b556b5dad99b",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment