Commit 7feb0d51 authored by yu's avatar yu

1

parent 7cd473b3
...@@ -156,67 +156,67 @@ ...@@ -156,67 +156,67 @@
"__id__": 128 "__id__": 128
}, },
{ {
"__id__": 135 "__id__": 133
}, },
{ {
"__id__": 142 "__id__": 139
}, },
{ {
"__id__": 169 "__id__": 166
}, },
{ {
"__id__": 190 "__id__": 187
}, },
{ {
"__id__": 192 "__id__": 189
}, },
{ {
"__id__": 193 "__id__": 190
}, },
{ {
"__id__": 201 "__id__": 198
}, },
{ {
"__id__": 202 "__id__": 199
}, },
{ {
"__id__": 222 "__id__": 219
}, },
{ {
"__id__": 224 "__id__": 220
}, },
{ {
"__id__": 228 "__id__": 223
}, },
{ {
"__id__": 231 "__id__": 226
}, },
{ {
"__id__": 232 "__id__": 227
}, },
{ {
"__id__": 233 "__id__": 228
}, },
{ {
"__id__": 235 "__id__": 230
}, },
{ {
"__id__": 241 "__id__": 236
}, },
{ {
"__id__": 254 "__id__": 249
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 280 "__id__": 275
}, },
{ {
"__id__": 281 "__id__": 276
}, },
{ {
"__id__": 282 "__id__": 277
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6196,7 +6196,7 @@ ...@@ -6196,7 +6196,7 @@
"__id__": 129 "__id__": 129
}, },
{ {
"__id__": 132 "__id__": 131
} }
], ],
"_active": false, "_active": false,
...@@ -6261,9 +6261,6 @@ ...@@ -6261,9 +6261,6 @@
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 130
},
{
"__id__": 131
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6346,27 +6343,6 @@ ...@@ -6346,27 +6343,6 @@
"_atlas": null, "_atlas": null,
"_id": "52AKEsEpFBrYGn0KSRn4v5" "_id": "52AKEsEpFBrYGn0KSRn4v5"
}, },
{
"__type__": "ddd8cqr7ixHg55/ASPnReOS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 129
},
"_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", "__type__": "cc.Node",
"_name": "invalid-name_2", "_name": "invalid-name_2",
...@@ -6378,10 +6354,7 @@ ...@@ -6378,10 +6354,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 133 "__id__": 132
},
{
"__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6437,7 +6410,7 @@ ...@@ -6437,7 +6410,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6464,27 +6437,6 @@ ...@@ -6464,27 +6437,6 @@
"_atlas": null, "_atlas": null,
"_id": "bahXJibU5HqZMrCuGhbuP6" "_id": "bahXJibU5HqZMrCuGhbuP6"
}, },
{
"__type__": "ddd8cqr7ixHg55/ASPnReOS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
},
"_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", "__type__": "cc.Node",
"_name": "title", "_name": "title",
...@@ -6494,18 +6446,14 @@ ...@@ -6494,18 +6446,14 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 136 "__id__": 134
}, },
{ {
"__id__": 138 "__id__": 136
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [],
{
"__id__": 141
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -6559,13 +6507,13 @@ ...@@ -6559,13 +6507,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 135 "__id__": 133
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 137 "__id__": 135
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6621,7 +6569,7 @@ ...@@ -6621,7 +6569,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 136 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6653,16 +6601,16 @@ ...@@ -6653,16 +6601,16 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 135 "__id__": 133
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 137
}, },
{ {
"__id__": 140 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6718,7 +6666,7 @@ ...@@ -6718,7 +6666,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6753,7 +6701,7 @@ ...@@ -6753,7 +6701,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -6766,27 +6714,6 @@ ...@@ -6766,27 +6714,6 @@
"_width": 1.5, "_width": 1.5,
"_id": "7eorOc0eJBL7kuwjKM7Nul" "_id": "7eorOc0eJBL7kuwjKM7Nul"
}, },
{
"__type__": "ddd8cqr7ixHg55/ASPnReOS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
},
"_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", "__type__": "cc.Node",
"_name": "line", "_name": "line",
...@@ -6795,6 +6722,9 @@ ...@@ -6795,6 +6722,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 140
},
{ {
"__id__": 143 "__id__": 143
}, },
...@@ -6802,16 +6732,13 @@ ...@@ -6802,16 +6732,13 @@
"__id__": 146 "__id__": 146
}, },
{ {
"__id__": 149 "__id__": 153
}, },
{ {
"__id__": 156 "__id__": 160
}, },
{ {
"__id__": 163 "__id__": 163
},
{
"__id__": 166
} }
], ],
"_active": false, "_active": false,
...@@ -6869,11 +6796,11 @@ ...@@ -6869,11 +6796,11 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 142 "__id__": 139
}, },
"_children": [ "_children": [
{ {
"__id__": 144 "__id__": 141
} }
], ],
"_active": true, "_active": true,
...@@ -6931,13 +6858,13 @@ ...@@ -6931,13 +6858,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 143 "__id__": 140
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 145 "__id__": 142
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6993,7 +6920,7 @@ ...@@ -6993,7 +6920,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 144 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7025,11 +6952,11 @@ ...@@ -7025,11 +6952,11 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 142 "__id__": 139
}, },
"_children": [ "_children": [
{ {
"__id__": 147 "__id__": 144
} }
], ],
"_active": true, "_active": true,
...@@ -7087,13 +7014,13 @@ ...@@ -7087,13 +7014,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 146 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7149,7 +7076,7 @@ ...@@ -7149,7 +7076,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7181,14 +7108,14 @@ ...@@ -7181,14 +7108,14 @@
"_name": "line2", "_name": "line2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 142 "__id__": 139
}, },
"_children": [ "_children": [
{ {
"__id__": 150 "__id__": 147
}, },
{ {
"__id__": 152 "__id__": 149
} }
], ],
"_active": true, "_active": true,
...@@ -7246,13 +7173,13 @@ ...@@ -7246,13 +7173,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 149 "__id__": 146
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 151 "__id__": 148
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7308,7 +7235,7 @@ ...@@ -7308,7 +7235,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7340,17 +7267,17 @@ ...@@ -7340,17 +7267,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 149 "__id__": 146
}, },
"_children": [ "_children": [
{ {
"__id__": 153 "__id__": 150
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 152
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7406,13 +7333,13 @@ ...@@ -7406,13 +7333,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 152 "__id__": 149
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 154 "__id__": 151
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7468,7 +7395,7 @@ ...@@ -7468,7 +7395,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 153 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7500,7 +7427,7 @@ ...@@ -7500,7 +7427,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 149
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7532,14 +7459,14 @@ ...@@ -7532,14 +7459,14 @@
"_name": "line3", "_name": "line3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 142 "__id__": 139
}, },
"_children": [ "_children": [
{ {
"__id__": 157 "__id__": 154
}, },
{ {
"__id__": 159 "__id__": 156
} }
], ],
"_active": true, "_active": true,
...@@ -7597,13 +7524,13 @@ ...@@ -7597,13 +7524,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 156 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 158 "__id__": 155
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7659,7 +7586,7 @@ ...@@ -7659,7 +7586,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7691,17 +7618,17 @@ ...@@ -7691,17 +7618,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 156 "__id__": 153
}, },
"_children": [ "_children": [
{ {
"__id__": 160 "__id__": 157
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 162 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7757,13 +7684,13 @@ ...@@ -7757,13 +7684,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 159 "__id__": 156
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 161 "__id__": 158
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7819,7 +7746,7 @@ ...@@ -7819,7 +7746,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 157
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7851,7 +7778,7 @@ ...@@ -7851,7 +7778,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 156
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7883,11 +7810,11 @@ ...@@ -7883,11 +7810,11 @@
"_name": "line4", "_name": "line4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 142 "__id__": 139
}, },
"_children": [ "_children": [
{ {
"__id__": 164 "__id__": 161
} }
], ],
"_active": true, "_active": true,
...@@ -7945,13 +7872,13 @@ ...@@ -7945,13 +7872,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 160
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 165 "__id__": 162
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8007,7 +7934,7 @@ ...@@ -8007,7 +7934,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 164 "__id__": 161
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8039,11 +7966,11 @@ ...@@ -8039,11 +7966,11 @@
"_name": "line5", "_name": "line5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 142 "__id__": 139
}, },
"_children": [ "_children": [
{ {
"__id__": 167 "__id__": 164
} }
], ],
"_active": true, "_active": true,
...@@ -8101,13 +8028,13 @@ ...@@ -8101,13 +8028,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 166 "__id__": 163
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 168 "__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8163,7 +8090,7 @@ ...@@ -8163,7 +8090,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 167 "__id__": 164
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8199,13 +8126,13 @@ ...@@ -8199,13 +8126,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 170 "__id__": 167
}, },
{ {
"__id__": 177 "__id__": 174
}, },
{ {
"__id__": 184 "__id__": 181
} }
], ],
"_active": false, "_active": false,
...@@ -8263,23 +8190,23 @@ ...@@ -8263,23 +8190,23 @@
"_name": "sub_0", "_name": "sub_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 169 "__id__": 166
}, },
"_children": [ "_children": [
{ {
"__id__": 171 "__id__": 168
}, },
{ {
"__id__": 173 "__id__": 170
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 175 "__id__": 172
}, },
{ {
"__id__": 176 "__id__": 173
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8335,13 +8262,13 @@ ...@@ -8335,13 +8262,13 @@
"_name": "combined-shape_4", "_name": "combined-shape_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 170 "__id__": 167
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 172 "__id__": 169
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8397,7 +8324,7 @@ ...@@ -8397,7 +8324,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 171 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8429,13 +8356,13 @@ ...@@ -8429,13 +8356,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 170 "__id__": 167
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 174 "__id__": 171
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8491,7 +8418,7 @@ ...@@ -8491,7 +8418,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 173 "__id__": 170
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8526,7 +8453,7 @@ ...@@ -8526,7 +8453,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 167
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8558,7 +8485,7 @@ ...@@ -8558,7 +8485,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 167
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -8619,7 +8546,7 @@ ...@@ -8619,7 +8546,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 170 "__id__": 167
}, },
"_id": "e9hETjbwFN6ofBSoo7woie" "_id": "e9hETjbwFN6ofBSoo7woie"
}, },
...@@ -8628,23 +8555,23 @@ ...@@ -8628,23 +8555,23 @@
"_name": "sub_1", "_name": "sub_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 169 "__id__": 166
}, },
"_children": [ "_children": [
{ {
"__id__": 178 "__id__": 175
}, },
{ {
"__id__": 180 "__id__": 177
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 182 "__id__": 179
}, },
{ {
"__id__": 183 "__id__": 180
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8700,13 +8627,13 @@ ...@@ -8700,13 +8627,13 @@
"_name": "combined-shape_3", "_name": "combined-shape_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 174
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 179 "__id__": 176
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8762,7 +8689,7 @@ ...@@ -8762,7 +8689,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 178 "__id__": 175
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8794,13 +8721,13 @@ ...@@ -8794,13 +8721,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 174
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 181 "__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8856,7 +8783,7 @@ ...@@ -8856,7 +8783,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 180 "__id__": 177
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8891,7 +8818,7 @@ ...@@ -8891,7 +8818,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 177 "__id__": 174
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8923,7 +8850,7 @@ ...@@ -8923,7 +8850,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 177 "__id__": 174
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -8984,7 +8911,7 @@ ...@@ -8984,7 +8911,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 177 "__id__": 174
}, },
"_id": "8cGgjvgvhL/LuPKRoVnVQq" "_id": "8cGgjvgvhL/LuPKRoVnVQq"
}, },
...@@ -8993,20 +8920,20 @@ ...@@ -8993,20 +8920,20 @@
"_name": "main", "_name": "main",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 169 "__id__": 166
}, },
"_children": [ "_children": [
{ {
"__id__": 185 "__id__": 182
}, },
{ {
"__id__": 187 "__id__": 184
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 189 "__id__": 186
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9062,13 +8989,13 @@ ...@@ -9062,13 +8989,13 @@
"_name": "oval-18", "_name": "oval-18",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 184 "__id__": 181
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 186 "__id__": 183
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9124,7 +9051,7 @@ ...@@ -9124,7 +9051,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 185 "__id__": 182
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9156,13 +9083,13 @@ ...@@ -9156,13 +9083,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 184 "__id__": 181
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 188 "__id__": 185
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9218,7 +9145,7 @@ ...@@ -9218,7 +9145,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 187 "__id__": 184
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9253,7 +9180,7 @@ ...@@ -9253,7 +9180,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 184 "__id__": 181
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -9314,7 +9241,7 @@ ...@@ -9314,7 +9241,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 184 "__id__": 181
}, },
"_id": "f41Ic5OXhCRpAxS/kMIRiA" "_id": "f41Ic5OXhCRpAxS/kMIRiA"
}, },
...@@ -9329,7 +9256,7 @@ ...@@ -9329,7 +9256,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 191 "__id__": 188
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9385,7 +9312,7 @@ ...@@ -9385,7 +9312,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 190 "__id__": 187
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9479,19 +9406,19 @@ ...@@ -9479,19 +9406,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 194 "__id__": 191
}, },
{ {
"__id__": 196 "__id__": 193
}, },
{ {
"__id__": 198 "__id__": 195
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 200 "__id__": 197
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9547,13 +9474,13 @@ ...@@ -9547,13 +9474,13 @@
"_name": "bg_blue", "_name": "bg_blue",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 193 "__id__": 190
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 195 "__id__": 192
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9609,7 +9536,7 @@ ...@@ -9609,7 +9536,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 194 "__id__": 191
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9641,13 +9568,13 @@ ...@@ -9641,13 +9568,13 @@
"_name": "bg_green", "_name": "bg_green",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 193 "__id__": 190
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 197 "__id__": 194
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9703,7 +9630,7 @@ ...@@ -9703,7 +9630,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 196 "__id__": 193
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9735,13 +9662,13 @@ ...@@ -9735,13 +9662,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 193 "__id__": 190
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 199 "__id__": 196
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9797,7 +9724,7 @@ ...@@ -9797,7 +9724,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 198 "__id__": 195
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9832,7 +9759,7 @@ ...@@ -9832,7 +9759,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 193 "__id__": 190
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -9893,7 +9820,7 @@ ...@@ -9893,7 +9820,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 193 "__id__": 190
}, },
"_id": "176BYmeDpPZ68HlISEHa8t" "_id": "176BYmeDpPZ68HlISEHa8t"
}, },
...@@ -9964,28 +9891,28 @@ ...@@ -9964,28 +9891,28 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 203 "__id__": 200
}, },
{ {
"__id__": 205 "__id__": 202
}, },
{ {
"__id__": 207 "__id__": 204
}, },
{ {
"__id__": 209 "__id__": 206
}, },
{ {
"__id__": 211 "__id__": 208
}, },
{ {
"__id__": 215 "__id__": 212
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 221 "__id__": 218
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10041,13 +9968,13 @@ ...@@ -10041,13 +9968,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 202 "__id__": 199
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 204 "__id__": 201
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10103,7 +10030,7 @@ ...@@ -10103,7 +10030,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 203 "__id__": 200
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10135,13 +10062,13 @@ ...@@ -10135,13 +10062,13 @@
"_name": "chose", "_name": "chose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 202 "__id__": 199
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 206 "__id__": 203
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10197,7 +10124,7 @@ ...@@ -10197,7 +10124,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 205 "__id__": 202
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10229,13 +10156,13 @@ ...@@ -10229,13 +10156,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 202 "__id__": 199
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 208 "__id__": 205
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10291,7 +10218,7 @@ ...@@ -10291,7 +10218,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 207 "__id__": 204
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10323,13 +10250,13 @@ ...@@ -10323,13 +10250,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 202 "__id__": 199
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 210 "__id__": 207
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10385,7 +10312,7 @@ ...@@ -10385,7 +10312,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 209 "__id__": 206
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10420,17 +10347,17 @@ ...@@ -10420,17 +10347,17 @@
"_name": "fail", "_name": "fail",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 202 "__id__": 199
}, },
"_children": [ "_children": [
{ {
"__id__": 212 "__id__": 209
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 214 "__id__": 211
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10486,13 +10413,13 @@ ...@@ -10486,13 +10413,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 211 "__id__": 208
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 213 "__id__": 210
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10548,7 +10475,7 @@ ...@@ -10548,7 +10475,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 212 "__id__": 209
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10583,7 +10510,7 @@ ...@@ -10583,7 +10510,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 211 "__id__": 208
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10615,20 +10542,20 @@ ...@@ -10615,20 +10542,20 @@
"_name": "success", "_name": "success",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 202 "__id__": 199
}, },
"_children": [ "_children": [
{ {
"__id__": 216 "__id__": 213
}, },
{ {
"__id__": 218 "__id__": 215
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 220 "__id__": 217
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10684,13 +10611,13 @@ ...@@ -10684,13 +10611,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 215 "__id__": 212
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 217 "__id__": 214
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10746,7 +10673,7 @@ ...@@ -10746,7 +10673,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 216 "__id__": 213
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10781,13 +10708,13 @@ ...@@ -10781,13 +10708,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 215 "__id__": 212
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 219 "__id__": 216
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10843,7 +10770,7 @@ ...@@ -10843,7 +10770,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 218 "__id__": 215
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10875,7 +10802,7 @@ ...@@ -10875,7 +10802,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 215 "__id__": 212
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10907,7 +10834,7 @@ ...@@ -10907,7 +10834,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 202 "__id__": 199
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10968,7 +10895,7 @@ ...@@ -10968,7 +10895,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 202 "__id__": 199
}, },
"_id": "58IQ76yf1KT71BqZoNtHOV" "_id": "58IQ76yf1KT71BqZoNtHOV"
}, },
...@@ -10981,11 +10908,7 @@ ...@@ -10981,11 +10908,7 @@
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [],
{
"__id__": 223
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -11034,27 +10957,6 @@ ...@@ -11034,27 +10957,6 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "2bxgAtmQJP+bUQoreYMry9" "_id": "2bxgAtmQJP+bUQoreYMry9"
}, },
{
"__type__": "ddd8cqr7ixHg55/ASPnReOS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 222
},
"_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", "__type__": "cc.Node",
"_name": "btn_replay1", "_name": "btn_replay1",
...@@ -11066,13 +10968,10 @@ ...@@ -11066,13 +10968,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 225 "__id__": 221
},
{
"__id__": 226
}, },
{ {
"__id__": 227 "__id__": 222
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11128,7 +11027,7 @@ ...@@ -11128,7 +11027,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 224 "__id__": 220
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11160,7 +11059,7 @@ ...@@ -11160,7 +11059,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 224 "__id__": 220
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -11221,31 +11120,10 @@ ...@@ -11221,31 +11120,10 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 224 "__id__": 220
}, },
"_id": "86ErSTSUhP26kFUGhhqqPn" "_id": "86ErSTSUhP26kFUGhhqqPn"
}, },
{
"__type__": "ddd8cqr7ixHg55/ASPnReOS",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 224
},
"_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", "__type__": "cc.Node",
"_name": "layout_stars", "_name": "layout_stars",
...@@ -11257,10 +11135,10 @@ ...@@ -11257,10 +11135,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 229 "__id__": 224
}, },
{ {
"__id__": 230 "__id__": 225
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11316,7 +11194,7 @@ ...@@ -11316,7 +11194,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 228 "__id__": 223
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -11348,7 +11226,7 @@ ...@@ -11348,7 +11226,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 228 "__id__": 223
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -11497,7 +11375,7 @@ ...@@ -11497,7 +11375,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 234 "__id__": 229
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11553,7 +11431,7 @@ ...@@ -11553,7 +11431,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 233 "__id__": 228
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11597,13 +11475,13 @@ ...@@ -11597,13 +11475,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 236 "__id__": 231
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 240 "__id__": 235
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11659,17 +11537,17 @@ ...@@ -11659,17 +11537,17 @@
"_name": "Star", "_name": "Star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 235 "__id__": 230
}, },
"_children": [ "_children": [
{ {
"__id__": 237 "__id__": 232
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 239 "__id__": 234
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11725,13 +11603,13 @@ ...@@ -11725,13 +11603,13 @@
"_name": "StarBig", "_name": "StarBig",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 236 "__id__": 231
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 238 "__id__": 233
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11787,7 +11665,7 @@ ...@@ -11787,7 +11665,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 237 "__id__": 232
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11819,7 +11697,7 @@ ...@@ -11819,7 +11697,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 236 "__id__": 231
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11851,7 +11729,7 @@ ...@@ -11851,7 +11729,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 235 "__id__": 230
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11887,22 +11765,22 @@ ...@@ -11887,22 +11765,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 242 "__id__": 237
}, },
{ {
"__id__": 244 "__id__": 239
}, },
{ {
"__id__": 246 "__id__": 241
}, },
{ {
"__id__": 248 "__id__": 243
}, },
{ {
"__id__": 250 "__id__": 245
}, },
{ {
"__id__": 252 "__id__": 247
} }
], ],
"_active": false, "_active": false,
...@@ -11960,13 +11838,13 @@ ...@@ -11960,13 +11838,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 241 "__id__": 236
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 243 "__id__": 238
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12022,7 +11900,7 @@ ...@@ -12022,7 +11900,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 242 "__id__": 237
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12054,13 +11932,13 @@ ...@@ -12054,13 +11932,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 241 "__id__": 236
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 245 "__id__": 240
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12116,7 +11994,7 @@ ...@@ -12116,7 +11994,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 244 "__id__": 239
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12148,13 +12026,13 @@ ...@@ -12148,13 +12026,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 241 "__id__": 236
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 247 "__id__": 242
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12210,7 +12088,7 @@ ...@@ -12210,7 +12088,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 246 "__id__": 241
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12242,13 +12120,13 @@ ...@@ -12242,13 +12120,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 241 "__id__": 236
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 249 "__id__": 244
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12304,7 +12182,7 @@ ...@@ -12304,7 +12182,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 248 "__id__": 243
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12336,13 +12214,13 @@ ...@@ -12336,13 +12214,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 241 "__id__": 236
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 251 "__id__": 246
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12398,7 +12276,7 @@ ...@@ -12398,7 +12276,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 250 "__id__": 245
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12430,13 +12308,13 @@ ...@@ -12430,13 +12308,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 241 "__id__": 236
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 253 "__id__": 248
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12492,7 +12370,7 @@ ...@@ -12492,7 +12370,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 252 "__id__": 247
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12527,6 +12405,9 @@ ...@@ -12527,6 +12405,9 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 250
},
{ {
"__id__": 255 "__id__": 255
}, },
...@@ -12538,9 +12419,6 @@ ...@@ -12538,9 +12419,6 @@
}, },
{ {
"__id__": 270 "__id__": 270
},
{
"__id__": 275
} }
], ],
"_active": false, "_active": false,
...@@ -12598,11 +12476,11 @@ ...@@ -12598,11 +12476,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 254 "__id__": 249
}, },
"_children": [ "_children": [
{ {
"__id__": 256 "__id__": 251
} }
], ],
"_active": true, "_active": true,
...@@ -12660,17 +12538,17 @@ ...@@ -12660,17 +12538,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 255 "__id__": 250
}, },
"_children": [ "_children": [
{ {
"__id__": 257 "__id__": 252
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 259 "__id__": 254
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12726,13 +12604,13 @@ ...@@ -12726,13 +12604,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 256 "__id__": 251
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 258 "__id__": 253
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12788,7 +12666,7 @@ ...@@ -12788,7 +12666,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 257 "__id__": 252
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12820,7 +12698,7 @@ ...@@ -12820,7 +12698,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 256 "__id__": 251
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12842,11 +12720,11 @@ ...@@ -12842,11 +12720,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 254 "__id__": 249
}, },
"_children": [ "_children": [
{ {
"__id__": 261 "__id__": 256
} }
], ],
"_active": true, "_active": true,
...@@ -12904,17 +12782,17 @@ ...@@ -12904,17 +12782,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 260 "__id__": 255
}, },
"_children": [ "_children": [
{ {
"__id__": 262 "__id__": 257
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 264 "__id__": 259
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12970,13 +12848,13 @@ ...@@ -12970,13 +12848,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 261 "__id__": 256
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 263 "__id__": 258
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13032,7 +12910,7 @@ ...@@ -13032,7 +12910,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 262 "__id__": 257
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13064,7 +12942,7 @@ ...@@ -13064,7 +12942,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 261 "__id__": 256
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13086,11 +12964,11 @@ ...@@ -13086,11 +12964,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 254 "__id__": 249
}, },
"_children": [ "_children": [
{ {
"__id__": 266 "__id__": 261
} }
], ],
"_active": true, "_active": true,
...@@ -13148,17 +13026,17 @@ ...@@ -13148,17 +13026,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 265 "__id__": 260
}, },
"_children": [ "_children": [
{ {
"__id__": 267 "__id__": 262
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 269 "__id__": 264
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13214,13 +13092,13 @@ ...@@ -13214,13 +13092,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 266 "__id__": 261
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 268 "__id__": 263
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13276,7 +13154,7 @@ ...@@ -13276,7 +13154,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 267 "__id__": 262
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13308,7 +13186,7 @@ ...@@ -13308,7 +13186,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 266 "__id__": 261
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13330,11 +13208,11 @@ ...@@ -13330,11 +13208,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 254 "__id__": 249
}, },
"_children": [ "_children": [
{ {
"__id__": 271 "__id__": 266
} }
], ],
"_active": true, "_active": true,
...@@ -13392,17 +13270,17 @@ ...@@ -13392,17 +13270,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 270 "__id__": 265
}, },
"_children": [ "_children": [
{ {
"__id__": 272 "__id__": 267
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 274 "__id__": 269
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13458,13 +13336,13 @@ ...@@ -13458,13 +13336,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 271 "__id__": 266
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 273 "__id__": 268
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13520,7 +13398,7 @@ ...@@ -13520,7 +13398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 272 "__id__": 267
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13552,7 +13430,7 @@ ...@@ -13552,7 +13430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 271 "__id__": 266
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13574,11 +13452,11 @@ ...@@ -13574,11 +13452,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 254 "__id__": 249
}, },
"_children": [ "_children": [
{ {
"__id__": 276 "__id__": 271
} }
], ],
"_active": true, "_active": true,
...@@ -13636,17 +13514,17 @@ ...@@ -13636,17 +13514,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 275 "__id__": 270
}, },
"_children": [ "_children": [
{ {
"__id__": 277 "__id__": 272
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 279 "__id__": 274
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13702,13 +13580,13 @@ ...@@ -13702,13 +13580,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 276 "__id__": 271
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 278 "__id__": 273
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13764,7 +13642,7 @@ ...@@ -13764,7 +13642,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 277 "__id__": 272
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13796,7 +13674,7 @@ ...@@ -13796,7 +13674,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 276 "__id__": 271
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
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;
}
});
{
"ver": "1.0.8",
"uuid": "ddd8caab-ee2c-4783-9e7f-0123e745e392",
"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