Commit bf03933e authored by spc's avatar spc

1

parent 6a5972ed
......@@ -26,7 +26,7 @@
"_active": true,
"_components": [],
"_prefab": {
"__id__": 364
"__id__": 361
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -57,7 +57,7 @@
},
"autoReleaseAssets": false,
"_globals": {
"__id__": 368
"__id__": 365
},
"_id": "53947ca7-3484-4b53-800d-509405063d68"
},
......@@ -98,16 +98,16 @@
"_active": true,
"_components": [
{
"__id__": 360
"__id__": 357
},
{
"__id__": 361
"__id__": 358
},
{
"__id__": 362
"__id__": 359
},
{
"__id__": 363
"__id__": 360
}
],
"_prefab": null,
......@@ -2233,10 +2233,10 @@
"_enabled": true,
"__prefab": null,
"handle": {
"__id__": 354
"__id__": 351
},
"bg": {
"__id__": 358
"__id__": 355
},
"normalSp": {
"__uuid__": "7f413237-4b73-4bae-bca7-7ab9e9742ebc@f9941",
......@@ -2258,22 +2258,22 @@
},
"_children": [
{
"__id__": 354
"__id__": 351
}
],
"_active": true,
"_components": [
{
"__id__": 357
"__id__": 354
},
{
"__id__": 358
"__id__": 355
},
{
"__id__": 58
},
{
"__id__": 359
"__id__": 356
}
],
"_prefab": null,
......@@ -2346,13 +2346,13 @@
"_active": true,
"_components": [
{
"__id__": 351
"__id__": 348
},
{
"__id__": 352
"__id__": 349
},
{
"__id__": 353
"__id__": 350
}
],
"_prefab": null,
......@@ -9280,25 +9280,25 @@
"__id__": 276
},
{
"__id__": 288
"__id__": 285
},
{
"__id__": 293
"__id__": 290
},
{
"__id__": 342
"__id__": 339
}
],
"_active": true,
"_components": [
{
"__id__": 348
"__id__": 345
},
{
"__id__": 349
"__id__": 346
},
{
"__id__": 350
"__id__": 347
}
],
"_prefab": null,
......@@ -10401,10 +10401,10 @@
"_active": true,
"_components": [
{
"__id__": 286
"__id__": 283
},
{
"__id__": 287
"__id__": 284
}
],
"_prefab": null,
......@@ -10554,18 +10554,14 @@
"_parent": {
"__id__": 276
},
"_children": [
{
"__id__": 281
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 284
"__id__": 281
},
{
"__id__": 285
"__id__": 282
}
],
"_prefab": null,
......@@ -10598,115 +10594,6 @@
},
"_id": "b8IJ+KRINFW7URZ4AmDDAt"
},
{
"__type__": "cc.Node",
"_name": "零食卡红色@1x",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 280
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 282
},
{
"__id__": 283
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": "5cUctSlytEU4wotCjigc5E"
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 281
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 32,
"height": 42
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 1
},
"_id": "a16+erA2BMqqrMnNZIVJtN"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 281
},
"_enabled": true,
"__prefab": null,
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "c6b39193-6b92-404d-b4d1-c3a9cc8b0f80@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "731zCXsTtC46ndh8pER/aU"
},
{
"__type__": "cc.UITransform",
"_name": "",
......@@ -10719,7 +10606,7 @@
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 32,
"width": -30,
"height": 60
},
"_anchorPoint": {
......@@ -10825,16 +10712,16 @@
"_active": false,
"_components": [
{
"__id__": 289
"__id__": 286
},
{
"__id__": 290
"__id__": 287
},
{
"__id__": 291
"__id__": 288
},
{
"__id__": 292
"__id__": 289
}
],
"_prefab": null,
......@@ -10873,7 +10760,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 288
"__id__": 285
},
"_enabled": true,
"__prefab": null,
......@@ -10895,7 +10782,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 288
"__id__": 285
},
"_enabled": true,
"__prefab": null,
......@@ -10934,7 +10821,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 288
"__id__": 285
},
"_enabled": true,
"__prefab": null,
......@@ -10964,7 +10851,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 288
"__id__": 285
},
"_enabled": true,
"__prefab": null,
......@@ -10980,28 +10867,28 @@
},
"_children": [
{
"__id__": 294
"__id__": 291
},
{
"__id__": 297
"__id__": 294
},
{
"__id__": 310
"__id__": 307
},
{
"__id__": 321
"__id__": 318
},
{
"__id__": 332
"__id__": 329
}
],
"_active": true,
"_components": [
{
"__id__": 340
"__id__": 337
},
{
"__id__": 341
"__id__": 338
}
],
"_prefab": null,
......@@ -11040,16 +10927,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 293
"__id__": 290
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 295
"__id__": 292
},
{
"__id__": 296
"__id__": 293
}
],
"_prefab": null,
......@@ -11088,7 +10975,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 294
"__id__": 291
},
"_enabled": true,
"__prefab": null,
......@@ -11110,7 +10997,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 294
"__id__": 291
},
"_enabled": true,
"__prefab": null,
......@@ -11149,20 +11036,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 293
"__id__": 290
},
"_children": [
{
"__id__": 298
"__id__": 295
}
],
"_active": true,
"_components": [
{
"__id__": 308
"__id__": 305
},
{
"__id__": 309
"__id__": 306
}
],
"_prefab": null,
......@@ -11201,17 +11088,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 297
"__id__": 294
},
"_children": [
{
"__id__": 299
"__id__": 296
},
{
"__id__": 302
"__id__": 299
},
{
"__id__": 305
"__id__": 302
}
],
"_active": true,
......@@ -11252,16 +11139,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 298
"__id__": 295
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 300
"__id__": 297
},
{
"__id__": 301
"__id__": 298
}
],
"_prefab": null,
......@@ -11292,7 +11179,7 @@
"y": 180,
"z": 0
},
"_id": "15ntahYuBOlI9axsLvmVn4"
"_id": "91MH8I8WJLarrJ5E5fPmNk"
},
{
"__type__": "cc.UITransform",
......@@ -11300,7 +11187,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 299
"__id__": 296
},
"_enabled": true,
"__prefab": null,
......@@ -11314,7 +11201,7 @@
"x": 0,
"y": 1
},
"_id": "29mpQoZeRDIILvvM0XrIyd"
"_id": "824Bl5QAdGEIrZirZsNi1R"
},
{
"__type__": "cc.Sprite",
......@@ -11322,7 +11209,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 299
"__id__": 296
},
"_enabled": true,
"__prefab": null,
......@@ -11350,7 +11237,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "a4d7Pfm5pBg76Fz5VRrIym"
"_id": "6dTNqRafJGV4q09w6A97IV"
},
{
"__type__": "cc.Node",
......@@ -11358,16 +11245,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 298
"__id__": 295
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 303
"__id__": 300
},
{
"__id__": 304
"__id__": 301
}
],
"_prefab": null,
......@@ -11398,7 +11285,7 @@
"y": 0,
"z": 0
},
"_id": "aa5tYYkoFLUohaYXtyytDH"
"_id": "201ZxNrptMWYB9gDez/pJw"
},
{
"__type__": "cc.UITransform",
......@@ -11406,7 +11293,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 302
"__id__": 299
},
"_enabled": true,
"__prefab": null,
......@@ -11420,7 +11307,7 @@
"x": 0,
"y": 1
},
"_id": "37hRnGP1NAXJYZ2CY+mVU/"
"_id": "6eiAQnd5pPaLcP/6k071JL"
},
{
"__type__": "cc.Sprite",
......@@ -11428,7 +11315,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 302
"__id__": 299
},
"_enabled": true,
"__prefab": null,
......@@ -11456,7 +11343,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "c8YUQpN19KG6QnOuYWicKk"
"_id": "e792E7f/9Mso+S1rz0wR0P"
},
{
"__type__": "cc.Node",
......@@ -11464,16 +11351,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 298
"__id__": 295
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 306
"__id__": 303
},
{
"__id__": 307
"__id__": 304
}
],
"_prefab": null,
......@@ -11504,7 +11391,7 @@
"y": 0,
"z": 0
},
"_id": "8e1P/3v3RJ8JfxfGdiKfUh"
"_id": "41s8v7PlhBM5m6ZpG3Vx86"
},
{
"__type__": "cc.UITransform",
......@@ -11512,7 +11399,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 305
"__id__": 302
},
"_enabled": true,
"__prefab": null,
......@@ -11526,7 +11413,7 @@
"x": 0,
"y": 1
},
"_id": "6cQsM4oEpHkrdmgpuqttul"
"_id": "7eATRY7JZFq6KxrzvhxMfx"
},
{
"__type__": "cc.Sprite",
......@@ -11534,7 +11421,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 305
"__id__": 302
},
"_enabled": true,
"__prefab": null,
......@@ -11562,7 +11449,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "3cdoeEB6dJ24D6ITZZ//0X"
"_id": "34mhFix25L25eONIVbePHu"
},
{
"__type__": "cc.UITransform",
......@@ -11570,7 +11457,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 297
"__id__": 294
},
"_enabled": true,
"__prefab": null,
......@@ -11592,7 +11479,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 297
"__id__": 294
},
"_enabled": true,
"__prefab": null,
......@@ -11611,23 +11498,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 293
"__id__": 290
},
"_children": [
{
"__id__": 311
"__id__": 308
},
{
"__id__": 314
"__id__": 311
},
{
"__id__": 317
"__id__": 314
}
],
"_active": false,
"_components": [
{
"__id__": 320
"__id__": 317
}
],
"_prefab": null,
......@@ -11666,16 +11553,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 310
"__id__": 307
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 312
"__id__": 309
},
{
"__id__": 313
"__id__": 310
}
],
"_prefab": null,
......@@ -11714,7 +11601,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 311
"__id__": 308
},
"_enabled": true,
"__prefab": null,
......@@ -11736,7 +11623,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 311
"__id__": 308
},
"_enabled": true,
"__prefab": null,
......@@ -11775,16 +11662,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 310
"__id__": 307
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 315
"__id__": 312
},
{
"__id__": 316
"__id__": 313
}
],
"_prefab": null,
......@@ -11823,7 +11710,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 314
"__id__": 311
},
"_enabled": true,
"__prefab": null,
......@@ -11845,7 +11732,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 314
"__id__": 311
},
"_enabled": true,
"__prefab": null,
......@@ -11910,16 +11797,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 310
"__id__": 307
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 318
"__id__": 315
},
{
"__id__": 319
"__id__": 316
}
],
"_prefab": null,
......@@ -11958,7 +11845,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 317
"__id__": 314
},
"_enabled": true,
"__prefab": null,
......@@ -11980,7 +11867,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 317
"__id__": 314
},
"_enabled": true,
"__prefab": null,
......@@ -12045,7 +11932,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 310
"__id__": 307
},
"_enabled": true,
"__prefab": null,
......@@ -12067,23 +11954,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 293
"__id__": 290
},
"_children": [
{
"__id__": 322
"__id__": 319
},
{
"__id__": 325
"__id__": 322
},
{
"__id__": 328
"__id__": 325
}
],
"_active": false,
"_components": [
{
"__id__": 331
"__id__": 328
}
],
"_prefab": null,
......@@ -12122,16 +12009,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 321
"__id__": 318
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 323
"__id__": 320
},
{
"__id__": 324
"__id__": 321
}
],
"_prefab": null,
......@@ -12170,7 +12057,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 322
"__id__": 319
},
"_enabled": true,
"__prefab": null,
......@@ -12192,7 +12079,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 322
"__id__": 319
},
"_enabled": true,
"__prefab": null,
......@@ -12231,16 +12118,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 321
"__id__": 318
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 326
"__id__": 323
},
{
"__id__": 327
"__id__": 324
}
],
"_prefab": null,
......@@ -12279,7 +12166,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 325
"__id__": 322
},
"_enabled": true,
"__prefab": null,
......@@ -12301,7 +12188,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 325
"__id__": 322
},
"_enabled": true,
"__prefab": null,
......@@ -12366,16 +12253,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 321
"__id__": 318
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 329
"__id__": 326
},
{
"__id__": 330
"__id__": 327
}
],
"_prefab": null,
......@@ -12414,7 +12301,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 328
"__id__": 325
},
"_enabled": true,
"__prefab": null,
......@@ -12436,7 +12323,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 328
"__id__": 325
},
"_enabled": true,
"__prefab": null,
......@@ -12501,7 +12388,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 321
"__id__": 318
},
"_enabled": true,
"__prefab": null,
......@@ -12523,20 +12410,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 293
"__id__": 290
},
"_children": [
{
"__id__": 333
"__id__": 330
},
{
"__id__": 336
"__id__": 333
}
],
"_active": false,
"_components": [
{
"__id__": 339
"__id__": 336
}
],
"_prefab": null,
......@@ -12575,16 +12462,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 332
"__id__": 329
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 334
"__id__": 331
},
{
"__id__": 335
"__id__": 332
}
],
"_prefab": null,
......@@ -12623,7 +12510,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 333
"__id__": 330
},
"_enabled": true,
"__prefab": null,
......@@ -12645,7 +12532,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 333
"__id__": 330
},
"_enabled": true,
"__prefab": null,
......@@ -12684,16 +12571,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 332
"__id__": 329
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 337
"__id__": 334
},
{
"__id__": 338
"__id__": 335
}
],
"_prefab": null,
......@@ -12732,7 +12619,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 336
"__id__": 333
},
"_enabled": true,
"__prefab": null,
......@@ -12754,7 +12641,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 336
"__id__": 333
},
"_enabled": true,
"__prefab": null,
......@@ -12819,7 +12706,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 332
"__id__": 329
},
"_enabled": true,
"__prefab": null,
......@@ -12841,7 +12728,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 293
"__id__": 290
},
"_enabled": true,
"__prefab": null,
......@@ -12863,7 +12750,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 293
"__id__": 290
},
"_enabled": true,
"__prefab": null,
......@@ -12882,19 +12769,19 @@
"_active": false,
"_components": [
{
"__id__": 343
"__id__": 340
},
{
"__id__": 344
"__id__": 341
},
{
"__id__": 345
"__id__": 342
},
{
"__id__": 346
"__id__": 343
},
{
"__id__": 347
"__id__": 344
}
],
"_prefab": null,
......@@ -12933,7 +12820,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 342
"__id__": 339
},
"_enabled": true,
"__prefab": null,
......@@ -12955,7 +12842,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 342
"__id__": 339
},
"_enabled": true,
"__prefab": null,
......@@ -12994,7 +12881,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 342
"__id__": 339
},
"_enabled": true,
"__prefab": null,
......@@ -13017,7 +12904,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 342
"__id__": 339
},
"_enabled": true,
"__prefab": null,
......@@ -13030,7 +12917,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 342
"__id__": 339
},
"_enabled": true,
"__prefab": null,
......@@ -13126,29 +13013,29 @@
"__id__": 272
},
"cdFlicker": {
"__id__": 342
"__id__": 339
},
"mask": {
"__id__": 288
"__id__": 285
},
"svga": {
"__id__": 297
"__id__": 294
},
"bannerBg": {
"__id__": 294
"__id__": 291
},
"banner": {
"__id__": 293
"__id__": 290
},
"bannerArr": [
{
"__id__": 310
"__id__": 307
},
{
"__id__": 321
"__id__": 318
},
{
"__id__": 332
"__id__": 329
}
],
"top": {
......@@ -13157,6 +13044,9 @@
"topCard": {
"__id__": 276
},
"topCardList": {
"__id__": 280
},
"_id": "dfl2fX641H3qOpggystLiY"
},
{
......@@ -13239,10 +13129,10 @@
"_active": true,
"_components": [
{
"__id__": 355
"__id__": 352
},
{
"__id__": 356
"__id__": 353
}
],
"_prefab": null,
......@@ -13281,7 +13171,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 354
"__id__": 351
},
"_enabled": true,
"__prefab": null,
......@@ -13303,7 +13193,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 354
"__id__": 351
},
"_enabled": true,
"__prefab": null,
......@@ -13540,7 +13430,7 @@
"instance": null,
"targetOverrides": [
{
"__id__": 365
"__id__": 362
}
],
"nestedPrefabInstanceRoots": [
......@@ -13555,7 +13445,7 @@
"__id__": 38
},
"sourceInfo": {
"__id__": 366
"__id__": 363
},
"propertyPath": [
"head"
......@@ -13564,7 +13454,7 @@
"__id__": 38
},
"targetInfo": {
"__id__": 367
"__id__": 364
}
},
{
......@@ -13582,28 +13472,28 @@
{
"__type__": "cc.SceneGlobals",
"ambient": {
"__id__": 369
"__id__": 366
},
"shadows": {
"__id__": 370
"__id__": 367
},
"_skybox": {
"__id__": 371
"__id__": 368
},
"fog": {
"__id__": 372
"__id__": 369
},
"octree": {
"__id__": 373
"__id__": 370
},
"skin": {
"__id__": 374
"__id__": 371
},
"lightProbeInfo": {
"__id__": 375
"__id__": 372
},
"postSettings": {
"__id__": 376
"__id__": 373
},
"bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false
......
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "fbacf0e6-8508-4b2c-a549-b16565465d93",
"files": [],
"subMetas": {},
"userData": {}
}
[
{
"__type__": "cc.Prefab",
"_name": "卡A",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"data": {
"__id__": 1
},
"optimizationPolicy": 0,
"persistent": false
},
{
"__type__": "cc.Node",
"_name": "卡A",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": null,
"_children": [],
"_active": true,
"_components": [
{
"__id__": 2
},
{
"__id__": 4
}
],
"_prefab": {
"__id__": 6
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -62,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 3
},
"_contentSize": {
"__type__": "cc.Size",
"width": 32,
"height": 42
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 1
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "5642TlQL1CK4ABo3qDa+2a"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 5
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "c6b39193-6b92-404d-b4d1-c3a9cc8b0f80@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "afHtW6TeRC4q8TNa1K0hop"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "46Rpq6Y0NL+bdngJRKYFsc",
"instance": null,
"targetOverrides": null
}
]
\ No newline at end of file
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "1a1ee9df-0637-4a3b-bac1-5bf21366600d",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "卡A"
}
}
[
{
"__type__": "cc.Prefab",
"_name": "卡B",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"data": {
"__id__": 1
},
"optimizationPolicy": 0,
"persistent": false
},
{
"__type__": "cc.Node",
"_name": "卡B",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": null,
"_children": [],
"_active": true,
"_components": [
{
"__id__": 2
},
{
"__id__": 4
}
],
"_prefab": {
"__id__": 6
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 3
},
"_contentSize": {
"__type__": "cc.Size",
"width": 32,
"height": 42
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 1
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "6c81ev881EFb0eViEGD3dC"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 5
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "a4050df6-9647-4152-ad4b-20e2878a272e@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "edCi47OidDDJiqOkO/Jm+F"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "baGm5VSc5I3Iv3pjwhR/Ee",
"instance": null,
"targetOverrides": null
}
]
\ No newline at end of file
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "e61990c1-7e66-4f38-9579-8d37500e8cfe",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "卡B"
}
}
[
{
"__type__": "cc.Prefab",
"_name": "卡C",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"data": {
"__id__": 1
},
"optimizationPolicy": 0,
"persistent": false
},
{
"__type__": "cc.Node",
"_name": "卡C",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": null,
"_children": [],
"_active": true,
"_components": [
{
"__id__": 2
},
{
"__id__": 4
}
],
"_prefab": {
"__id__": 6
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 62,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 3
},
"_contentSize": {
"__type__": "cc.Size",
"width": 32,
"height": 42
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 1
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "1f0liy8jdOzY21EnW9lveu"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 5
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "20710d44-64c2-4fc5-9736-896ca6e505d9@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "5fhJR3XJJLV5NSZtJtHaDU"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "c2Ft7FcclOpaw6rqMoweol",
"instance": null,
"targetOverrides": null
}
]
\ No newline at end of file
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "492d9db9-cc02-4806-9b44-880aecb2d6aa",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "卡C"
}
}
import { _decorator, Component, easing, Graphics, Label, Animation, misc, Node, Tween, tween, v3, UIOpacity } from "cc";
import { Global } from "../Global";
import Svga from "../../../../Component/Svga/Svga";
import { ECard } from "../Common/Enums";
const { ccclass, property, executeInEditMode } = _decorator;
......@@ -34,6 +35,8 @@ export class Target extends Component {
@property(Node) topCard: Node = null;
@property(Node) topCardList: Node = null;
constructor() {
super();
Target._ins = this;
......@@ -122,13 +125,23 @@ export class Target extends Component {
}
showTopCard() {
this.topCard.active = true;
this.top.active = false;
if (!this.topCard.active) {
this.topCard.active = true;
this.top.active = false;
}
}
showTop() {
this.top.active = true;
this.topCard.active = false
if (!this.top.active) {
this.top.active = true;
this.topCard.active = false
}
}
updateCard(type: ECard) {
this.showTopCard()
this.topCardList.addChild()
}
private _cd = 0;
......
......@@ -5,8 +5,9 @@ import {
import { Snake } from "./Snake";
import { Joystick } from "./Components/Joystick";
import { FastBtn } from "./Components/FastBtn";
import { Events } from "./Common/Enums";
import { ECard, Events } from "./Common/Enums";
import gameStore from "../../store/gameStore";
import { Target } from "./Components/Target";
const { ccclass, property } = _decorator;
......@@ -48,8 +49,8 @@ export class Player extends Snake {
gameStore.gameInfo.luckNum = value;
}
checkCard() {
console.warn("xxxx", this.cardMap)
checkCard(type:ECard) {
Target.ins.updateCard(type);
}
onLoad() {
......
......@@ -194,7 +194,7 @@ export class Snake extends Component {
}
setSkin(skinName: string) {
const skin = assetManager.getBundle("MainGame").get(`skin/${skinName}`, SpriteAtlas);
const skin = assetManager.getBundle("MainGame").get(`skin/${skinName}`, SpriteAtlas);
this.imgHead = skin.getSpriteFrame("head");
let bodyIndex = 1;
......@@ -282,10 +282,10 @@ export class Snake extends Component {
this.cardMap.set(type, 0);
}
this.cardMap.set(type, this.cardMap.get(type) + 1);
this.checkCard();
this.checkCard(type);
}
checkCard() {
checkCard(type: ECard) {
}
......
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