Commit 522a5997 authored by Tt's avatar Tt

1

parent d9f533c3
......@@ -153,67 +153,67 @@
"__id__": 108
},
{
"__id__": 115
"__id__": 113
},
{
"__id__": 122
"__id__": 119
},
{
"__id__": 149
"__id__": 146
},
{
"__id__": 170
"__id__": 167
},
{
"__id__": 172
"__id__": 169
},
{
"__id__": 173
"__id__": 170
},
{
"__id__": 181
"__id__": 178
},
{
"__id__": 182
"__id__": 179
},
{
"__id__": 202
"__id__": 199
},
{
"__id__": 204
"__id__": 200
},
{
"__id__": 208
"__id__": 203
},
{
"__id__": 211
"__id__": 206
},
{
"__id__": 212
"__id__": 207
},
{
"__id__": 213
"__id__": 208
},
{
"__id__": 215
"__id__": 210
},
{
"__id__": 221
"__id__": 216
},
{
"__id__": 234
"__id__": 229
}
],
"_active": true,
"_components": [
{
"__id__": 260
"__id__": 255
},
{
"__id__": 261
"__id__": 256
},
{
"__id__": 262
"__id__": 257
}
],
"_prefab": null,
......@@ -303,7 +303,7 @@
"array": [
0,
14.835,
680.9801319601855,
388.9553221574177,
0,
0,
0,
......@@ -4856,14 +4856,14 @@
"_id": "feA2HsnyFASLUXjdq0vRse"
},
{
"__type__": "f71a1JGlz9AGaIBU3bmkEic",
"__type__": "f8cbel5BtVOuKwvf1T6pUEl",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
},
"_enabled": true,
"_id": "09R5wk/0NITYGz7Es4tALJ"
"_id": "d0D3SeTqZN7LQ1/uLbV+Yi"
},
{
"__type__": "cc.Node",
......@@ -5175,7 +5175,7 @@
"_id": "5d9La3XUBG67/bL44GyMMJ"
},
{
"__type__": "c9aa4jpYpNOjrm64cgujOZi",
"__type__": "9b7aaxMLCtFDrSx3AA9wv52",
"_name": "",
"_objFlags": 0,
"node": {
......@@ -5183,7 +5183,7 @@
},
"_enabled": true,
"costtime": 4,
"_id": "32zyfUT/9EG4jgWsKPFVzS"
"_id": "62yW66mVlJEqzIrSKaP4cH"
},
{
"__type__": "cc.Node",
......@@ -5197,7 +5197,7 @@
"__id__": 109
},
{
"__id__": 112
"__id__": 111
}
],
"_active": false,
......@@ -5262,9 +5262,6 @@
"_components": [
{
"__id__": 110
},
{
"__id__": 111
}
],
"_prefab": null,
......@@ -5347,27 +5344,6 @@
"_atlas": null,
"_id": "52AKEsEpFBrYGn0KSRn4v5"
},
{
"__type__": "35a98JZsA5PKaKtcSRMCsTS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
},
"_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,
"_id": "1aRSob4ytPy44PTb6cdhEK"
},
{
"__type__": "cc.Node",
"_name": "invalid-name_2",
......@@ -5379,10 +5355,7 @@
"_active": true,
"_components": [
{
"__id__": 113
},
{
"__id__": 114
"__id__": 112
}
],
"_prefab": null,
......@@ -5438,7 +5411,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 111
},
"_enabled": true,
"_materials": [
......@@ -5465,27 +5438,6 @@
"_atlas": null,
"_id": "bahXJibU5HqZMrCuGhbuP6"
},
{
"__type__": "35a98JZsA5PKaKtcSRMCsTS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
},
"_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": 1,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "c0Fj3pVLRAQ5fE3Ob6H8hI"
},
{
"__type__": "cc.Node",
"_name": "title",
......@@ -5495,18 +5447,14 @@
},
"_children": [
{
"__id__": 116
"__id__": 114
},
{
"__id__": 118
"__id__": 116
}
],
"_active": false,
"_components": [
{
"__id__": 121
}
],
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -5560,13 +5508,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 115
"__id__": 113
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 115
}
],
"_prefab": null,
......@@ -5622,7 +5570,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 114
},
"_enabled": true,
"_materials": [
......@@ -5654,16 +5602,16 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 115
"__id__": 113
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 117
},
{
"__id__": 120
"__id__": 118
}
],
"_prefab": null,
......@@ -5719,7 +5667,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 116
},
"_enabled": true,
"_materials": [
......@@ -5755,7 +5703,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 116
},
"_enabled": true,
"_color": {
......@@ -5768,27 +5716,6 @@
"_width": 1.5,
"_id": "7eorOc0eJBL7kuwjKM7Nul"
},
{
"__type__": "35a98JZsA5PKaKtcSRMCsTS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
},
"_enabled": true,
"r_width": 0,
"r_height": 0,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 1,
"p_bottom": 0,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "4eatYVtk5HwLfMuLXgp/sS"
},
{
"__type__": "cc.Node",
"_name": "line",
......@@ -5797,6 +5724,9 @@
"__id__": 2
},
"_children": [
{
"__id__": 120
},
{
"__id__": 123
},
......@@ -5804,16 +5734,13 @@
"__id__": 126
},
{
"__id__": 129
"__id__": 133
},
{
"__id__": 136
"__id__": 140
},
{
"__id__": 143
},
{
"__id__": 146
}
],
"_active": false,
......@@ -5871,11 +5798,11 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 119
},
"_children": [
{
"__id__": 124
"__id__": 121
}
],
"_active": true,
......@@ -5933,13 +5860,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 120
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 122
}
],
"_prefab": null,
......@@ -5995,7 +5922,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -6027,11 +5954,11 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 119
},
"_children": [
{
"__id__": 127
"__id__": 124
}
],
"_active": true,
......@@ -6089,13 +6016,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 123
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 128
"__id__": 125
}
],
"_prefab": null,
......@@ -6151,7 +6078,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 124
},
"_enabled": true,
"_materials": [
......@@ -6183,14 +6110,14 @@
"_name": "line2",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 119
},
"_children": [
{
"__id__": 130
"__id__": 127
},
{
"__id__": 132
"__id__": 129
}
],
"_active": true,
......@@ -6248,13 +6175,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 126
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 131
"__id__": 128
}
],
"_prefab": null,
......@@ -6310,7 +6237,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 130
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -6342,17 +6269,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 126
},
"_children": [
{
"__id__": 133
"__id__": 130
}
],
"_active": false,
"_components": [
{
"__id__": 135
"__id__": 132
}
],
"_prefab": null,
......@@ -6408,13 +6335,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 132
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 134
"__id__": 131
}
],
"_prefab": null,
......@@ -6470,7 +6397,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
"__id__": 130
},
"_enabled": true,
"_materials": [
......@@ -6502,7 +6429,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -6534,14 +6461,14 @@
"_name": "line3",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 119
},
"_children": [
{
"__id__": 137
"__id__": 134
},
{
"__id__": 139
"__id__": 136
}
],
"_active": true,
......@@ -6599,13 +6526,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 136
"__id__": 133
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 138
"__id__": 135
}
],
"_prefab": null,
......@@ -6661,7 +6588,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -6693,17 +6620,17 @@
"_name": "line1",
"_objFlags": 0,
"_parent": {
"__id__": 136
"__id__": 133
},
"_children": [
{
"__id__": 140
"__id__": 137
}
],
"_active": false,
"_components": [
{
"__id__": 142
"__id__": 139
}
],
"_prefab": null,
......@@ -6759,13 +6686,13 @@
"_name": "combined-shape-copy-2",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 141
"__id__": 138
}
],
"_prefab": null,
......@@ -6821,7 +6748,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 137
},
"_enabled": true,
"_materials": [
......@@ -6853,7 +6780,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 136
},
"_enabled": true,
"_materials": [
......@@ -6885,11 +6812,11 @@
"_name": "line4",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 119
},
"_children": [
{
"__id__": 144
"__id__": 141
}
],
"_active": true,
......@@ -6947,13 +6874,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 143
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 145
"__id__": 142
}
],
"_prefab": null,
......@@ -7009,7 +6936,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 141
},
"_enabled": true,
"_materials": [
......@@ -7041,11 +6968,11 @@
"_name": "line5",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 119
},
"_children": [
{
"__id__": 147
"__id__": 144
}
],
"_active": true,
......@@ -7103,13 +7030,13 @@
"_name": "line0",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 143
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 148
"__id__": 145
}
],
"_prefab": null,
......@@ -7165,7 +7092,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 144
},
"_enabled": true,
"_materials": [
......@@ -7201,13 +7128,13 @@
},
"_children": [
{
"__id__": 150
"__id__": 147
},
{
"__id__": 157
"__id__": 154
},
{
"__id__": 164
"__id__": 161
}
],
"_active": false,
......@@ -7265,23 +7192,23 @@
"_name": "sub_0",
"_objFlags": 0,
"_parent": {
"__id__": 149
"__id__": 146
},
"_children": [
{
"__id__": 151
"__id__": 148
},
{
"__id__": 153
"__id__": 150
}
],
"_active": true,
"_components": [
{
"__id__": 155
"__id__": 152
},
{
"__id__": 156
"__id__": 153
}
],
"_prefab": null,
......@@ -7337,13 +7264,13 @@
"_name": "combined-shape_4",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 147
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 152
"__id__": 149
}
],
"_prefab": null,
......@@ -7399,7 +7326,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 148
},
"_enabled": true,
"_materials": [
......@@ -7431,13 +7358,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 147
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 154
"__id__": 151
}
],
"_prefab": null,
......@@ -7493,7 +7420,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
"__id__": 150
},
"_enabled": true,
"_materials": [
......@@ -7529,7 +7456,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 147
},
"_enabled": true,
"_materials": [
......@@ -7561,7 +7488,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 147
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7622,7 +7549,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 150
"__id__": 147
},
"_id": "e9hETjbwFN6ofBSoo7woie"
},
......@@ -7631,23 +7558,23 @@
"_name": "sub_1",
"_objFlags": 0,
"_parent": {
"__id__": 149
"__id__": 146
},
"_children": [
{
"__id__": 158
"__id__": 155
},
{
"__id__": 160
"__id__": 157
}
],
"_active": true,
"_components": [
{
"__id__": 162
"__id__": 159
},
{
"__id__": 163
"__id__": 160
}
],
"_prefab": null,
......@@ -7703,13 +7630,13 @@
"_name": "combined-shape_3",
"_objFlags": 0,
"_parent": {
"__id__": 157
"__id__": 154
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 156
}
],
"_prefab": null,
......@@ -7765,7 +7692,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 155
},
"_enabled": true,
"_materials": [
......@@ -7797,13 +7724,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 157
"__id__": 154
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 161
"__id__": 158
}
],
"_prefab": null,
......@@ -7859,7 +7786,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 157
},
"_enabled": true,
"_materials": [
......@@ -7895,7 +7822,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -7927,7 +7854,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 154
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7988,7 +7915,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 157
"__id__": 154
},
"_id": "8cGgjvgvhL/LuPKRoVnVQq"
},
......@@ -7997,20 +7924,20 @@
"_name": "main",
"_objFlags": 0,
"_parent": {
"__id__": 149
"__id__": 146
},
"_children": [
{
"__id__": 165
"__id__": 162
},
{
"__id__": 167
"__id__": 164
}
],
"_active": true,
"_components": [
{
"__id__": 169
"__id__": 166
}
],
"_prefab": null,
......@@ -8066,13 +7993,13 @@
"_name": "oval-18",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 161
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 166
"__id__": 163
}
],
"_prefab": null,
......@@ -8128,7 +8055,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 165
"__id__": 162
},
"_enabled": true,
"_materials": [
......@@ -8160,13 +8087,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 161
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 168
"__id__": 165
}
],
"_prefab": null,
......@@ -8222,7 +8149,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 164
},
"_enabled": true,
"_materials": [
......@@ -8258,7 +8185,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 161
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8319,7 +8246,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 164
"__id__": 161
},
"_id": "f41Ic5OXhCRpAxS/kMIRiA"
},
......@@ -8334,7 +8261,7 @@
"_active": false,
"_components": [
{
"__id__": 171
"__id__": 168
}
],
"_prefab": null,
......@@ -8390,7 +8317,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 170
"__id__": 167
},
"_enabled": true,
"_materials": [
......@@ -8484,19 +8411,19 @@
},
"_children": [
{
"__id__": 174
"__id__": 171
},
{
"__id__": 176
"__id__": 173
},
{
"__id__": 178
"__id__": 175
}
],
"_active": false,
"_components": [
{
"__id__": 180
"__id__": 177
}
],
"_prefab": null,
......@@ -8552,13 +8479,13 @@
"_name": "bg_blue",
"_objFlags": 0,
"_parent": {
"__id__": 173
"__id__": 170
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 175
"__id__": 172
}
],
"_prefab": null,
......@@ -8614,7 +8541,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -8646,13 +8573,13 @@
"_name": "bg_green",
"_objFlags": 0,
"_parent": {
"__id__": 173
"__id__": 170
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 174
}
],
"_prefab": null,
......@@ -8708,7 +8635,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 173
},
"_enabled": true,
"_materials": [
......@@ -8740,13 +8667,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 173
"__id__": 170
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 176
}
],
"_prefab": null,
......@@ -8802,7 +8729,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -8838,7 +8765,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 170
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8899,7 +8826,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 173
"__id__": 170
},
"_id": "176BYmeDpPZ68HlISEHa8t"
},
......@@ -8970,28 +8897,28 @@
},
"_children": [
{
"__id__": 183
"__id__": 180
},
{
"__id__": 185
"__id__": 182
},
{
"__id__": 187
"__id__": 184
},
{
"__id__": 189
"__id__": 186
},
{
"__id__": 191
"__id__": 188
},
{
"__id__": 195
"__id__": 192
}
],
"_active": false,
"_components": [
{
"__id__": 201
"__id__": 198
}
],
"_prefab": null,
......@@ -9047,13 +8974,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 179
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 184
"__id__": 181
}
],
"_prefab": null,
......@@ -9109,7 +9036,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 180
},
"_enabled": true,
"_materials": [
......@@ -9141,13 +9068,13 @@
"_name": "chose",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 179
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 186
"__id__": 183
}
],
"_prefab": null,
......@@ -9203,7 +9130,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 185
"__id__": 182
},
"_enabled": true,
"_materials": [
......@@ -9235,13 +9162,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 179
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 188
"__id__": 185
}
],
"_prefab": null,
......@@ -9297,7 +9224,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 184
},
"_enabled": true,
"_materials": [
......@@ -9329,13 +9256,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 179
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 190
"__id__": 187
}
],
"_prefab": null,
......@@ -9391,7 +9318,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 189
"__id__": 186
},
"_enabled": true,
"_materials": [
......@@ -9427,17 +9354,17 @@
"_name": "fail",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 179
},
"_children": [
{
"__id__": 192
"__id__": 189
}
],
"_active": false,
"_components": [
{
"__id__": 194
"__id__": 191
}
],
"_prefab": null,
......@@ -9493,13 +9420,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 191
"__id__": 188
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 193
"__id__": 190
}
],
"_prefab": null,
......@@ -9555,7 +9482,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 189
},
"_enabled": true,
"_materials": [
......@@ -9591,7 +9518,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 188
},
"_enabled": true,
"_materials": [
......@@ -9623,20 +9550,20 @@
"_name": "success",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 179
},
"_children": [
{
"__id__": 196
"__id__": 193
},
{
"__id__": 198
"__id__": 195
}
],
"_active": false,
"_components": [
{
"__id__": 200
"__id__": 197
}
],
"_prefab": null,
......@@ -9692,13 +9619,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 197
"__id__": 194
}
],
"_prefab": null,
......@@ -9754,7 +9681,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 196
"__id__": 193
},
"_enabled": true,
"_materials": [
......@@ -9790,13 +9717,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 192
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 199
"__id__": 196
}
],
"_prefab": null,
......@@ -9852,7 +9779,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 198
"__id__": 195
},
"_enabled": true,
"_materials": [
......@@ -9884,7 +9811,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 192
},
"_enabled": true,
"_materials": [
......@@ -9916,7 +9843,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 179
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9977,7 +9904,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 182
"__id__": 179
},
"_id": "58IQ76yf1KT71BqZoNtHOV"
},
......@@ -9990,11 +9917,7 @@
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 203
}
],
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -10043,27 +9966,6 @@
"groupIndex": 0,
"_id": "2bxgAtmQJP+bUQoreYMry9"
},
{
"__type__": "35a98JZsA5PKaKtcSRMCsTS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 202
},
"_enabled": true,
"r_width": 0,
"r_height": 0,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 0,
"p_bottom": 1,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "ebQ2jKaixDO7nZRIohsaP7"
},
{
"__type__": "cc.Node",
"_name": "btn_replay1",
......@@ -10075,13 +9977,10 @@
"_active": false,
"_components": [
{
"__id__": 205
},
{
"__id__": 206
"__id__": 201
},
{
"__id__": 207
"__id__": 202
}
],
"_prefab": null,
......@@ -10137,7 +10036,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 204
"__id__": 200
},
"_enabled": true,
"_materials": [
......@@ -10169,7 +10068,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 204
"__id__": 200
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10230,31 +10129,10 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 204
"__id__": 200
},
"_id": "86ErSTSUhP26kFUGhhqqPn"
},
{
"__type__": "35a98JZsA5PKaKtcSRMCsTS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 204
},
"_enabled": true,
"r_width": 0,
"r_height": 0,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 0,
"p_bottom": 1,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "bag+W8tmtDzpqX/Hm+/x8i"
},
{
"__type__": "cc.Node",
"_name": "layout_stars",
......@@ -10266,10 +10144,10 @@
"_active": false,
"_components": [
{
"__id__": 209
"__id__": 204
},
{
"__id__": 210
"__id__": 205
}
],
"_prefab": null,
......@@ -10325,7 +10203,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 208
"__id__": 203
},
"_enabled": true,
"_layoutSize": {
......@@ -10357,7 +10235,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 208
"__id__": 203
},
"_enabled": true,
"alignMode": 1,
......@@ -10506,7 +10384,7 @@
"_active": false,
"_components": [
{
"__id__": 214
"__id__": 209
}
],
"_prefab": null,
......@@ -10562,7 +10440,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 213
"__id__": 208
},
"_enabled": true,
"_materials": [
......@@ -10606,13 +10484,13 @@
},
"_children": [
{
"__id__": 216
"__id__": 211
}
],
"_active": false,
"_components": [
{
"__id__": 220
"__id__": 215
}
],
"_prefab": null,
......@@ -10668,17 +10546,17 @@
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 215
"__id__": 210
},
"_children": [
{
"__id__": 217
"__id__": 212
}
],
"_active": false,
"_components": [
{
"__id__": 219
"__id__": 214
}
],
"_prefab": null,
......@@ -10734,13 +10612,13 @@
"_name": "StarBig",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 211
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 218
"__id__": 213
}
],
"_prefab": null,
......@@ -10796,7 +10674,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 217
"__id__": 212
},
"_enabled": true,
"_materials": [
......@@ -10828,7 +10706,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 216
"__id__": 211
},
"_enabled": true,
"_materials": [
......@@ -10860,7 +10738,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 215
"__id__": 210
},
"_enabled": true,
"_materials": [
......@@ -10896,22 +10774,22 @@
},
"_children": [
{
"__id__": 222
"__id__": 217
},
{
"__id__": 224
"__id__": 219
},
{
"__id__": 226
"__id__": 221
},
{
"__id__": 228
"__id__": 223
},
{
"__id__": 230
"__id__": 225
},
{
"__id__": 232
"__id__": 227
}
],
"_active": false,
......@@ -10969,13 +10847,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 221
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 223
"__id__": 218
}
],
"_prefab": null,
......@@ -11031,7 +10909,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 222
"__id__": 217
},
"_enabled": true,
"_materials": [
......@@ -11063,13 +10941,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 221
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 225
"__id__": 220
}
],
"_prefab": null,
......@@ -11125,7 +11003,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 224
"__id__": 219
},
"_enabled": true,
"_materials": [
......@@ -11157,13 +11035,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 221
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 227
"__id__": 222
}
],
"_prefab": null,
......@@ -11219,7 +11097,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 226
"__id__": 221
},
"_enabled": true,
"_materials": [
......@@ -11251,13 +11129,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 221
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 229
"__id__": 224
}
],
"_prefab": null,
......@@ -11313,7 +11191,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 228
"__id__": 223
},
"_enabled": true,
"_materials": [
......@@ -11345,13 +11223,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 221
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 231
"__id__": 226
}
],
"_prefab": null,
......@@ -11407,7 +11285,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 230
"__id__": 225
},
"_enabled": true,
"_materials": [
......@@ -11439,13 +11317,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 221
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 233
"__id__": 228
}
],
"_prefab": null,
......@@ -11501,7 +11379,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 232
"__id__": 227
},
"_enabled": true,
"_materials": [
......@@ -11536,6 +11414,9 @@
"__id__": 2
},
"_children": [
{
"__id__": 230
},
{
"__id__": 235
},
......@@ -11547,9 +11428,6 @@
},
{
"__id__": 250
},
{
"__id__": 255
}
],
"_active": false,
......@@ -11607,11 +11485,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 229
},
"_children": [
{
"__id__": 236
"__id__": 231
}
],
"_active": true,
......@@ -11669,17 +11547,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 235
"__id__": 230
},
"_children": [
{
"__id__": 237
"__id__": 232
}
],
"_active": true,
"_components": [
{
"__id__": 239
"__id__": 234
}
],
"_prefab": null,
......@@ -11735,13 +11613,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 236
"__id__": 231
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 238
"__id__": 233
}
],
"_prefab": null,
......@@ -11797,7 +11675,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 237
"__id__": 232
},
"_enabled": true,
"_materials": [
......@@ -11829,7 +11707,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 236
"__id__": 231
},
"_enabled": true,
"_materials": [
......@@ -11851,11 +11729,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 229
},
"_children": [
{
"__id__": 241
"__id__": 236
}
],
"_active": true,
......@@ -11913,17 +11791,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 240
"__id__": 235
},
"_children": [
{
"__id__": 242
"__id__": 237
}
],
"_active": true,
"_components": [
{
"__id__": 244
"__id__": 239
}
],
"_prefab": null,
......@@ -11979,13 +11857,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 241
"__id__": 236
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 243
"__id__": 238
}
],
"_prefab": null,
......@@ -12041,7 +11919,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 242
"__id__": 237
},
"_enabled": true,
"_materials": [
......@@ -12073,7 +11951,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 241
"__id__": 236
},
"_enabled": true,
"_materials": [
......@@ -12095,11 +11973,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 229
},
"_children": [
{
"__id__": 246
"__id__": 241
}
],
"_active": true,
......@@ -12157,17 +12035,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 245
"__id__": 240
},
"_children": [
{
"__id__": 247
"__id__": 242
}
],
"_active": true,
"_components": [
{
"__id__": 249
"__id__": 244
}
],
"_prefab": null,
......@@ -12223,13 +12101,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 246
"__id__": 241
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 248
"__id__": 243
}
],
"_prefab": null,
......@@ -12285,7 +12163,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 247
"__id__": 242
},
"_enabled": true,
"_materials": [
......@@ -12317,7 +12195,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 246
"__id__": 241
},
"_enabled": true,
"_materials": [
......@@ -12339,11 +12217,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 229
},
"_children": [
{
"__id__": 251
"__id__": 246
}
],
"_active": true,
......@@ -12401,17 +12279,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 250
"__id__": 245
},
"_children": [
{
"__id__": 252
"__id__": 247
}
],
"_active": true,
"_components": [
{
"__id__": 254
"__id__": 249
}
],
"_prefab": null,
......@@ -12467,13 +12345,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 251
"__id__": 246
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 253
"__id__": 248
}
],
"_prefab": null,
......@@ -12529,7 +12407,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 252
"__id__": 247
},
"_enabled": true,
"_materials": [
......@@ -12561,7 +12439,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 251
"__id__": 246
},
"_enabled": true,
"_materials": [
......@@ -12583,11 +12461,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 229
},
"_children": [
{
"__id__": 256
"__id__": 251
}
],
"_active": true,
......@@ -12645,17 +12523,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 255
"__id__": 250
},
"_children": [
{
"__id__": 257
"__id__": 252
}
],
"_active": true,
"_components": [
{
"__id__": 259
"__id__": 254
}
],
"_prefab": null,
......@@ -12711,13 +12589,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 256
"__id__": 251
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 258
"__id__": 253
}
],
"_prefab": null,
......@@ -12773,7 +12651,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 257
"__id__": 252
},
"_enabled": true,
"_materials": [
......@@ -12805,7 +12683,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 256
"__id__": 251
},
"_enabled": true,
"_materials": [
......
{
"ver": "1.0.8",
"uuid": "35a98259-b00e-4f29-a2ad-71244c0ac4d2",
"uuid": "f8cbe979-06d5-4eb8-ac2f-7f54faa54125",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
{
"ver": "1.0.8",
"uuid": "c9aa48e9-6293-4e8e-b9ba-e1c82e8ce662",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "1.0.8",
"uuid": "f71a1246-973f-4019-a201-5376e690489c",
"uuid": "9b7aac4c-2c2b-450e-b4b1-dc003dc2fe76",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
......
class CalculativeResize {
static resizeInfo() {
//0.设计尺寸
let baseSize = cc.size(1280, 720);
//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)
cc.Class({
extends: cc.Component,
properties: {
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,
},
// 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.05) 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.r_width == 1) {
this.node.width = nodeWidth * scaleY;
}
//高度拉升
if (this.r_height == 1) {
this.node.height = nodeHeight * scaleY;
// //高度拉伸后,图片顶部齐边【坐标下移】 y坐标下移
// if (this.r_top == 1) {
// this.node.y = nodeY - nodeHeight * (scaleY - 1) / 2;
// }
// //高度拉伸后,图片底部齐边【坐标上移】 y坐标上移
// if (this.r_bottom == 1) {
// this.node.y = nodeY + nodeHeight * (scaleY - 1) / 2;
// }
}
// //如果是刘海屏,减去对应的刘海屏的宽度
// let lhpSize = { top: 0, bottom: 0 };
// //动态左移
// 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;
// }
//动态上移
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.05) 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.r_width == 1) {
this.node.width = nodeWidth * resizeScaleX;
}
//高度拉升
if (this.r_height == 1) {
this.node.height = nodeHeight * resizeScaleX;
//高度拉伸后,图片顶部齐边【坐标下移】 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;
}
}
if (this.black == 1) {
let baseSize = cc.size(1280, 720);
this.black1 = this.createBalck();
this.black2 = this.createBalck();
let curWidth = nodeWidth * resizeScaleX;
let curHeight = nodeHeight * resizeScaleX;
let blackWidth = (curWidth - baseSize.width) / 2;
let blackHeight = curHeight;
this.black1.width = blackWidth;
this.black1.height = blackHeight;
this.black2.width = blackWidth;
this.black2.height = blackHeight;
this.black1.x = - baseSize.width / 2 - this.black1.width / 2;
this.black2.x = baseSize.width / 2 + this.black1.width / 2;
this.black1.y = this.black2.y = nodeY;
pg.view.addChild(this.node, this.black1);
pg.view.addChild(this.node, this.black2);
this.black1.active = false;
this.black2.active = false;
if (this.node.nodeData && (this.node.nodeData.bg != "" && this.node.nodeData.bg != "rect")) {
this.black1.active = true;
this.black2.active = true;
}
}
//如果是刘海屏,减去对应的刘海屏的宽度
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;
}
});
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