diff --git a/assets/resources/common/prefab/notify.prefab b/assets/resources/common/prefab/notify.prefab index f5535177..5347b08b 100644 --- a/assets/resources/common/prefab/notify.prefab +++ b/assets/resources/common/prefab/notify.prefab @@ -583,7 +583,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -691,21 +691,13 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 31 }, "playOnLoad": true, - "_clips": [ - { - "__uuid__": "4cecde51-d46d-4b20-b02e-e58f063ec56f", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "4cecde51-d46d-4b20-b02e-e58f063ec56f", - "__expectedType__": "cc.AnimationClip" - }, + "_clips": [], + "_defaultClip": null, "_id": "" }, { diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index b25df1da..fcd45804 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,29 +22,29 @@ "__id__": 2 }, { - "__id__": 415 + "__id__": 423 }, { - "__id__": 551 + "__id__": 559 }, { - "__id__": 560 + "__id__": 568 } ], "_active": true, "_components": [ { - "__id__": 606 + "__id__": 614 }, { - "__id__": 608 + "__id__": 616 }, { - "__id__": 610 + "__id__": 618 } ], "_prefab": { - "__id__": 612 + "__id__": 620 }, "_lpos": { "__type__": "cc.Vec3", @@ -99,18 +99,6 @@ ], "_active": true, "_components": [ - { - "__id__": 400 - }, - { - "__id__": 402 - }, - { - "__id__": 404 - }, - { - "__id__": 406 - }, { "__id__": 408 }, @@ -119,10 +107,22 @@ }, { "__id__": 412 + }, + { + "__id__": 414 + }, + { + "__id__": 416 + }, + { + "__id__": 418 + }, + { + "__id__": 420 } ], "_prefab": { - "__id__": 414 + "__id__": 422 }, "_lpos": { "__type__": "cc.Vec3", @@ -1317,6 +1317,8 @@ "__id__": 0 }, "fileId": "d2hTXWzUdGCan0VzPi19Ch", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -6022,17 +6024,17 @@ "_active": true, "_components": [ { - "__id__": 393 + "__id__": 401 }, { - "__id__": 395 + "__id__": 403 }, { - "__id__": 397 + "__id__": 405 } ], "_prefab": { - "__id__": 399 + "__id__": 407 }, "_lpos": { "__type__": "cc.Vec3", @@ -6096,7 +6098,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -146, + "x": -148, "y": 0, "z": 0 }, @@ -6610,7 +6612,7 @@ }, "_alignFlags": 9, "_target": null, - "_left": 2, + "_left": 0, "_right": 20, "_top": 50.00000000000001, "_bottom": 1078.082, @@ -6876,6 +6878,8 @@ "__id__": 0 }, "fileId": "5aMCdIWc5OmJF+7Y1vMDAV", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7451,6 +7455,8 @@ "__id__": 0 }, "fileId": "658QGyYfxEyJvkxOrsGTX4", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7608,6 +7614,8 @@ "__id__": 0 }, "fileId": "8eSy9TOKJMi4sjqRA6RoQk", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7647,6 +7655,8 @@ "__id__": 0 }, "fileId": "63FHyGP9BOaqAuH4RtPSZ0", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -7665,27 +7675,30 @@ "__id__": 348 }, { - "__id__": 374 + "__id__": 356 }, { "__id__": 382 - } - ], - "_active": true, - "_components": [ - { - "__id__": 388 }, { "__id__": 390 } ], + "_active": true, + "_components": [ + { + "__id__": 396 + }, + { + "__id__": 398 + } + ], "_prefab": { - "__id__": 392 + "__id__": 400 }, "_lpos": { "__type__": "cc.Vec3", - "x": 146, + "x": 148, "y": 0, "z": 0 }, @@ -7890,6 +7903,184 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "nobg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 339 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 349 + }, + { + "__id__": 351 + }, + { + "__id__": 353 + } + ], + "_prefab": { + "__id__": 355 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 105, + "y": 50, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 348 + }, + "_enabled": true, + "__prefab": { + "__id__": 350 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 210, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6eL31eymxLlJ9K3llqLmad" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 348 + }, + "_enabled": true, + "__prefab": { + "__id__": 352 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@15f3b", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7438p6aXRNVJPcLacg6obR" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 348 + }, + "_enabled": true, + "__prefab": { + "__id__": 354 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 180, + "_originalHeight": 120, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d5BL7i0n1PVIJogKfh3fKt" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7ccUi3vgVANq1XPHolEkxx", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "coin", @@ -7900,29 +8091,29 @@ }, "_children": [ { - "__id__": 349 + "__id__": 357 }, { - "__id__": 355 + "__id__": 363 }, { - "__id__": 361 + "__id__": 369 } ], "_active": true, "_components": [ { - "__id__": 367 + "__id__": 375 }, { - "__id__": 369 + "__id__": 377 }, { - "__id__": 371 + "__id__": 379 } ], "_prefab": { - "__id__": 373 + "__id__": 381 }, "_lpos": { "__type__": "cc.Vec3", @@ -7959,20 +8150,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 348 + "__id__": 356 }, "_children": [], "_active": false, "_components": [ { - "__id__": 350 + "__id__": 358 }, { - "__id__": 352 + "__id__": 360 } ], "_prefab": { - "__id__": 354 + "__id__": 362 }, "_lpos": { "__type__": "cc.Vec3", @@ -8009,11 +8200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 357 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 359 }, "_contentSize": { "__type__": "cc.Size", @@ -8037,11 +8228,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 357 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 361 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8095,20 +8286,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 348 + "__id__": 356 }, "_children": [], "_active": true, "_components": [ { - "__id__": 356 + "__id__": 364 }, { - "__id__": 358 + "__id__": 366 } ], "_prefab": { - "__id__": 360 + "__id__": 368 }, "_lpos": { "__type__": "cc.Vec3", @@ -8145,11 +8336,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 363 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -8173,11 +8364,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 363 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 367 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8234,20 +8425,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 348 + "__id__": 356 }, "_children": [], "_active": true, "_components": [ { - "__id__": 362 + "__id__": 370 }, { - "__id__": 364 + "__id__": 372 } ], "_prefab": { - "__id__": 366 + "__id__": 374 }, "_lpos": { "__type__": "cc.Vec3", @@ -8284,11 +8475,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 361 + "__id__": 369 }, "_enabled": true, "__prefab": { - "__id__": 363 + "__id__": 371 }, "_contentSize": { "__type__": "cc.Size", @@ -8312,11 +8503,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 361 + "__id__": 369 }, "_enabled": true, "__prefab": { - "__id__": 365 + "__id__": 373 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8393,11 +8584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 376 }, "_contentSize": { "__type__": "cc.Size", @@ -8421,11 +8612,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 378 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8463,11 +8654,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 380 }, "_alignFlags": 16, "_target": null, @@ -8518,17 +8709,17 @@ "_active": true, "_components": [ { - "__id__": 375 + "__id__": 383 }, { - "__id__": 377 + "__id__": 385 }, { - "__id__": 379 + "__id__": 387 } ], "_prefab": { - "__id__": 381 + "__id__": 389 }, "_lpos": { "__type__": "cc.Vec3", @@ -8565,11 +8756,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 384 }, "_contentSize": { "__type__": "cc.Size", @@ -8593,11 +8784,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 386 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8661,11 +8852,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 388 }, "_alignFlags": 16, "_target": null, @@ -8706,24 +8897,24 @@ }, { "__type__": "cc.Node", - "_name": "arrow3", + "_name": "upicon", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 339 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 383 + "__id__": 391 }, { - "__id__": 385 + "__id__": 393 } ], "_prefab": { - "__id__": 387 + "__id__": 395 }, "_lpos": { "__type__": "cc.Vec3", @@ -8760,11 +8951,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 392 }, "_contentSize": { "__type__": "cc.Size", @@ -8788,11 +8979,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 382 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 394 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8850,7 +9041,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 397 }, "_contentSize": { "__type__": "cc.Size", @@ -8878,12 +9069,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 399 }, "_alignFlags": 36, "_target": null, "_left": 0, - "_right": 2, + "_right": 0, "_top": 0, "_bottom": 0, "_horizontalCenter": 0, @@ -8927,7 +9118,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 402 }, "_contentSize": { "__type__": "cc.Size", @@ -8955,7 +9146,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 396 + "__id__": 404 }, "_resizeMode": 1, "_layoutType": 1, @@ -8993,7 +9184,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 406 }, "_alignFlags": 44, "_target": null, @@ -9042,7 +9233,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 401 + "__id__": 409 }, "_contentSize": { "__type__": "cc.Size", @@ -9070,7 +9261,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 411 }, "_alignFlags": 21, "_target": null, @@ -9106,7 +9297,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 413 }, "debugMode": false, "showMemoryPanel": true, @@ -9146,7 +9337,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 415 }, "_id": "" }, @@ -9164,7 +9355,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 409 + "__id__": 417 }, "debugMode": false, "_id": "" @@ -9183,7 +9374,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 419 }, "card1": { "__id__": 222 @@ -9203,6 +9394,9 @@ "cards_up": { "__id__": 339 }, + "coins": { + "__id__": 54 + }, "_id": "" }, { @@ -9219,7 +9413,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 413 + "__id__": 421 }, "_id": "" }, @@ -9250,29 +9444,29 @@ }, "_children": [ { - "__id__": 416 + "__id__": 424 }, { - "__id__": 432 + "__id__": 440 }, { - "__id__": 468 + "__id__": 476 } ], "_active": false, "_components": [ { - "__id__": 544 + "__id__": 552 }, { - "__id__": 546 + "__id__": 554 }, { - "__id__": 548 + "__id__": 556 } ], "_prefab": { - "__id__": 550 + "__id__": 558 }, "_lpos": { "__type__": "cc.Vec3", @@ -9309,27 +9503,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 415 + "__id__": 423 }, "_children": [ { - "__id__": 417 + "__id__": 425 } ], "_active": true, "_components": [ { - "__id__": 425 + "__id__": 433 }, { - "__id__": 427 + "__id__": 435 }, { - "__id__": 429 + "__id__": 437 } ], "_prefab": { - "__id__": 431 + "__id__": 439 }, "_lpos": { "__type__": "cc.Vec3", @@ -9366,23 +9560,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 416 + "__id__": 424 }, "_children": [], "_active": true, "_components": [ { - "__id__": 418 + "__id__": 426 }, { - "__id__": 420 + "__id__": 428 }, { - "__id__": 422 + "__id__": 430 } ], "_prefab": { - "__id__": 424 + "__id__": 432 }, "_lpos": { "__type__": "cc.Vec3", @@ -9419,11 +9613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 417 + "__id__": 425 }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 427 }, "_contentSize": { "__type__": "cc.Size", @@ -9447,11 +9641,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 417 + "__id__": 425 }, "_enabled": true, "__prefab": { - "__id__": 421 + "__id__": 429 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9495,11 +9689,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 417 + "__id__": 425 }, "_enabled": true, "__prefab": { - "__id__": 423 + "__id__": 431 }, "_alignFlags": 45, "_target": null, @@ -9544,11 +9738,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 424 }, "_enabled": true, "__prefab": { - "__id__": 426 + "__id__": 434 }, "_contentSize": { "__type__": "cc.Size", @@ -9572,11 +9766,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 424 }, "_enabled": true, "__prefab": { - "__id__": 428 + "__id__": 436 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9620,11 +9814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 416 + "__id__": 424 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 438 }, "_alignFlags": 45, "_target": null, @@ -9667,17 +9861,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 415 + "__id__": 423 }, "_prefab": { - "__id__": 433 + "__id__": 441 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 432 + "__id__": 440 }, "asset": { "__uuid__": "b111b7ce-9621-4519-b4b8-7a5a64c2e98e", @@ -9685,7 +9879,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 434 + "__id__": 442 }, "targetOverrides": null }, @@ -9698,18 +9892,6 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 435 - }, - { - "__id__": 437 - }, - { - "__id__": 439 - }, - { - "__id__": 441 - }, { "__id__": 443 }, @@ -9717,16 +9899,16 @@ "__id__": 445 }, { - "__id__": 448 + "__id__": 447 }, { - "__id__": 450 + "__id__": 449 }, { - "__id__": 452 + "__id__": 451 }, { - "__id__": 454 + "__id__": 453 }, { "__id__": 456 @@ -9745,6 +9927,18 @@ }, { "__id__": 466 + }, + { + "__id__": 468 + }, + { + "__id__": 470 + }, + { + "__id__": 472 + }, + { + "__id__": 474 } ], "removedComponents": [] @@ -9752,7 +9946,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 436 + "__id__": 444 }, "propertyPath": [ "_name" @@ -9768,7 +9962,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 438 + "__id__": 446 }, "propertyPath": [ "_lpos" @@ -9789,7 +9983,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 440 + "__id__": 448 }, "propertyPath": [ "_lrot" @@ -9811,7 +10005,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 442 + "__id__": 450 }, "propertyPath": [ "_euler" @@ -9832,7 +10026,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 444 + "__id__": 452 }, "propertyPath": [ "clickEvents", @@ -9849,14 +10043,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 446 + "__id__": 454 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 447 + "__id__": 455 } }, { @@ -9868,7 +10062,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 415 + "__id__": 423 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -9878,13 +10072,13 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 449 + "__id__": 457 }, "propertyPath": [ "_target" ], "value": { - "__id__": 432 + "__id__": 440 } }, { @@ -9896,7 +10090,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 451 + "__id__": 459 }, "propertyPath": [ "_bottom" @@ -9912,7 +10106,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 453 + "__id__": 461 }, "propertyPath": [ "_spriteFrame" @@ -9931,7 +10125,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 455 + "__id__": 463 }, "propertyPath": [ "_contentSize" @@ -9951,7 +10145,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 457 + "__id__": 465 }, "propertyPath": [ "_contentSize" @@ -9971,7 +10165,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 459 + "__id__": 467 }, "propertyPath": [ "_lineHeight" @@ -9987,7 +10181,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 461 + "__id__": 469 }, "propertyPath": [ "_contentSize" @@ -10007,7 +10201,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 463 + "__id__": 471 }, "propertyPath": [ "_fontSize" @@ -10023,7 +10217,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 465 + "__id__": 473 }, "propertyPath": [ "_actualFontSize" @@ -10039,7 +10233,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 467 + "__id__": 475 }, "propertyPath": [ "_outlineWidth" @@ -10058,33 +10252,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 415 + "__id__": 423 }, "_children": [ { - "__id__": 469 + "__id__": 477 }, { - "__id__": 491 + "__id__": 499 }, { - "__id__": 515 + "__id__": 523 } ], "_active": true, "_components": [ { - "__id__": 537 + "__id__": 545 }, { - "__id__": 539 + "__id__": 547 }, { - "__id__": 541 + "__id__": 549 } ], "_prefab": { - "__id__": 543 + "__id__": 551 }, "_lpos": { "__type__": "cc.Vec3", @@ -10121,27 +10315,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 468 + "__id__": 476 }, "_children": [ { - "__id__": 470 + "__id__": 478 }, { - "__id__": 476 + "__id__": 484 }, { - "__id__": 482 + "__id__": 490 } ], "_active": true, "_components": [ { - "__id__": 488 + "__id__": 496 } ], "_prefab": { - "__id__": 490 + "__id__": 498 }, "_lpos": { "__type__": "cc.Vec3", @@ -10178,20 +10372,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": true, "_components": [ { - "__id__": 471 + "__id__": 479 }, { - "__id__": 473 + "__id__": 481 } ], "_prefab": { - "__id__": 475 + "__id__": 483 }, "_lpos": { "__type__": "cc.Vec3", @@ -10228,11 +10422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 470 + "__id__": 478 }, "_enabled": true, "__prefab": { - "__id__": 472 + "__id__": 480 }, "_contentSize": { "__type__": "cc.Size", @@ -10256,11 +10450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 470 + "__id__": 478 }, "_enabled": true, "__prefab": { - "__id__": 474 + "__id__": 482 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10314,20 +10508,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": false, "_components": [ { - "__id__": 477 + "__id__": 485 }, { - "__id__": 479 + "__id__": 487 } ], "_prefab": { - "__id__": 481 + "__id__": 489 }, "_lpos": { "__type__": "cc.Vec3", @@ -10364,11 +10558,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 476 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 478 + "__id__": 486 }, "_contentSize": { "__type__": "cc.Size", @@ -10392,11 +10586,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 476 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 480 + "__id__": 488 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10450,20 +10644,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 469 + "__id__": 477 }, "_children": [], "_active": true, "_components": [ { - "__id__": 483 + "__id__": 491 }, { - "__id__": 485 + "__id__": 493 } ], "_prefab": { - "__id__": 487 + "__id__": 495 }, "_lpos": { "__type__": "cc.Vec3", @@ -10500,11 +10694,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 482 + "__id__": 490 }, "_enabled": true, "__prefab": { - "__id__": 484 + "__id__": 492 }, "_contentSize": { "__type__": "cc.Size", @@ -10528,11 +10722,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 482 + "__id__": 490 }, "_enabled": true, "__prefab": { - "__id__": 486 + "__id__": 494 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10586,11 +10780,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 469 + "__id__": 477 }, "_enabled": true, "__prefab": { - "__id__": 489 + "__id__": 497 }, "_contentSize": { "__type__": "cc.Size", @@ -10627,30 +10821,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 468 + "__id__": 476 }, "_children": [ { - "__id__": 492 + "__id__": 500 }, { - "__id__": 498 - }, - { - "__id__": 504 - } - ], - "_active": true, - "_components": [ - { - "__id__": 510 + "__id__": 506 }, { "__id__": 512 } ], + "_active": true, + "_components": [ + { + "__id__": 518 + }, + { + "__id__": 520 + } + ], "_prefab": { - "__id__": 514 + "__id__": 522 }, "_lpos": { "__type__": "cc.Vec3", @@ -10687,20 +10881,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 491 + "__id__": 499 }, "_children": [], "_active": true, "_components": [ { - "__id__": 493 + "__id__": 501 }, { - "__id__": 495 + "__id__": 503 } ], "_prefab": { - "__id__": 497 + "__id__": 505 }, "_lpos": { "__type__": "cc.Vec3", @@ -10737,11 +10931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 492 + "__id__": 500 }, "_enabled": true, "__prefab": { - "__id__": 494 + "__id__": 502 }, "_contentSize": { "__type__": "cc.Size", @@ -10765,11 +10959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 492 + "__id__": 500 }, "_enabled": true, "__prefab": { - "__id__": 496 + "__id__": 504 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10823,20 +11017,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 491 + "__id__": 499 }, "_children": [], "_active": true, "_components": [ { - "__id__": 499 + "__id__": 507 }, { - "__id__": 501 + "__id__": 509 } ], "_prefab": { - "__id__": 503 + "__id__": 511 }, "_lpos": { "__type__": "cc.Vec3", @@ -10873,11 +11067,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 498 + "__id__": 506 }, "_enabled": true, "__prefab": { - "__id__": 500 + "__id__": 508 }, "_contentSize": { "__type__": "cc.Size", @@ -10901,11 +11095,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 498 + "__id__": 506 }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 510 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10959,20 +11153,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 491 + "__id__": 499 }, "_children": [], "_active": true, "_components": [ { - "__id__": 505 + "__id__": 513 }, { - "__id__": 507 + "__id__": 515 } ], "_prefab": { - "__id__": 509 + "__id__": 517 }, "_lpos": { "__type__": "cc.Vec3", @@ -11009,11 +11203,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 512 }, "_enabled": true, "__prefab": { - "__id__": 506 + "__id__": 514 }, "_contentSize": { "__type__": "cc.Size", @@ -11037,11 +11231,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 504 + "__id__": 512 }, "_enabled": true, "__prefab": { - "__id__": 508 + "__id__": 516 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11095,11 +11289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 491 + "__id__": 499 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 519 }, "_contentSize": { "__type__": "cc.Size", @@ -11123,11 +11317,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 491 + "__id__": 499 }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 521 }, "clickEvents": [], "_interactable": true, @@ -11192,27 +11386,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 468 + "__id__": 476 }, "_children": [ { - "__id__": 516 + "__id__": 524 }, { - "__id__": 522 + "__id__": 530 }, { - "__id__": 528 + "__id__": 536 } ], "_active": true, "_components": [ { - "__id__": 534 + "__id__": 542 } ], "_prefab": { - "__id__": 536 + "__id__": 544 }, "_lpos": { "__type__": "cc.Vec3", @@ -11249,20 +11443,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 515 + "__id__": 523 }, "_children": [], "_active": true, "_components": [ { - "__id__": 517 + "__id__": 525 }, { - "__id__": 519 + "__id__": 527 } ], "_prefab": { - "__id__": 521 + "__id__": 529 }, "_lpos": { "__type__": "cc.Vec3", @@ -11299,11 +11493,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 516 + "__id__": 524 }, "_enabled": true, "__prefab": { - "__id__": 518 + "__id__": 526 }, "_contentSize": { "__type__": "cc.Size", @@ -11327,11 +11521,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 516 + "__id__": 524 }, "_enabled": true, "__prefab": { - "__id__": 520 + "__id__": 528 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11385,20 +11579,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 515 + "__id__": 523 }, "_children": [], "_active": false, "_components": [ { - "__id__": 523 + "__id__": 531 }, { - "__id__": 525 + "__id__": 533 } ], "_prefab": { - "__id__": 527 + "__id__": 535 }, "_lpos": { "__type__": "cc.Vec3", @@ -11435,11 +11629,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 522 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 524 + "__id__": 532 }, "_contentSize": { "__type__": "cc.Size", @@ -11463,11 +11657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 522 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 526 + "__id__": 534 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11521,20 +11715,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 515 + "__id__": 523 }, "_children": [], "_active": true, "_components": [ { - "__id__": 529 + "__id__": 537 }, { - "__id__": 531 + "__id__": 539 } ], "_prefab": { - "__id__": 533 + "__id__": 541 }, "_lpos": { "__type__": "cc.Vec3", @@ -11571,11 +11765,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 536 }, "_enabled": true, "__prefab": { - "__id__": 530 + "__id__": 538 }, "_contentSize": { "__type__": "cc.Size", @@ -11599,11 +11793,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 536 }, "_enabled": true, "__prefab": { - "__id__": 532 + "__id__": 540 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11657,11 +11851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 515 + "__id__": 523 }, "_enabled": true, "__prefab": { - "__id__": 535 + "__id__": 543 }, "_contentSize": { "__type__": "cc.Size", @@ -11698,11 +11892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 468 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 538 + "__id__": 546 }, "_contentSize": { "__type__": "cc.Size", @@ -11726,11 +11920,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 468 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 540 + "__id__": 548 }, "_alignFlags": 44, "_target": null, @@ -11762,11 +11956,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 468 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 542 + "__id__": 550 }, "_resizeMode": 1, "_layoutType": 1, @@ -11813,11 +12007,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 423 }, "_enabled": true, "__prefab": { - "__id__": 545 + "__id__": 553 }, "_contentSize": { "__type__": "cc.Size", @@ -11841,11 +12035,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 423 }, "_enabled": true, "__prefab": { - "__id__": 547 + "__id__": 555 }, "_alignFlags": 21, "_target": null, @@ -11877,11 +12071,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 415 + "__id__": 423 }, "_enabled": true, "__prefab": { - "__id__": 549 + "__id__": 557 }, "_id": "" }, @@ -11909,14 +12103,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 552 + "__id__": 560 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 551 + "__id__": 559 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -11924,7 +12118,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 553 + "__id__": 561 }, "targetOverrides": null }, @@ -11938,19 +12132,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 554 + "__id__": 562 }, { - "__id__": 556 + "__id__": 564 }, { - "__id__": 557 + "__id__": 565 }, { - "__id__": 558 + "__id__": 566 }, { - "__id__": 559 + "__id__": 567 } ], "removedComponents": [] @@ -11958,7 +12152,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 555 + "__id__": 563 }, "propertyPath": [ "_name" @@ -11974,7 +12168,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 555 + "__id__": 563 }, "propertyPath": [ "_lpos" @@ -11989,7 +12183,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 555 + "__id__": 563 }, "propertyPath": [ "_lrot" @@ -12005,7 +12199,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 555 + "__id__": 563 }, "propertyPath": [ "_euler" @@ -12020,7 +12214,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 555 + "__id__": 563 }, "propertyPath": [ "_active" @@ -12037,23 +12231,23 @@ }, "_children": [ { - "__id__": 561 + "__id__": 569 } ], "_active": true, "_components": [ { - "__id__": 599 + "__id__": 607 }, { - "__id__": 601 + "__id__": 609 }, { - "__id__": 603 + "__id__": 611 } ], "_prefab": { - "__id__": 605 + "__id__": 613 }, "_lpos": { "__type__": "cc.Vec3", @@ -12090,30 +12284,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 560 + "__id__": 568 }, "_children": [ { - "__id__": 562 + "__id__": 570 } ], "_active": true, "_components": [ { - "__id__": 590 + "__id__": 598 }, { - "__id__": 592 + "__id__": 600 }, { - "__id__": 594 + "__id__": 602 }, { - "__id__": 596 + "__id__": 604 } ], "_prefab": { - "__id__": 598 + "__id__": 606 }, "_lpos": { "__type__": "cc.Vec3", @@ -12150,27 +12344,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 561 + "__id__": 569 }, "_children": [ - { - "__id__": 563 - }, { "__id__": 571 }, { - "__id__": 577 + "__id__": 579 + }, + { + "__id__": 585 } ], "_active": true, "_components": [ { - "__id__": 587 + "__id__": 595 } ], "_prefab": { - "__id__": 589 + "__id__": 597 }, "_lpos": { "__type__": "cc.Vec3", @@ -12207,23 +12401,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 562 + "__id__": 570 }, "_children": [], "_active": true, "_components": [ { - "__id__": 564 + "__id__": 572 }, { - "__id__": 566 + "__id__": 574 }, { - "__id__": 568 + "__id__": 576 } ], "_prefab": { - "__id__": 570 + "__id__": 578 }, "_lpos": { "__type__": "cc.Vec3", @@ -12260,11 +12454,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 571 }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 573 }, "_contentSize": { "__type__": "cc.Size", @@ -12288,11 +12482,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 571 }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 575 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12336,11 +12530,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 571 }, "_enabled": true, "__prefab": { - "__id__": 569 + "__id__": 577 }, "_alignFlags": 40, "_target": null, @@ -12385,20 +12579,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 562 + "__id__": 570 }, "_children": [], "_active": true, "_components": [ { - "__id__": 572 + "__id__": 580 }, { - "__id__": 574 + "__id__": 582 } ], "_prefab": { - "__id__": 576 + "__id__": 584 }, "_lpos": { "__type__": "cc.Vec3", @@ -12435,11 +12629,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 571 + "__id__": 579 }, "_enabled": true, "__prefab": { - "__id__": 573 + "__id__": 581 }, "_contentSize": { "__type__": "cc.Size", @@ -12463,11 +12657,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 571 + "__id__": 579 }, "_enabled": true, "__prefab": { - "__id__": 575 + "__id__": 583 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12524,26 +12718,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 562 + "__id__": 570 }, "_children": [], "_active": true, "_components": [ { - "__id__": 578 + "__id__": 586 }, { - "__id__": 580 + "__id__": 588 }, { - "__id__": 582 + "__id__": 590 }, { - "__id__": 584 + "__id__": 592 } ], "_prefab": { - "__id__": 586 + "__id__": 594 }, "_lpos": { "__type__": "cc.Vec3", @@ -12580,11 +12774,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 579 + "__id__": 587 }, "_contentSize": { "__type__": "cc.Size", @@ -12608,11 +12802,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 581 + "__id__": 589 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12676,11 +12870,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 583 + "__id__": 591 }, "_alignFlags": 10, "_target": null, @@ -12712,11 +12906,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 585 + "__id__": 593 }, "templateMode": true, "watchPath": "data.data.gold", @@ -12749,11 +12943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 562 + "__id__": 570 }, "_enabled": true, "__prefab": { - "__id__": 588 + "__id__": 596 }, "_contentSize": { "__type__": "cc.Size", @@ -12790,11 +12984,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 591 + "__id__": 599 }, "_contentSize": { "__type__": "cc.Size", @@ -12818,11 +13012,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 593 + "__id__": 601 }, "_alignFlags": 8, "_target": null, @@ -12854,11 +13048,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 595 + "__id__": 603 }, "_resizeMode": 0, "_layoutType": 1, @@ -12892,11 +13086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 561 + "__id__": 569 }, "_enabled": true, "__prefab": { - "__id__": 597 + "__id__": 605 }, "_alignFlags": 40, "_target": null, @@ -12941,11 +13135,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 560 + "__id__": 568 }, "_enabled": true, "__prefab": { - "__id__": 600 + "__id__": 608 }, "_contentSize": { "__type__": "cc.Size", @@ -12969,11 +13163,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 560 + "__id__": 568 }, "_enabled": true, "__prefab": { - "__id__": 602 + "__id__": 610 }, "_alignFlags": 17, "_target": null, @@ -13005,11 +13199,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 560 + "__id__": 568 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 612 }, "_id": "" }, @@ -13040,7 +13234,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 607 + "__id__": 615 }, "_contentSize": { "__type__": "cc.Size", @@ -13068,7 +13262,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 609 + "__id__": 617 }, "_alignFlags": 45, "_target": null, @@ -13104,7 +13298,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 611 + "__id__": 619 }, "debugMode": false, "_id": "" @@ -13126,10 +13320,10 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 551 + "__id__": 559 }, { - "__id__": 432 + "__id__": 440 }, { "__id__": 256 diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index 18c2d1ff..b88ba0e3 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -1,3 +1,5 @@ +import * as exp from "constants" + /** 卡牌大类定义 */ export enum CardType { Hero = 1, @@ -27,7 +29,14 @@ export interface CardConfig { lv: CardKind hero_lv?: number } - +export const CardsUpSet: Record = { + 1: 50, + 2: 100, + 3: 150, + 4: 200, + 5: 250, +} +export const CardInitCoins = 4 /** 卡池默认初始等级 */ export const CARD_POOL_INIT_LEVEL = CardKind.LV1 /** 卡池等级上限 */ diff --git a/assets/script/game/common/config/GameEvent.ts b/assets/script/game/common/config/GameEvent.ts index c4fda76c..a38305fa 100644 --- a/assets/script/game/common/config/GameEvent.ts +++ b/assets/script/game/common/config/GameEvent.ts @@ -72,4 +72,5 @@ export enum GameEvent { UpdateCollection = "UpdateCollection", UpdateMissionGet = "UpdateMissionGet", GlobalAttrChange = "GlobalAttrChange", + CoinAdd = "CoinAdd", } \ No newline at end of file diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index 0143669b..a0e1d4de 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -3,8 +3,10 @@ import { _decorator, Label, Node, NodeEventType, SpriteAtlas } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { GameEvent } from "../common/config/GameEvent"; -import { CARD_POOL_INIT_LEVEL, CARD_POOL_MAX_LEVEL, CardConfig, getCardsByLv } from "../common/config/CardSet"; +import { CARD_POOL_INIT_LEVEL, CARD_POOL_MAX_LEVEL, CardConfig, CardInitCoins, CardsUpSet, getCardsByLv } from "../common/config/CardSet"; +import { smc } from "../common/SingletonModuleComp"; import { CardComp } from "./CardComp"; +import { oops } from "db://oops-framework/core/Oops"; const { ccclass, property } = _decorator; @@ -28,14 +30,14 @@ export class MissionCardComp extends CCComp { cards_chou:Node = null! @property(Node) cards_up:Node = null! - + @property(Node) + coins:Node = null! /** 预留图集缓存（后续接入按钮/卡面图标时复用） */ private uiconsAtlas: SpriteAtlas | null = null; /** 四个槽位对应的单卡控制器缓存 */ private cardComps: CardComp[] = []; /** 当前卡池等级（仅影响抽卡来源，不直接改卡槽现有内容） */ private poolLv: number = CARD_POOL_INIT_LEVEL; - onLoad() { /** 绑定事件 -> 缓存子控制器 -> 初始化UI状态 */ this.bindEvents(); @@ -58,12 +60,14 @@ export class MissionCardComp extends CCComp { /** 任务开始时：重置卡池等级、清空4槽、显示面板 刷新一次卡池*/ onMissionStart() { this.poolLv = CARD_POOL_INIT_LEVEL; + smc.vmdata.mission_data.coin=CardInitCoins //这里负责卡牌相关数据舒适化 this.layoutCardSlots(); this.clearAllCards(); if (this.cards_up) { this.cards_up.active = true; } this.updatePoolLvUI(); + this.updateCoinUI(); this.node.active = true; const cards = this.buildDrawCards(); this.dispatchCardsToSlots(cards); @@ -94,11 +98,17 @@ export class MissionCardComp extends CCComp { /** 生命周期事件 */ this.on(GameEvent.MissionStart, this.onMissionStart, this); this.on(GameEvent.MissionEnd, this.onMissionEnd, this); + this.on(GameEvent.CoinAdd, this.onCoinAdd, this); + /** 按钮事件：抽卡与卡池升级 */ this.cards_chou?.on(NodeEventType.TOUCH_END, this.onClickDraw, this); this.cards_up?.on(NodeEventType.TOUCH_END, this.onClickUpgrade, this); } - + private onCoinAdd(args:any){ + this.updatePoolLvUI(); + this.updateCoinUI(); + } + /** 解除按钮监听，避免节点销毁后回调泄漏 */ private unbindEvents() { this.cards_chou?.off(NodeEventType.TOUCH_END, this.onClickDraw, this); @@ -129,12 +139,27 @@ export class MissionCardComp extends CCComp { mLogger.log(this.debugMode, "MissionCardComp", "pool already max", this.poolLv); return; } - this.poolLv += 1; - if (this.poolLv >= CARD_POOL_MAX_LEVEL && this.cards_up) { - this.cards_up.active = false; + const cost = this.getUpgradeCost(this.poolLv); + const currentCoin = smc.vmdata.mission_data.coin ?? 0; + if (currentCoin < cost) { + oops.gui.toast(`金币不足，升级需要${cost}`); + this.updatePoolLvUI(); + mLogger.log(this.debugMode, "MissionCardComp", "pool upgrade coin not enough", { + poolLv: this.poolLv, + currentCoin, + cost + }); + return; } + smc.vmdata.mission_data.coin = currentCoin - cost; + this.poolLv += 1; + this.updateCoinUI(); this.updatePoolLvUI(); - mLogger.log(this.debugMode, "MissionCardComp", "pool level up", this.poolLv); + mLogger.log(this.debugMode, "MissionCardComp", "pool level up", { + poolLv: this.poolLv, + cost, + leftCoin: smc.vmdata.mission_data.coin + }); } /** 构建本次抽卡结果，保证最终可分发4条数据 */ @@ -183,14 +208,40 @@ export class MissionCardComp extends CCComp { startX }); } - + private canUpPool() { + if (this.poolLv >= CARD_POOL_MAX_LEVEL) return false; + const currentCoin = smc.vmdata.mission_data.coin ?? 0; + return currentCoin >= this.getUpgradeCost(this.poolLv); + } /** 更新升级按钮上的等级文案，反馈当前卡池层级 */ private updatePoolLvUI() { if (!this.cards_up) return; - const label = this.cards_up.getComponentInChildren(Label); + const nobg = this.cards_up.getChildByName("nobg"); + if (nobg) { + nobg.active = !this.canUpPool(); + } + const label = this.cards_up.getChildByName("coin").getChildByName("num").getComponent(Label); if (!label) return; - label.string = `卡池Lv.${this.poolLv}`; - mLogger.log(this.debugMode, "MissionCardComp", "pool lv ui update", this.poolLv); + if (this.poolLv >= CARD_POOL_MAX_LEVEL) { + label.string = `0`; + } else { + label.string = `${this.getUpgradeCost(this.poolLv)}`; + } + mLogger.log(this.debugMode, "MissionCardComp", "pool lv ui update", { + poolLv: this.poolLv, + cost: this.getUpgradeCost(this.poolLv) + }); + } + + private updateCoinUI() { + if (!this.coins) return; + const label = this.coins.getChildByName("num")?.getComponent(Label); + if (!label) return; + label.string = `${smc.vmdata.mission_data.coin ?? 0}`; + } + + private getUpgradeCost(lv: number): number { + return CardsUpSet[lv] ?? 0; } /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */