Commit aa27271b authored by chenzihui's avatar chenzihui

提交

parent e2bb69df
......@@ -75,22 +75,22 @@
"__id__": 5
},
{
"__id__": 204
"__id__": 206
},
{
"__id__": 211
"__id__": 213
}
],
"_active": true,
"_components": [
{
"__id__": 237
"__id__": 239
},
{
"__id__": 238
"__id__": 240
},
{
"__id__": 239
"__id__": 241
}
],
"_prefab": null,
......@@ -254,22 +254,22 @@
"__id__": 12
},
{
"__id__": 176
"__id__": 178
},
{
"__id__": 183
"__id__": 185
},
{
"__id__": 195
"__id__": 197
}
],
"_active": true,
"_components": [
{
"__id__": 202
"__id__": 204
},
{
"__id__": 203
"__id__": 205
}
],
"_prefab": null,
......@@ -593,28 +593,28 @@
"__id__": 146
},
{
"__id__": 153
},
{
"__id__": 155
"__id__": 154
},
{
"__id__": 165
"__id__": 156
},
{
"__id__": 169
"__id__": 166
},
{
"__id__": 171
},
{
"__id__": 173
},
{
"__id__": 175
}
],
"_active": true,
"_components": [
{
"__id__": 175
"__id__": 177
}
],
"_prefab": null,
......@@ -5577,6 +5577,9 @@
},
{
"__id__": 152
},
{
"__id__": 153
}
],
"_prefab": null,
......@@ -5854,6 +5857,33 @@
"playOnLoad": false,
"_id": "e06AxqaM1BJopcm6oD6qmx"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 45.80099999999999,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "54oF3fmX9GW42nVDg6nrro"
},
{
"__type__": "cc.Node",
"_name": "suiCake",
......@@ -5865,7 +5895,7 @@
"_active": false,
"_components": [
{
"__id__": 154
"__id__": 155
}
],
"_prefab": null,
......@@ -5921,7 +5951,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -5957,16 +5987,16 @@
},
"_children": [
{
"__id__": 156
"__id__": 157
},
{
"__id__": 158
"__id__": 159
}
],
"_active": true,
"_components": [
{
"__id__": 164
"__id__": 165
}
],
"_prefab": null,
......@@ -6022,13 +6052,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 156
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 157
"__id__": 158
}
],
"_prefab": null,
......@@ -6084,7 +6114,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 157
},
"_enabled": true,
"_materials": [
......@@ -6116,20 +6146,20 @@
"_name": "plane",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 156
},
"_children": [
{
"__id__": 159
"__id__": 160
}
],
"_active": true,
"_components": [
{
"__id__": 161
"__id__": 162
},
{
"__id__": 162
"__id__": 163
}
],
"_prefab": null,
......@@ -6185,13 +6215,13 @@
"_name": "dragonNode",
"_objFlags": 0,
"_parent": {
"__id__": 158
"__id__": 159
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 160
"__id__": 161
}
],
"_prefab": null,
......@@ -6247,7 +6277,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 159
"__id__": 160
},
"_enabled": true,
"_materials": [
......@@ -6283,7 +6313,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 159
},
"_enabled": true,
"_materials": [
......@@ -6315,7 +6345,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 159
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6324,7 +6354,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 163
"__id__": 164
}
],
"_N$interactable": true,
......@@ -6397,7 +6427,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 156
},
"_enabled": true,
"alignMode": 1,
......@@ -6430,10 +6460,13 @@
"_active": true,
"_components": [
{
"__id__": 166
"__id__": 167
},
{
"__id__": 167
"__id__": 168
},
{
"__id__": 170
}
],
"_prefab": null,
......@@ -6489,7 +6522,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 165
"__id__": 166
},
"_enabled": true,
"_materials": [
......@@ -6521,7 +6554,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 165
"__id__": 166
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6530,7 +6563,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 168
"__id__": 169
}
],
"_N$interactable": true,
......@@ -6598,6 +6631,33 @@
"handler": "onOkBtnClick",
"customEventData": ""
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 57.89100000000002,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "5bSBvDqYZGXY0PjBfEWSv7"
},
{
"__type__": "cc.Node",
"_name": "endNice",
......@@ -6609,7 +6669,7 @@
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 172
}
],
"_prefab": null,
......@@ -6665,7 +6725,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -6703,7 +6763,7 @@
"_active": true,
"_components": [
{
"__id__": 172
"__id__": 174
}
],
"_prefab": null,
......@@ -6759,7 +6819,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 173
},
"_enabled": true,
"_materials": [
......@@ -6797,7 +6857,7 @@
"_active": false,
"_components": [
{
"__id__": 174
"__id__": 176
}
],
"_prefab": null,
......@@ -6853,7 +6913,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -6924,19 +6984,19 @@
},
"_children": [
{
"__id__": 177
"__id__": 179
}
],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 181
},
{
"__id__": 180
"__id__": 182
},
{
"__id__": 181
"__id__": 183
}
],
"_prefab": null,
......@@ -6992,13 +7052,13 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 176
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 178
"__id__": 180
}
],
"_prefab": null,
......@@ -7054,7 +7114,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -7086,7 +7146,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 178
},
"_enabled": true,
"_materials": [
......@@ -7118,7 +7178,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 178
},
"_enabled": true,
"alignMode": 1,
......@@ -7145,7 +7205,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 178
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7154,7 +7214,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 182
"__id__": 184
}
],
"_N$interactable": true,
......@@ -7230,9 +7290,6 @@
"__id__": 5
},
"_children": [
{
"__id__": 184
},
{
"__id__": 186
},
......@@ -7244,12 +7301,15 @@
},
{
"__id__": 192
},
{
"__id__": 194
}
],
"_active": true,
"_components": [
{
"__id__": 194
"__id__": 196
}
],
"_prefab": null,
......@@ -7305,13 +7365,13 @@
"_name": "cakeDiPos",
"_objFlags": 0,
"_parent": {
"__id__": 183
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 185
"__id__": 187
}
],
"_prefab": null,
......@@ -7367,7 +7427,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 184
"__id__": 186
},
"_enabled": true,
"alignMode": 1,
......@@ -7394,13 +7454,13 @@
"_name": "choosePos",
"_objFlags": 0,
"_parent": {
"__id__": 183
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 187
"__id__": 189
}
],
"_prefab": null,
......@@ -7456,7 +7516,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 188
},
"_enabled": true,
"alignMode": 1,
......@@ -7483,13 +7543,13 @@
"_name": "cakeOutPos",
"_objFlags": 0,
"_parent": {
"__id__": 183
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 189
"__id__": 191
}
],
"_prefab": null,
......@@ -7545,7 +7605,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 188
"__id__": 190
},
"_enabled": true,
"alignMode": 1,
......@@ -7572,13 +7632,13 @@
"_name": "chooseOutPos",
"_objFlags": 0,
"_parent": {
"__id__": 183
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 191
"__id__": 193
}
],
"_prefab": null,
......@@ -7634,7 +7694,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 192
},
"_enabled": true,
"alignMode": 1,
......@@ -7661,13 +7721,13 @@
"_name": "dropCakePos",
"_objFlags": 0,
"_parent": {
"__id__": 183
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 193
"__id__": 195
}
],
"_prefab": null,
......@@ -7723,7 +7783,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 194
},
"_enabled": true,
"alignMode": 1,
......@@ -7750,7 +7810,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 185
},
"_enabled": true,
"alignMode": 1,
......@@ -7781,19 +7841,19 @@
},
"_children": [
{
"__id__": 196
"__id__": 198
},
{
"__id__": 198
"__id__": 200
}
],
"_active": true,
"_components": [
{
"__id__": 200
"__id__": 202
},
{
"__id__": 201
"__id__": 203
}
],
"_prefab": null,
......@@ -7849,13 +7909,13 @@
"_name": "excellentDargon",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 197
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 197
"__id__": 199
}
],
"_prefab": null,
......@@ -7911,7 +7971,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 196
"__id__": 198
},
"_enabled": true,
"_materials": [
......@@ -7951,13 +8011,13 @@
"_name": "nicetry",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 197
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 199
"__id__": 201
}
],
"_prefab": null,
......@@ -8013,7 +8073,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 198
"__id__": 200
},
"_enabled": true,
"_materials": [
......@@ -8045,7 +8105,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 197
},
"_enabled": true,
"_materials": [
......@@ -8077,7 +8137,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 197
},
"_enabled": true,
"alignMode": 1,
......@@ -8167,10 +8227,10 @@
},
"_children": [
{
"__id__": 205
"__id__": 207
},
{
"__id__": 208
"__id__": 210
}
],
"_active": false,
......@@ -8228,16 +8288,16 @@
"_name": "btn_left",
"_objFlags": 0,
"_parent": {
"__id__": 204
"__id__": 206
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 206
"__id__": 208
},
{
"__id__": 207
"__id__": 209
}
],
"_prefab": null,
......@@ -8293,7 +8353,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 205
"__id__": 207
},
"_enabled": true,
"_materials": [
......@@ -8325,7 +8385,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 205
"__id__": 207
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8393,16 +8453,16 @@
"_name": "btn_right",
"_objFlags": 0,
"_parent": {
"__id__": 204
"__id__": 206
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 209
"__id__": 211
},
{
"__id__": 210
"__id__": 212
}
],
"_prefab": null,
......@@ -8458,7 +8518,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 208
"__id__": 210
},
"_enabled": true,
"_materials": [
......@@ -8490,7 +8550,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 208
"__id__": 210
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8562,13 +8622,13 @@
},
"_children": [
{
"__id__": 212
"__id__": 214
},
{
"__id__": 215
"__id__": 217
},
{
"__id__": 218
"__id__": 220
}
],
"_active": false,
......@@ -8626,11 +8686,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 211
"__id__": 213
},
"_children": [
{
"__id__": 213
"__id__": 215
}
],
"_active": true,
......@@ -8688,13 +8748,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 214
"__id__": 216
}
],
"_prefab": null,
......@@ -8750,7 +8810,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 213
"__id__": 215
},
"_enabled": true,
"_materials": [],
......@@ -8781,11 +8841,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 211
"__id__": 213
},
"_children": [
{
"__id__": 216
"__id__": 218
}
],
"_active": true,
......@@ -8843,13 +8903,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 215
"__id__": 217
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 217
"__id__": 219
}
],
"_prefab": null,
......@@ -8905,7 +8965,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 216
"__id__": 218
},
"_enabled": true,
"_materials": [],
......@@ -8933,12 +8993,9 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 211
"__id__": 213
},
"_children": [
{
"__id__": 219
},
{
"__id__": 221
},
......@@ -8962,6 +9019,9 @@
},
{
"__id__": 235
},
{
"__id__": 237
}
],
"_active": true,
......@@ -9019,13 +9079,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 220
"__id__": 222
}
],
"_prefab": null,
......@@ -9081,7 +9141,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 219
"__id__": 221
},
"_enabled": true,
"_clip": {
......@@ -9100,13 +9160,13 @@
"_name": "effect_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 222
"__id__": 224
}
],
"_prefab": null,
......@@ -9162,7 +9222,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 223
},
"_enabled": true,
"_clip": {
......@@ -9181,13 +9241,13 @@
"_name": "effect_inScene",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 224
"__id__": 226
}
],
"_prefab": null,
......@@ -9243,7 +9303,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 225
},
"_enabled": true,
"_clip": {
......@@ -9262,13 +9322,13 @@
"_name": "effect_allWin",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 226
"__id__": 228
}
],
"_prefab": null,
......@@ -9324,7 +9384,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 227
},
"_enabled": true,
"_clip": {
......@@ -9343,13 +9403,13 @@
"_name": "effect_chooseTrue",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 228
"__id__": 230
}
],
"_prefab": null,
......@@ -9405,7 +9465,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 229
},
"_enabled": true,
"_clip": {
......@@ -9424,13 +9484,13 @@
"_name": "effect_end",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 230
"__id__": 232
}
],
"_prefab": null,
......@@ -9486,7 +9546,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 229
"__id__": 231
},
"_enabled": true,
"_clip": {
......@@ -9505,13 +9565,13 @@
"_name": "effect_nicetry",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 232
"__id__": 234
}
],
"_prefab": null,
......@@ -9567,7 +9627,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 231
"__id__": 233
},
"_enabled": true,
"_clip": {
......@@ -9586,13 +9646,13 @@
"_name": "excellent",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 234
"__id__": 236
}
],
"_prefab": null,
......@@ -9648,7 +9708,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 233
"__id__": 235
},
"_enabled": true,
"_clip": {
......@@ -9667,13 +9727,13 @@
"_name": "nicetry",
"_objFlags": 0,
"_parent": {
"__id__": 218
"__id__": 220
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 236
"__id__": 238
}
],
"_prefab": null,
......@@ -9729,7 +9789,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 235
"__id__": 237
},
"_enabled": true,
"_clip": {
......@@ -9799,7 +9859,7 @@
"__id__": 8
},
"startNode": {
"__id__": 176
"__id__": 178
},
"titleCake": {
"__uuid__": "2fb93a4a-5bcf-4a5c-9dd1-7ef0b9dced20"
......@@ -9832,37 +9892,37 @@
"__id__": 21
},
"suiCake": {
"__id__": 153
"__id__": 154
},
"posNode": {
"__id__": 183
"__id__": 185
},
"endNode": {
"__id__": 155
"__id__": 156
},
"okBtn": {
"__id__": 165
"__id__": 166
},
"whiteNode": {
"__id__": 195
"__id__": 197
},
"endNodeDragon": {
"__id__": 160
"__id__": 161
},
"excellentDragon": {
"__id__": 197
"__id__": 199
},
"nicetryNode": {
"__id__": 198
"__id__": 200
},
"allWinEnd": {
"__id__": 174
"__id__": 176
},
"endNice": {
"__id__": 169
"__id__": 171
},
"endCome": {
"__id__": 171
"__id__": 173
},
"_id": "eaTVUpqahPfZeO9+sUI7RP"
}
......
......@@ -504,9 +504,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
startTalking() {
if ((<any>window).courseware && (<any>window).courseware.stopTest) {
(<any>window).courseware.startTest(this.data.questions[this.level - 1].text);
}
// if ((<any>window).courseware && (<any>window).courseware.stopTest) {
// (<any>window).courseware.startTest(this.data.questions[this.level - 1].text);
// }
window['courseware'].startTest(this.data.questions[this.level - 1].text);
}
stopTalking() {
......@@ -516,27 +518,34 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.moveOutOkBtn();
this.showWhiteNode();
let timeout = false
if ((<any>window).courseware && (<any>window).courseware.stopTest) {
this.scheduleOnce(()=>{
timeout = true;
this.reviewFail();
},3);
(<any>window).courseware.stopTest((res) => {
if(!timeout)
{
this.unscheduleAllCallbacks();
res = JSON.parse(res)
window['courseware'].stopTest((res) =>{
if (res.result && res.result.overall >= 80) {
this.reviewSuccess();
} else {
this.reviewFail();
}
}
})
} else {
this.reviewFail();
}
// let timeout = false
// if ((<any>window).courseware && (<any>window).courseware.stopTest) {
// this.scheduleOnce(()=>{
// timeout = true;
// this.reviewFail();
// },3);
// (<any>window).courseware.stopTest((res) => {
// if(!timeout)
// {
// this.unscheduleAllCallbacks();
// res = JSON.parse(res)
// if (res.result && res.result.overall >= 80) {
// this.reviewSuccess();
// } else {
// this.reviewFail();
// }
// }
// })
// } else {
// this.reviewFail();
// }
}
playLocalAudio(audioName: string){
......
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