Commit 7bcd6439 authored by liujiangnan's avatar liujiangnan

兼容正式

parent f8ab5040
...@@ -311,28 +311,28 @@ ...@@ -311,28 +311,28 @@
"__id__": 28 "__id__": 28
}, },
{ {
"__id__": 230 "__id__": 233
}, },
{ {
"__id__": 265 "__id__": 268
}, },
{ {
"__id__": 267 "__id__": 270
}, },
{ {
"__id__": 277 "__id__": 280
}, },
{ {
"__id__": 279 "__id__": 282
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 281 "__id__": 284
}, },
{ {
"__id__": 282 "__id__": 285
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1426,7 +1426,7 @@ ...@@ -1426,7 +1426,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 229 "__id__": 232
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9564,31 +9564,34 @@ ...@@ -9564,31 +9564,34 @@
"__id__": 193 "__id__": 193
}, },
{ {
"__id__": 201 "__id__": 196
}, },
{ {
"__id__": 205 "__id__": 204
}, },
{ {
"__id__": 209 "__id__": 208
}, },
{ {
"__id__": 213 "__id__": 212
}, },
{ {
"__id__": 223 "__id__": 216
},
{
"__id__": 226
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 226 "__id__": 229
}, },
{ {
"__id__": 227 "__id__": 230
}, },
{ {
"__id__": 228 "__id__": 231
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9639,6 +9642,130 @@ ...@@ -9639,6 +9642,130 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "c6NTOabvRKNJ0TXA+bPxAI" "_id": "c6NTOabvRKNJ0TXA+bPxAI"
}, },
{
"__type__": "cc.Node",
"_name": "jjlogo",
"_objFlags": 0,
"_parent": {
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 194
},
{
"__id__": 195
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 212,
"height": 52
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0.42600000000004457,
296.7,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "acuEvJkT5NuK44j3HT6XTX"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 193
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "1481814a-d93d-4190-a32d-e50953088549"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "57oJ7fjp1B7bFaAg5BFzfW"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 193
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 41,
"_left": 534.426,
"_right": 533.574,
"_top": 37.30000000000001,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 212,
"_originalHeight": 0,
"_id": "95i0W6LqBHwa5Nh4ilbXE/"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "goDebug", "_name": "goDebug",
...@@ -9648,16 +9775,16 @@ ...@@ -9648,16 +9775,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 194 "__id__": 197
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 199 "__id__": 202
}, },
{ {
"__id__": 200 "__id__": 203
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9713,20 +9840,20 @@ ...@@ -9713,20 +9840,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 193 "__id__": 196
}, },
"_children": [ "_children": [
{ {
"__id__": 195 "__id__": 198
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 197 "__id__": 200
}, },
{ {
"__id__": 198 "__id__": 201
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9782,13 +9909,13 @@ ...@@ -9782,13 +9909,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 194 "__id__": 197
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 196 "__id__": 199
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9844,7 +9971,7 @@ ...@@ -9844,7 +9971,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 195 "__id__": 198
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9877,7 +10004,7 @@ ...@@ -9877,7 +10004,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 194 "__id__": 197
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9909,7 +10036,7 @@ ...@@ -9909,7 +10036,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 194 "__id__": 197
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -9936,7 +10063,7 @@ ...@@ -9936,7 +10063,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 193 "__id__": 196
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10009,7 +10136,7 @@ ...@@ -10009,7 +10136,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 194 "__id__": 197
}, },
"_id": "97RWbur3ZA1alSfnCVquiv" "_id": "97RWbur3ZA1alSfnCVquiv"
}, },
...@@ -10018,7 +10145,7 @@ ...@@ -10018,7 +10145,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 193 "__id__": 196
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -10051,13 +10178,13 @@ ...@@ -10051,13 +10178,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 202 "__id__": 205
}, },
{ {
"__id__": 203 "__id__": 206
}, },
{ {
"__id__": 204 "__id__": 207
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10113,7 +10240,7 @@ ...@@ -10113,7 +10240,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 201 "__id__": 204
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10145,7 +10272,7 @@ ...@@ -10145,7 +10272,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 201 "__id__": 204
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10213,7 +10340,7 @@ ...@@ -10213,7 +10340,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 201 "__id__": 204
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -10246,13 +10373,13 @@ ...@@ -10246,13 +10373,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 206 "__id__": 209
}, },
{ {
"__id__": 207 "__id__": 210
}, },
{ {
"__id__": 208 "__id__": 211
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10308,7 +10435,7 @@ ...@@ -10308,7 +10435,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 205 "__id__": 208
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10340,7 +10467,7 @@ ...@@ -10340,7 +10467,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 205 "__id__": 208
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10408,7 +10535,7 @@ ...@@ -10408,7 +10535,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 205 "__id__": 208
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -10441,13 +10568,13 @@ ...@@ -10441,13 +10568,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 210 "__id__": 213
}, },
{ {
"__id__": 211 "__id__": 214
}, },
{ {
"__id__": 212 "__id__": 215
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10503,7 +10630,7 @@ ...@@ -10503,7 +10630,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 209 "__id__": 212
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10535,7 +10662,7 @@ ...@@ -10535,7 +10662,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 209 "__id__": 212
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10603,7 +10730,7 @@ ...@@ -10603,7 +10730,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 209 "__id__": 212
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -10634,19 +10761,19 @@ ...@@ -10634,19 +10761,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 214 "__id__": 217
}, },
{ {
"__id__": 218 "__id__": 221
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 221 "__id__": 224
}, },
{ {
"__id__": 222 "__id__": 225
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10702,19 +10829,19 @@ ...@@ -10702,19 +10829,19 @@
"_name": "btnLeft", "_name": "btnLeft",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 213 "__id__": 216
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 215 "__id__": 218
}, },
{ {
"__id__": 216 "__id__": 219
}, },
{ {
"__id__": 217 "__id__": 220
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10770,7 +10897,7 @@ ...@@ -10770,7 +10897,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 214 "__id__": 217
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10802,7 +10929,7 @@ ...@@ -10802,7 +10929,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 214 "__id__": 217
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10870,7 +10997,7 @@ ...@@ -10870,7 +10997,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 214 "__id__": 217
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -10897,16 +11024,16 @@ ...@@ -10897,16 +11024,16 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 213 "__id__": 216
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 219 "__id__": 222
}, },
{ {
"__id__": 220 "__id__": 223
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10962,7 +11089,7 @@ ...@@ -10962,7 +11089,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 218 "__id__": 221
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10995,7 +11122,7 @@ ...@@ -10995,7 +11122,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 218 "__id__": 221
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -11022,7 +11149,7 @@ ...@@ -11022,7 +11149,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 213 "__id__": 216
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11054,7 +11181,7 @@ ...@@ -11054,7 +11181,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 213 "__id__": 216
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -11087,10 +11214,10 @@ ...@@ -11087,10 +11214,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 224 "__id__": 227
}, },
{ {
"__id__": 225 "__id__": 228
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11146,7 +11273,7 @@ ...@@ -11146,7 +11273,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 223 "__id__": 226
}, },
"_enabled": true, "_enabled": true,
"_url": "https://openapi.iteachabc.com/api/courseware/v1/9/share/55528", "_url": "https://openapi.iteachabc.com/api/courseware/v1/9/share/55528",
...@@ -11158,7 +11285,7 @@ ...@@ -11158,7 +11285,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 223 "__id__": 226
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -11285,25 +11412,25 @@ ...@@ -11285,25 +11412,25 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 231 "__id__": 234
}, },
{ {
"__id__": 237 "__id__": 240
}, },
{ {
"__id__": 240 "__id__": 243
}, },
{ {
"__id__": 248 "__id__": 251
}, },
{ {
"__id__": 256 "__id__": 259
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 264 "__id__": 267
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11359,20 +11486,20 @@ ...@@ -11359,20 +11486,20 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 230 "__id__": 233
}, },
"_children": [ "_children": [
{ {
"__id__": 232 "__id__": 235
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 235 "__id__": 238
}, },
{ {
"__id__": 236 "__id__": 239
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11428,16 +11555,16 @@ ...@@ -11428,16 +11555,16 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 231 "__id__": 234
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 233 "__id__": 236
}, },
{ {
"__id__": 234 "__id__": 237
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11493,7 +11620,7 @@ ...@@ -11493,7 +11620,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 232 "__id__": 235
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11526,7 +11653,7 @@ ...@@ -11526,7 +11653,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 232 "__id__": 235
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -11553,7 +11680,7 @@ ...@@ -11553,7 +11680,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 231 "__id__": 234
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -11585,7 +11712,7 @@ ...@@ -11585,7 +11712,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 231 "__id__": 234
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -11612,16 +11739,16 @@ ...@@ -11612,16 +11739,16 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 230 "__id__": 233
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 238 "__id__": 241
}, },
{ {
"__id__": 239 "__id__": 242
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11677,7 +11804,7 @@ ...@@ -11677,7 +11804,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 237 "__id__": 240
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11709,7 +11836,7 @@ ...@@ -11709,7 +11836,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 237 "__id__": 240
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -11736,26 +11863,26 @@ ...@@ -11736,26 +11863,26 @@
"_name": "Console", "_name": "Console",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 230 "__id__": 233
}, },
"_children": [ "_children": [
{ {
"__id__": 241 "__id__": 244
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 244 "__id__": 247
}, },
{ {
"__id__": 245 "__id__": 248
}, },
{ {
"__id__": 246 "__id__": 249
}, },
{ {
"__id__": 247 "__id__": 250
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11811,16 +11938,16 @@ ...@@ -11811,16 +11938,16 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 240 "__id__": 243
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 242 "__id__": 245
}, },
{ {
"__id__": 243 "__id__": 246
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11876,7 +12003,7 @@ ...@@ -11876,7 +12003,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 241 "__id__": 244
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -11908,7 +12035,7 @@ ...@@ -11908,7 +12035,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 241 "__id__": 244
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -11935,7 +12062,7 @@ ...@@ -11935,7 +12062,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 240 "__id__": 243
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -11962,7 +12089,7 @@ ...@@ -11962,7 +12089,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 240 "__id__": 243
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11982,7 +12109,7 @@ ...@@ -11982,7 +12109,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 240 "__id__": 243
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -11994,10 +12121,10 @@ ...@@ -11994,10 +12121,10 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 241 "__id__": 244
}, },
"content": { "content": {
"__id__": 241 "__id__": 244
}, },
"_id": "43wBGhGBpFP7OYyNM+j0Ho" "_id": "43wBGhGBpFP7OYyNM+j0Ho"
}, },
...@@ -12006,7 +12133,7 @@ ...@@ -12006,7 +12133,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 240 "__id__": 243
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -12038,20 +12165,20 @@ ...@@ -12038,20 +12165,20 @@
"_name": "BtnClose", "_name": "BtnClose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 230 "__id__": 233
}, },
"_children": [ "_children": [
{ {
"__id__": 249 "__id__": 252
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 254 "__id__": 257
}, },
{ {
"__id__": 255 "__id__": 258
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12107,20 +12234,20 @@ ...@@ -12107,20 +12234,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 248 "__id__": 251
}, },
"_children": [ "_children": [
{ {
"__id__": 250 "__id__": 253
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 252 "__id__": 255
}, },
{ {
"__id__": 253 "__id__": 256
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12176,13 +12303,13 @@ ...@@ -12176,13 +12303,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 249 "__id__": 252
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 251 "__id__": 254
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12238,7 +12365,7 @@ ...@@ -12238,7 +12365,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 250 "__id__": 253
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12271,7 +12398,7 @@ ...@@ -12271,7 +12398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 249 "__id__": 252
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12303,7 +12430,7 @@ ...@@ -12303,7 +12430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 249 "__id__": 252
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -12330,7 +12457,7 @@ ...@@ -12330,7 +12457,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 248 "__id__": 251
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -12403,7 +12530,7 @@ ...@@ -12403,7 +12530,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 249 "__id__": 252
}, },
"_id": "54SC9WcmBAZ6cTznyI0o+3" "_id": "54SC9WcmBAZ6cTznyI0o+3"
}, },
...@@ -12412,7 +12539,7 @@ ...@@ -12412,7 +12539,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 248 "__id__": 251
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -12439,20 +12566,20 @@ ...@@ -12439,20 +12566,20 @@
"_name": "BtnOpen", "_name": "BtnOpen",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 230 "__id__": 233
}, },
"_children": [ "_children": [
{ {
"__id__": 257 "__id__": 260
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 262 "__id__": 265
}, },
{ {
"__id__": 263 "__id__": 266
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12508,20 +12635,20 @@ ...@@ -12508,20 +12635,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 256 "__id__": 259
}, },
"_children": [ "_children": [
{ {
"__id__": 258 "__id__": 261
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 260 "__id__": 263
}, },
{ {
"__id__": 261 "__id__": 264
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12577,13 +12704,13 @@ ...@@ -12577,13 +12704,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 257 "__id__": 260
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 259 "__id__": 262
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12639,7 +12766,7 @@ ...@@ -12639,7 +12766,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 258 "__id__": 261
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12672,7 +12799,7 @@ ...@@ -12672,7 +12799,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 257 "__id__": 260
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12704,7 +12831,7 @@ ...@@ -12704,7 +12831,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 257 "__id__": 260
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -12731,7 +12858,7 @@ ...@@ -12731,7 +12858,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 256 "__id__": 259
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -12804,7 +12931,7 @@ ...@@ -12804,7 +12931,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 257 "__id__": 260
}, },
"_id": "81HoUuRyJOppi+n4Av/u0p" "_id": "81HoUuRyJOppi+n4Av/u0p"
}, },
...@@ -12813,7 +12940,7 @@ ...@@ -12813,7 +12940,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 256 "__id__": 259
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -12840,7 +12967,7 @@ ...@@ -12840,7 +12967,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 230 "__id__": 233
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -12873,7 +13000,7 @@ ...@@ -12873,7 +13000,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 266 "__id__": 269
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12929,7 +13056,7 @@ ...@@ -12929,7 +13056,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 265 "__id__": 268
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -12965,16 +13092,16 @@ ...@@ -12965,16 +13092,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 268 "__id__": 271
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 275 "__id__": 278
}, },
{ {
"__id__": 276 "__id__": 279
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13030,24 +13157,24 @@ ...@@ -13030,24 +13157,24 @@
"_name": "progress", "_name": "progress",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 267 "__id__": 270
}, },
"_children": [ "_children": [
{ {
"__id__": 269 "__id__": 272
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 272 "__id__": 275
}, },
{ {
"__id__": 273 "__id__": 276
} }
], ],
"_prefab": { "_prefab": {
"__id__": 274 "__id__": 277
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -13101,17 +13228,17 @@ ...@@ -13101,17 +13228,17 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 268 "__id__": 271
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 270 "__id__": 273
} }
], ],
"_prefab": { "_prefab": {
"__id__": 271 "__id__": 274
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -13165,7 +13292,7 @@ ...@@ -13165,7 +13292,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 269 "__id__": 272
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13195,7 +13322,7 @@ ...@@ -13195,7 +13322,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 268 "__id__": 271
}, },
"asset": { "asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4" "__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
...@@ -13208,7 +13335,7 @@ ...@@ -13208,7 +13335,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 268 "__id__": 271
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13240,7 +13367,7 @@ ...@@ -13240,7 +13367,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 268 "__id__": 271
}, },
"_enabled": true, "_enabled": true,
"_id": "3eMT/DXoJNGZT/8Z3nuTUH" "_id": "3eMT/DXoJNGZT/8Z3nuTUH"
...@@ -13248,7 +13375,7 @@ ...@@ -13248,7 +13375,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 268 "__id__": 271
}, },
"asset": { "asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4" "__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
...@@ -13261,7 +13388,7 @@ ...@@ -13261,7 +13388,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 267 "__id__": 270
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13293,7 +13420,7 @@ ...@@ -13293,7 +13420,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 267 "__id__": 270
}, },
"_enabled": true, "_enabled": true,
"_id": "d9Sm5lOKBAxKufJF2Q8Nr8" "_id": "d9Sm5lOKBAxKufJF2Q8Nr8"
...@@ -13309,7 +13436,7 @@ ...@@ -13309,7 +13436,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 278 "__id__": 281
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13365,7 +13492,7 @@ ...@@ -13365,7 +13492,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 277 "__id__": 280
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13403,7 +13530,7 @@ ...@@ -13403,7 +13530,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 280 "__id__": 283
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13459,7 +13586,7 @@ ...@@ -13459,7 +13586,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 279 "__id__": 282
}, },
"_enabled": true, "_enabled": true,
"_id": "c8RSZKHRJO95/RfIMIkSA5" "_id": "c8RSZKHRJO95/RfIMIkSA5"
......
...@@ -487,7 +487,12 @@ export default class NewClass extends middleLayerBase { ...@@ -487,7 +487,12 @@ export default class NewClass extends middleLayerBase {
}); });
cc.find('middleLayer/ui/jjdemo/ox').on('click', () => { cc.find('middleLayer/ui/jjdemo/ox').on('click', () => {
this.hideUI(); this.hideUI();
const engineObj = JSON.parse((<any>window).air.engineInfo);
if (engineObj.isDev == 1) {
this.loadOnlineCourseWare(27333, false, null); this.loadOnlineCourseWare(27333, false, null);
} else {
this.loadOnlineCourseWare(45892, false, null);
}
}); });
cc.find('middleLayer/ui/jjdemo/pp').on('click', () => { cc.find('middleLayer/ui/jjdemo/pp').on('click', () => {
cc.find('middleLayer/ui/jjdemo/web').active = true; cc.find('middleLayer/ui/jjdemo/web').active = true;
...@@ -499,7 +504,12 @@ export default class NewClass extends middleLayerBase { ...@@ -499,7 +504,12 @@ export default class NewClass extends middleLayerBase {
}); });
cc.find('middleLayer/ui/jjdemo/faf').on('click', () => { cc.find('middleLayer/ui/jjdemo/faf').on('click', () => {
this.hideUI(); this.hideUI();
const engineObj = JSON.parse((<any>window).air.engineInfo);
if (engineObj.isDev == 1) {
this.loadOnlineCourseWare(28089, false, null); this.loadOnlineCourseWare(28089, false, null);
} else {
this.loadOnlineCourseWare(54568, false, null);
}
}); });
} }
......
{
"ver": "2.3.5",
"uuid": "32c2e678-ddf9-4ed3-9641-029806db39fb",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 212,
"height": 52,
"platformSettings": {},
"subMetas": {
"jjlogo": {
"ver": "1.0.4",
"uuid": "1481814a-d93d-4190-a32d-e50953088549",
"rawTextureUuid": "32c2e678-ddf9-4ed3-9641-029806db39fb",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 212,
"height": 52,
"rawWidth": 212,
"rawHeight": 52,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"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