Commit 56d1898b authored by 杨一航's avatar 杨一航

add

parent 00875b70
......@@ -112,4 +112,9 @@ export default class Keyboard extends cc.Component {
this.btnHideNode.active = false;
}
}
showTips() {
cc.tween(this.btnShowNode).to(0.3, { scale: 1.2 }).to(0.7, { scale: 1 }).start();
cc.tween(this.btnHideNode).to(0.3, { scale: 1.2 }).to(0.7, { scale: 1 }).start();
}
}
......@@ -90,34 +90,34 @@
"__id__": 268
},
{
"__id__": 285
"__id__": 286
},
{
"__id__": 287
"__id__": 288
},
{
"__id__": 311
"__id__": 312
},
{
"__id__": 319
"__id__": 320
},
{
"__id__": 336
"__id__": 337
},
{
"__id__": 377
"__id__": 378
}
],
"_active": true,
"_components": [
{
"__id__": 382
},
{
"__id__": 383
},
{
"__id__": 384
},
{
"__id__": 385
}
],
"_prefab": null,
......@@ -12913,7 +12913,7 @@
"_active": true,
"_components": [
{
"__id__": 284
"__id__": 285
}
],
"_prefab": null,
......@@ -12976,19 +12976,19 @@
"__id__": 270
},
{
"__id__": 274
"__id__": 275
},
{
"__id__": 278
"__id__": 279
}
],
"_active": true,
"_components": [
{
"__id__": 282
"__id__": 283
},
{
"__id__": 283
"__id__": 284
}
],
"_prefab": null,
......@@ -13054,7 +13054,7 @@
"_active": true,
"_components": [
{
"__id__": 273
"__id__": 274
}
],
"_prefab": null,
......@@ -13073,15 +13073,15 @@
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"x": 0.74,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-5.236,
753.994,
115.606,
602.942,
0,
0,
0,
......@@ -13117,6 +13117,9 @@
"_components": [
{
"__id__": 272
},
{
"__id__": 273
}
],
"_prefab": null,
......@@ -13142,8 +13145,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-213.156,
126.371,
-326.196,
285.871,
0,
0,
0,
......@@ -13202,6 +13205,33 @@
"_N$cacheMode": 0,
"_id": "a4v/Yvi2NKrYrMhsqZmVVl"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 271
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": 22.343999999999994,
"_right": 0,
"_top": 33.129000000000005,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "32tlc9aHBG/7dBTFCM6xpT"
},
{
"__type__": "cc.Sprite",
"_name": "",
......@@ -13243,13 +13273,13 @@
},
"_children": [
{
"__id__": 275
"__id__": 276
}
],
"_active": true,
"_components": [
{
"__id__": 277
"__id__": 278
}
],
"_prefab": null,
......@@ -13305,13 +13335,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 274
"__id__": 275
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 276
"__id__": 277
}
],
"_prefab": null,
......@@ -13367,7 +13397,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 275
"__id__": 276
},
"_enabled": true,
"_normalMaterial": null,
......@@ -13435,7 +13465,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 274
"__id__": 275
},
"_enabled": true,
"_materials": [
......@@ -13479,13 +13509,13 @@
},
"_children": [
{
"__id__": 279
"__id__": 280
}
],
"_active": true,
"_components": [
{
"__id__": 281
"__id__": 282
}
],
"_prefab": null,
......@@ -13541,13 +13571,13 @@
"_name": "lb",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 280
"__id__": 281
}
],
"_prefab": null,
......@@ -13603,7 +13633,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 279
"__id__": 280
},
"_enabled": true,
"_materials": [
......@@ -13638,7 +13668,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 278
"__id__": 279
},
"_enabled": true,
"_materials": [
......@@ -13764,7 +13794,7 @@
"_active": false,
"_components": [
{
"__id__": 286
"__id__": 287
}
],
"_prefab": null,
......@@ -13820,7 +13850,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 285
"__id__": 286
},
"_enabled": true,
"_materials": [
......@@ -13856,19 +13886,19 @@
},
"_children": [
{
"__id__": 288
"__id__": 289
},
{
"__id__": 304
"__id__": 305
},
{
"__id__": 307
"__id__": 308
}
],
"_active": false,
"_components": [
{
"__id__": 310
"__id__": 311
}
],
"_prefab": null,
......@@ -13924,26 +13954,26 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 287
"__id__": 288
},
"_children": [
{
"__id__": 289
"__id__": 290
},
{
"__id__": 291
"__id__": 292
},
{
"__id__": 293
"__id__": 294
},
{
"__id__": 295
"__id__": 296
},
{
"__id__": 297
"__id__": 298
},
{
"__id__": 299
"__id__": 300
}
],
"_active": true,
......@@ -14001,13 +14031,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 288
"__id__": 289
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 290
"__id__": 291
}
],
"_prefab": null,
......@@ -14063,7 +14093,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 289
"__id__": 290
},
"_enabled": true,
"_materials": [
......@@ -14093,13 +14123,13 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 288
"__id__": 289
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 292
"__id__": 293
}
],
"_prefab": null,
......@@ -14155,7 +14185,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 291
"__id__": 292
},
"_enabled": true,
"_materials": [
......@@ -14187,13 +14217,13 @@
"_name": "pass",
"_objFlags": 0,
"_parent": {
"__id__": 288
"__id__": 289
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 294
"__id__": 295
}
],
"_prefab": null,
......@@ -14249,7 +14279,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 293
"__id__": 294
},
"_enabled": true,
"_materials": [
......@@ -14281,13 +14311,13 @@
"_name": "loss",
"_objFlags": 0,
"_parent": {
"__id__": 288
"__id__": 289
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 296
"__id__": 297
}
],
"_prefab": null,
......@@ -14343,7 +14373,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 295
"__id__": 296
},
"_enabled": true,
"_materials": [
......@@ -14375,13 +14405,13 @@
"_name": "lb",
"_objFlags": 0,
"_parent": {
"__id__": 288
"__id__": 289
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 298
"__id__": 299
}
],
"_prefab": null,
......@@ -14437,7 +14467,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 297
"__id__": 298
},
"_enabled": true,
"_materials": [
......@@ -14470,20 +14500,20 @@
"_name": "probar",
"_objFlags": 0,
"_parent": {
"__id__": 288
"__id__": 289
},
"_children": [
{
"__id__": 300
"__id__": 301
}
],
"_active": true,
"_components": [
{
"__id__": 302
"__id__": 303
},
{
"__id__": 303
"__id__": 304
}
],
"_prefab": null,
......@@ -14539,13 +14569,13 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 299
"__id__": 300
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 301
"__id__": 302
}
],
"_prefab": null,
......@@ -14601,7 +14631,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 300
"__id__": 301
},
"_enabled": true,
"_materials": [
......@@ -14633,7 +14663,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 299
"__id__": 300
},
"_enabled": true,
"_materials": [
......@@ -14665,12 +14695,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 299
"__id__": 300
},
"_enabled": true,
"_N$totalLength": 1170,
"_N$barSprite": {
"__id__": 301
"__id__": 302
},
"_N$mode": 0,
"_N$progress": 1,
......@@ -14682,16 +14712,16 @@
"_name": "catold",
"_objFlags": 0,
"_parent": {
"__id__": 287
"__id__": 288
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 305
"__id__": 306
},
{
"__id__": 306
"__id__": 307
}
],
"_prefab": null,
......@@ -14747,7 +14777,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 304
"__id__": 305
},
"_enabled": false,
"_materials": [
......@@ -14787,7 +14817,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 304
"__id__": 305
},
"_enabled": false,
"alignMode": 1,
......@@ -14814,16 +14844,16 @@
"_name": "cat",
"_objFlags": 0,
"_parent": {
"__id__": 287
"__id__": 288
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 308
"__id__": 309
},
{
"__id__": 309
"__id__": 310
}
],
"_prefab": null,
......@@ -14879,7 +14909,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 307
"__id__": 308
},
"_enabled": true,
"_materials": [
......@@ -14919,7 +14949,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 307
"__id__": 308
},
"_enabled": true,
"alignMode": 1,
......@@ -14946,7 +14976,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 287
"__id__": 288
},
"_enabled": true,
"_id": "6d/SGQOnxBVJwDKGdtO3xg"
......@@ -14960,13 +14990,13 @@
},
"_children": [
{
"__id__": 312
"__id__": 313
},
{
"__id__": 315
"__id__": 316
},
{
"__id__": 317
"__id__": 318
}
],
"_active": false,
......@@ -15024,16 +15054,16 @@
"_name": "endbg",
"_objFlags": 0,
"_parent": {
"__id__": 311
"__id__": 312
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 313
"__id__": 314
},
{
"__id__": 314
"__id__": 315
}
],
"_prefab": null,
......@@ -15089,7 +15119,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 312
"__id__": 313
},
"_enabled": true,
"_materials": [
......@@ -15121,7 +15151,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 312
"__id__": 313
},
"_enabled": true,
"alignMode": 1,
......@@ -15148,13 +15178,13 @@
"_name": "loss",
"_objFlags": 0,
"_parent": {
"__id__": 311
"__id__": 312
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 316
"__id__": 317
}
],
"_prefab": null,
......@@ -15210,7 +15240,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 315
"__id__": 316
},
"_enabled": true,
"_materials": [
......@@ -15242,13 +15272,13 @@
"_name": "win",
"_objFlags": 0,
"_parent": {
"__id__": 311
"__id__": 312
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 318
"__id__": 319
}
],
"_prefab": null,
......@@ -15304,7 +15334,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 317
"__id__": 318
},
"_enabled": true,
"_materials": [
......@@ -15340,19 +15370,19 @@
},
"_children": [
{
"__id__": 320
"__id__": 321
},
{
"__id__": 324
"__id__": 325
}
],
"_active": false,
"_components": [
{
"__id__": 334
"__id__": 335
},
{
"__id__": 335
"__id__": 336
}
],
"_prefab": null,
......@@ -15408,19 +15438,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 319
"__id__": 320
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 321
},
{
"__id__": 322
},
{
"__id__": 323
},
{
"__id__": 324
}
],
"_prefab": null,
......@@ -15476,7 +15506,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 320
"__id__": 321
},
"_enabled": true,
"_materials": [
......@@ -15506,7 +15536,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 320
"__id__": 321
},
"_enabled": true,
"alignMode": 2,
......@@ -15533,7 +15563,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 320
"__id__": 321
},
"_enabled": true,
"_normalMaterial": null,
......@@ -15601,20 +15631,20 @@
"_name": "BtnFrame",
"_objFlags": 0,
"_parent": {
"__id__": 319
"__id__": 320
},
"_children": [
{
"__id__": 325
"__id__": 326
},
{
"__id__": 329
"__id__": 330
}
],
"_active": true,
"_components": [
{
"__id__": 333
"__id__": 334
}
],
"_prefab": null,
......@@ -15670,19 +15700,19 @@
"_name": "BtnExit",
"_objFlags": 0,
"_parent": {
"__id__": 324
"__id__": 325
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 326
},
{
"__id__": 327
},
{
"__id__": 328
},
{
"__id__": 329
}
],
"_prefab": null,
......@@ -15738,7 +15768,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 325
"__id__": 326
},
"_enabled": true,
"_materials": [
......@@ -15770,7 +15800,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 325
"__id__": 326
},
"_enabled": true,
"alignMode": 1,
......@@ -15797,7 +15827,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 325
"__id__": 326
},
"_enabled": true,
"_normalMaterial": null,
......@@ -15865,19 +15895,19 @@
"_name": "BtnPlayAgain",
"_objFlags": 0,
"_parent": {
"__id__": 324
"__id__": 325
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 330
},
{
"__id__": 331
},
{
"__id__": 332
},
{
"__id__": 333
}
],
"_prefab": null,
......@@ -15933,7 +15963,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 329
"__id__": 330
},
"_enabled": true,
"_materials": [
......@@ -15965,7 +15995,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 329
"__id__": 330
},
"_enabled": true,
"alignMode": 1,
......@@ -15992,7 +16022,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 329
"__id__": 330
},
"_enabled": true,
"_normalMaterial": null,
......@@ -16060,7 +16090,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 324
"__id__": 325
},
"_enabled": true,
"_materials": [
......@@ -16092,7 +16122,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 319
"__id__": 320
},
"_enabled": true,
"alignMode": 2,
......@@ -16119,7 +16149,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 319
"__id__": 320
},
"_enabled": true,
"_id": "09WU6NXc9OR4frB91TsN13"
......@@ -16133,64 +16163,64 @@
},
"_children": [
{
"__id__": 337
"__id__": 338
},
{
"__id__": 339
"__id__": 340
},
{
"__id__": 341
"__id__": 342
},
{
"__id__": 343
"__id__": 344
},
{
"__id__": 345
"__id__": 346
},
{
"__id__": 347
"__id__": 348
},
{
"__id__": 349
"__id__": 350
},
{
"__id__": 351
"__id__": 352
},
{
"__id__": 353
"__id__": 354
},
{
"__id__": 355
"__id__": 356
},
{
"__id__": 357
"__id__": 358
},
{
"__id__": 359
"__id__": 360
},
{
"__id__": 361
"__id__": 362
},
{
"__id__": 363
"__id__": 364
},
{
"__id__": 365
"__id__": 366
},
{
"__id__": 367
"__id__": 368
},
{
"__id__": 369
"__id__": 370
},
{
"__id__": 371
"__id__": 372
},
{
"__id__": 373
"__id__": 374
},
{
"__id__": 375
"__id__": 376
}
],
"_active": true,
......@@ -16248,13 +16278,13 @@
"_name": "gameLose",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 338
"__id__": 339
}
],
"_prefab": null,
......@@ -16310,7 +16340,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 337
"__id__": 338
},
"_enabled": true,
"_clip": {
......@@ -16329,13 +16359,13 @@
"_name": "gameStart",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 340
"__id__": 341
}
],
"_prefab": null,
......@@ -16391,7 +16421,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 339
"__id__": 340
},
"_enabled": true,
"_clip": {
......@@ -16410,13 +16440,13 @@
"_name": "gameStartTip",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 342
"__id__": 343
}
],
"_prefab": null,
......@@ -16472,7 +16502,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 341
"__id__": 342
},
"_enabled": true,
"_clip": {
......@@ -16491,13 +16521,13 @@
"_name": "gameTip1",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 344
"__id__": 345
}
],
"_prefab": null,
......@@ -16553,7 +16583,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 343
"__id__": 344
},
"_enabled": true,
"_clip": {
......@@ -16572,13 +16602,13 @@
"_name": "gameTip2",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 346
"__id__": 347
}
],
"_prefab": null,
......@@ -16634,7 +16664,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 345
"__id__": 346
},
"_enabled": true,
"_clip": {
......@@ -16653,13 +16683,13 @@
"_name": "gameWin",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 348
"__id__": 349
}
],
"_prefab": null,
......@@ -16715,7 +16745,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 347
"__id__": 348
},
"_enabled": true,
"_clip": {
......@@ -16734,13 +16764,13 @@
"_name": "catTip1",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 350
"__id__": 351
}
],
"_prefab": null,
......@@ -16796,7 +16826,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 349
"__id__": 350
},
"_enabled": true,
"_clip": {
......@@ -16815,13 +16845,13 @@
"_name": "catTip2",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 352
"__id__": 353
}
],
"_prefab": null,
......@@ -16877,7 +16907,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 351
"__id__": 352
},
"_enabled": true,
"_clip": {
......@@ -16896,13 +16926,13 @@
"_name": "catTip3",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 354
"__id__": 355
}
],
"_prefab": null,
......@@ -16958,7 +16988,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 353
"__id__": 354
},
"_enabled": true,
"_clip": {
......@@ -16977,13 +17007,13 @@
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 356
"__id__": 357
}
],
"_prefab": null,
......@@ -17039,7 +17069,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 355
"__id__": 356
},
"_enabled": true,
"_clip": {
......@@ -17058,13 +17088,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 358
"__id__": 359
}
],
"_prefab": null,
......@@ -17120,7 +17150,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 357
"__id__": 358
},
"_enabled": true,
"_clip": {
......@@ -17139,13 +17169,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 360
"__id__": 361
}
],
"_prefab": null,
......@@ -17201,7 +17231,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 359
"__id__": 360
},
"_enabled": true,
"_clip": {
......@@ -17220,13 +17250,13 @@
"_name": "win",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 362
"__id__": 363
}
],
"_prefab": null,
......@@ -17282,7 +17312,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 361
"__id__": 362
},
"_enabled": true,
"_clip": {
......@@ -17301,13 +17331,13 @@
"_name": "loss",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 364
"__id__": 365
}
],
"_prefab": null,
......@@ -17363,7 +17393,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 363
"__id__": 364
},
"_enabled": true,
"_clip": {
......@@ -17382,13 +17412,13 @@
"_name": "piece",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 366
"__id__": 367
}
],
"_prefab": null,
......@@ -17444,7 +17474,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 365
"__id__": 366
},
"_enabled": true,
"_clip": {
......@@ -17463,13 +17493,13 @@
"_name": "match",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 368
"__id__": 369
}
],
"_prefab": null,
......@@ -17525,7 +17555,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 367
"__id__": 368
},
"_enabled": true,
"_clip": {
......@@ -17544,13 +17574,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 370
"__id__": 371
}
],
"_prefab": null,
......@@ -17606,7 +17636,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 369
"__id__": 370
},
"_enabled": true,
"_clip": {
......@@ -17625,13 +17655,13 @@
"_name": "grow",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 372
"__id__": 373
}
],
"_prefab": null,
......@@ -17687,7 +17717,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 371
"__id__": 372
},
"_enabled": true,
"_clip": {
......@@ -17706,13 +17736,13 @@
"_name": "youturnTip",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 374
"__id__": 375
}
],
"_prefab": null,
......@@ -17768,7 +17798,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 373
"__id__": 374
},
"_enabled": true,
"_clip": {
......@@ -17787,13 +17817,13 @@
"_name": "otherturn",
"_objFlags": 0,
"_parent": {
"__id__": 336
"__id__": 337
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 376
"__id__": 377
}
],
"_prefab": null,
......@@ -17849,7 +17879,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 375
"__id__": 376
},
"_enabled": true,
"_clip": {
......@@ -17872,10 +17902,10 @@
},
"_children": [
{
"__id__": 378
"__id__": 379
},
{
"__id__": 381
"__id__": 382
}
],
"_active": true,
......@@ -17933,11 +17963,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 377
"__id__": 378
},
"_children": [
{
"__id__": 379
"__id__": 380
}
],
"_active": true,
......@@ -17995,13 +18025,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 378
"__id__": 379
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 380
"__id__": 381
}
],
"_prefab": null,
......@@ -18057,7 +18087,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 379
"__id__": 380
},
"_enabled": true,
"_materials": [
......@@ -18092,7 +18122,7 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 377
"__id__": 378
},
"_children": [],
"_active": true,
......@@ -18207,7 +18237,7 @@
"__uuid__": "84b72720-2013-4f2b-b787-52900432f34f"
},
"cat": {
"__id__": 274
"__id__": 275
},
"pp": {
"__id__": 270
......@@ -18216,10 +18246,10 @@
"__id__": 249
},
"cover": {
"__id__": 287
"__id__": 288
},
"recordCat": {
"__id__": 307
"__id__": 308
},
"cardRoot": {
"__id__": 11
......
......@@ -68,6 +68,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
_wordData: any;
private _otherWord: any;
private _isRecording: any;
private _guessWords: any;
onLoad() {
......@@ -94,13 +95,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
_reqestWord() {
if (!this._inputWords) {
if (!this._guessWords) {
return;
}
this._sendMsg(MsgType.USER_REQ_WOED, { word: this._inputWords, uuid: this.playerId })
this._sendMsg(MsgType.USER_REQ_WOED, { word: this._guessWords, uuid: this.playerId })
}
_inputWords(word) {
this._inputWords = word;
this._guessWords = word;
this.inputNode.getChildByName("lb").getComponent(cc.Label).string = word;
}
......@@ -187,6 +188,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (this._catSpeaking) {
return;
}
if (this._isRecording) {
return
}
this._catSpeaking = true;
this.catAni();
})
......@@ -254,6 +258,25 @@ export default class SceneComponent extends MyCocosSceneComponent {
asyncPlayDragonBoneAnimation(this.cat, "normal", 0);
this._catSpeaking = false;
})
if (index == 0) {
asyncDelay(1).then(() => {
this._keyboard.showTips();
})
} else if (index == 1) {
asyncDelay(1).then(() => {
cc.tween(this.pp).to(0.3, { scale: 1.2 }).to(0.7, { scale: 1 }).start();
})
} else {
asyncDelay(1.5).then(() => {
cc.tween(this.pp).to(0.3, { scale: 1.2 }).to(0.7, { scale: 1 }).start();
})
}
}
playerId;
......@@ -566,9 +589,19 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.playAudioByUrl(this.data.audioUrl_waiting_firstRound, () => {
asyncPlayDragonBoneAnimation(this.cat, "normal", 0)
this._catSpeaking = false;
let card = this.cardRoot.children[index];
let cardNode: cc.Node = card.getChildByName("card");
let pos = this.myCardRoot.convertToNodeSpaceAR(cardNode.convertToWorldSpaceAR(cc.v2(0, 0)))
this.myCardRoot.getChildByName("card").getComponent(cc.Sprite).spriteFrame = this.cardList[index]
this.myCardRoot.getChildByName("word").getComponent(cc.Label).string = word;
resolve("");
let myCard = this.myCardRoot.getChildByName("card");
let pos1 = myCard.position;
myCard.x = pos.x;
myCard.y = pos.y;
cc.tween(myCard).to(1, { x: pos1.x, y: pos1.y }).call(() => {
this.myCardRoot.getChildByName("word").getComponent(cc.Label).string = word;
resolve("");
}).start();
})
})
......@@ -637,6 +670,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
this._canChosendCard = false;
this.playLocalAudio("btn")
let cards = this.cardRoot.children;
for (let i = 0; i < this.cardList.length; ++i) {
......@@ -652,8 +686,17 @@ export default class SceneComponent extends MyCocosSceneComponent {
word: word,
}
)
let cardNode: cc.Node = card.getChildByName("card");
let pos = this.myCardRoot.convertToNodeSpaceAR(cardNode.convertToWorldSpaceAR(cc.v2(0, 0)))
this.myCardRoot.getChildByName("card").getComponent(cc.Sprite).spriteFrame = this.cardList[index]
this.myCardRoot.getChildByName("word").getComponent(cc.Label).string = word;
let myCard = this.myCardRoot.getChildByName("card");
let pos1 = myCard.position;
myCard.x = pos.x;
myCard.y = pos.y;
cc.tween(myCard).to(1, { x: pos1.x, y: pos1.y }).call(() => {
this.myCardRoot.getChildByName("word").getComponent(cc.Label).string = word;
}).start();
})
......
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