diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 7d6084aa..ae00321b 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,29 +22,29 @@ "__id__": 2 }, { - "__id__": 563 + "__id__": 585 }, { - "__id__": 699 + "__id__": 721 }, { - "__id__": 708 + "__id__": 730 } ], "_active": true, "_components": [ { - "__id__": 754 + "__id__": 776 }, { - "__id__": 756 + "__id__": 778 }, { - "__id__": 758 + "__id__": 780 } ], "_prefab": { - "__id__": 760 + "__id__": 782 }, "_lpos": { "__type__": "cc.Vec3", @@ -91,35 +91,35 @@ "__id__": 15 }, { - "__id__": 518 + "__id__": 540 } ], "_active": true, "_components": [ { - "__id__": 548 + "__id__": 570 }, { - "__id__": 550 + "__id__": 572 }, { - "__id__": 552 + "__id__": 574 }, { - "__id__": 554 + "__id__": 576 }, { - "__id__": 556 + "__id__": 578 }, { - "__id__": 558 + "__id__": 580 }, { - "__id__": 560 + "__id__": 582 } ], "_prefab": { - "__id__": 562 + "__id__": 584 }, "_lpos": { "__type__": "cc.Vec3", @@ -498,17 +498,17 @@ "_active": true, "_components": [ { - "__id__": 511 + "__id__": 533 }, { - "__id__": 513 + "__id__": 535 }, { - "__id__": 515 + "__id__": 537 } ], "_prefab": { - "__id__": 517 + "__id__": 539 }, "_lpos": { "__type__": "cc.Vec3", @@ -7004,22 +7004,25 @@ }, { "__id__": 434 + }, + { + "__id__": 504 } ], "_active": true, "_components": [ { - "__id__": 504 + "__id__": 526 }, { - "__id__": 506 + "__id__": 528 }, { - "__id__": 508 + "__id__": 530 } ], "_prefab": { - "__id__": 510 + "__id__": 532 }, "_lpos": { "__type__": "cc.Vec3", @@ -7662,7 +7665,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -120, + "x": -240, "y": 0, "z": 0 }, @@ -8885,7 +8888,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 120, + "x": 0, "y": 0, "z": 0 }, @@ -10497,6 +10500,516 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "start", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 358 + }, + "_children": [ + { + "__id__": 505 + }, + { + "__id__": 513 + } + ], + "_active": true, + "_components": [ + { + "__id__": 521 + }, + { + "__id__": 523 + } + ], + "_prefab": { + "__id__": 525 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 240, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 504 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 506 + }, + { + "__id__": 508 + }, + { + "__id__": 510 + } + ], + "_prefab": { + "__id__": 512 + }, + "_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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 505 + }, + "_enabled": true, + "__prefab": { + "__id__": 507 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bdndmAI41NkZ9VMutp8NRq" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 505 + }, + "_enabled": true, + "__prefab": { + "__id__": 509 + }, + "_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@7645f", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1f0kGrDO1I9qo/3x/Hrhe1" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 505 + }, + "_enabled": true, + "__prefab": { + "__id__": 511 + }, + "_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": 216, + "_originalHeight": 106, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "020Gypo/9NKrNzaSZ1jebp" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6fmabCuyBAY6h/wkoN0izK", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 504 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 514 + }, + { + "__id__": 516 + }, + { + "__id__": 518 + } + ], + "_prefab": { + "__id__": 520 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 55, + "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__": 513 + }, + "_enabled": true, + "__prefab": { + "__id__": 515 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 58.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "aa+gwM1wlJ5qfBctD1Vlbz" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 513 + }, + "_enabled": true, + "__prefab": { + "__id__": 517 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "开始", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 35, + "_fontSize": 35, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 4, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "615++7p7tNTIdtwKC7K1q5" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 513 + }, + "_enabled": true, + "__prefab": { + "__id__": 519 + }, + "_alignFlags": 16, + "_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": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e3yo6bxflGO6Xq4dTFGyRf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c1oXdXfB9AKbyrlmJkpw+E", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 504 + }, + "_enabled": true, + "__prefab": { + "__id__": 522 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "01IH0RctpImay0Pr0CTAQU" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 504 + }, + "_enabled": true, + "__prefab": { + "__id__": 524 + }, + "_alignFlags": 33, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 40, + "_bottom": 1078.082, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f7m006fq5ClLpZIK5ujZJG" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "057YhGkqhHg5ol4bfhonoQ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -10507,11 +11020,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 505 + "__id__": 527 }, "_contentSize": { "__type__": "cc.Size", - "width": 460, + "width": 700, "height": 150 }, "_anchorPoint": { @@ -10535,7 +11048,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 529 }, "_resizeMode": 1, "_layoutType": 1, @@ -10573,12 +11086,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 531 }, "_alignFlags": 44, "_target": null, - "_left": 130, - "_right": 130, + "_left": 10, + "_right": 10, "_top": 1230, "_bottom": 33.74599999999998, "_horizontalCenter": 0, @@ -10622,7 +11135,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 512 + "__id__": 534 }, "_contentSize": { "__type__": "cc.Size", @@ -10650,7 +11163,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 514 + "__id__": 536 }, "_alignFlags": 45, "_target": null, @@ -10686,7 +11199,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 516 + "__id__": 538 }, "_resizeMode": 1, "_layoutType": 1, @@ -10737,23 +11250,23 @@ }, "_children": [ { - "__id__": 519 + "__id__": 541 }, { - "__id__": 527 + "__id__": 549 } ], "_active": true, "_components": [ { - "__id__": 543 + "__id__": 565 }, { - "__id__": 545 + "__id__": 567 } ], "_prefab": { - "__id__": 547 + "__id__": 569 }, "_lpos": { "__type__": "cc.Vec3", @@ -10790,23 +11303,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 518 + "__id__": 540 }, "_children": [], "_active": false, "_components": [ { - "__id__": 520 + "__id__": 542 }, { - "__id__": 522 + "__id__": 544 }, { - "__id__": 524 + "__id__": 546 } ], "_prefab": { - "__id__": 526 + "__id__": 548 }, "_lpos": { "__type__": "cc.Vec3", @@ -10843,11 +11356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 521 + "__id__": 543 }, "_contentSize": { "__type__": "cc.Size", @@ -10871,11 +11384,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 523 + "__id__": 545 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10919,11 +11432,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 519 + "__id__": 541 }, "_enabled": true, "__prefab": { - "__id__": 525 + "__id__": 547 }, "_alignFlags": 45, "_target": null, @@ -10968,27 +11481,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 518 + "__id__": 540 }, "_children": [ { - "__id__": 528 + "__id__": 550 } ], "_active": true, "_components": [ { - "__id__": 536 + "__id__": 558 }, { - "__id__": 538 + "__id__": 560 }, { - "__id__": 540 + "__id__": 562 } ], "_prefab": { - "__id__": 542 + "__id__": 564 }, "_lpos": { "__type__": "cc.Vec3", @@ -11023,17 +11536,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 527 + "__id__": 549 }, "_prefab": { - "__id__": 529 + "__id__": 551 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 528 + "__id__": 550 }, "asset": { "__uuid__": "46f1e2cb-6fa7-4e9e-b419-e424ba47fe68", @@ -11041,7 +11554,7 @@ }, "fileId": "d5Q0cgjY1BTIz2JM1k7EZK", "instance": { - "__id__": 530 + "__id__": 552 }, "targetOverrides": null }, @@ -11055,16 +11568,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 531 + "__id__": 553 }, { - "__id__": 533 + "__id__": 555 }, { - "__id__": 534 + "__id__": 556 }, { - "__id__": 535 + "__id__": 557 } ], "removedComponents": [] @@ -11072,7 +11585,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 532 + "__id__": 554 }, "propertyPath": [ "_name" @@ -11088,7 +11601,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 532 + "__id__": 554 }, "propertyPath": [ "_lpos" @@ -11103,7 +11616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 532 + "__id__": 554 }, "propertyPath": [ "_lrot" @@ -11119,7 +11632,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 532 + "__id__": 554 }, "propertyPath": [ "_euler" @@ -11137,11 +11650,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 527 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 537 + "__id__": 559 }, "_contentSize": { "__type__": "cc.Size", @@ -11165,11 +11678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 527 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 561 }, "_alignFlags": 45, "_target": null, @@ -11201,11 +11714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 527 + "__id__": 549 }, "_enabled": true, "__prefab": { - "__id__": 541 + "__id__": 563 }, "_resizeMode": 0, "_layoutType": 1, @@ -11252,11 +11765,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 518 + "__id__": 540 }, "_enabled": true, "__prefab": { - "__id__": 544 + "__id__": 566 }, "_contentSize": { "__type__": "cc.Size", @@ -11280,11 +11793,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 518 + "__id__": 540 }, "_enabled": true, "__prefab": { - "__id__": 546 + "__id__": 568 }, "_alignFlags": 44, "_target": null, @@ -11333,7 +11846,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 549 + "__id__": 571 }, "_contentSize": { "__type__": "cc.Size", @@ -11361,7 +11874,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 551 + "__id__": 573 }, "_alignFlags": 21, "_target": null, @@ -11397,12 +11910,18 @@ }, "_enabled": true, "__prefab": { - "__id__": 553 + "__id__": 575 }, "debugMode": false, "showMemoryPanel": true, "maxMonsterCount": 5, "resumeMonsterCount": 3, + "prepareBaseCoinReward": 10, + "prepareCoinWaveGrow": 1, + "prepareCoinRewardCap": 20, + "start_btn": { + "__id__": 504 + }, "time_node": { "__id__": 3 }, @@ -11422,7 +11941,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 555 + "__id__": 577 }, "_id": "" }, @@ -11440,7 +11959,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 557 + "__id__": 579 }, "debugMode": false, "baseMonstersPerWave": 5, @@ -11463,11 +11982,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 581 }, "cards_node": { "__id__": 15 }, + "cardsBattleHideOffsetY": 320, + "cardsPanelMoveDuration": 0.2, "card1": { "__id__": 232 }, @@ -11493,7 +12014,7 @@ "__id__": 72 }, "hero_info_node": { - "__id__": 527 + "__id__": 549 }, "hero_info_prefab": { "__uuid__": "46f1e2cb-6fa7-4e9e-b419-e424ba47fe68", @@ -11518,7 +12039,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 561 + "__id__": 583 }, "_id": "" }, @@ -11549,29 +12070,29 @@ }, "_children": [ { - "__id__": 564 + "__id__": 586 }, { - "__id__": 580 + "__id__": 602 }, { - "__id__": 616 + "__id__": 638 } ], "_active": false, "_components": [ { - "__id__": 692 + "__id__": 714 }, { - "__id__": 694 + "__id__": 716 }, { - "__id__": 696 + "__id__": 718 } ], "_prefab": { - "__id__": 698 + "__id__": 720 }, "_lpos": { "__type__": "cc.Vec3", @@ -11608,27 +12129,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 563 + "__id__": 585 }, "_children": [ { - "__id__": 565 + "__id__": 587 } ], "_active": true, "_components": [ { - "__id__": 573 + "__id__": 595 }, { - "__id__": 575 + "__id__": 597 }, { - "__id__": 577 + "__id__": 599 } ], "_prefab": { - "__id__": 579 + "__id__": 601 }, "_lpos": { "__type__": "cc.Vec3", @@ -11665,23 +12186,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 564 + "__id__": 586 }, "_children": [], "_active": true, "_components": [ { - "__id__": 566 + "__id__": 588 }, { - "__id__": 568 + "__id__": 590 }, { - "__id__": 570 + "__id__": 592 } ], "_prefab": { - "__id__": 572 + "__id__": 594 }, "_lpos": { "__type__": "cc.Vec3", @@ -11718,11 +12239,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 565 + "__id__": 587 }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 589 }, "_contentSize": { "__type__": "cc.Size", @@ -11746,11 +12267,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 565 + "__id__": 587 }, "_enabled": true, "__prefab": { - "__id__": 569 + "__id__": 591 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11794,11 +12315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 565 + "__id__": 587 }, "_enabled": true, "__prefab": { - "__id__": 571 + "__id__": 593 }, "_alignFlags": 45, "_target": null, @@ -11843,11 +12364,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 564 + "__id__": 586 }, "_enabled": true, "__prefab": { - "__id__": 574 + "__id__": 596 }, "_contentSize": { "__type__": "cc.Size", @@ -11871,11 +12392,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 564 + "__id__": 586 }, "_enabled": false, "__prefab": { - "__id__": 576 + "__id__": 598 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11913,11 +12434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 564 + "__id__": 586 }, "_enabled": true, "__prefab": { - "__id__": 578 + "__id__": 600 }, "_alignFlags": 45, "_target": null, @@ -11960,17 +12481,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 563 + "__id__": 585 }, "_prefab": { - "__id__": 581 + "__id__": 603 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 580 + "__id__": 602 }, "asset": { "__uuid__": "b111b7ce-9621-4519-b4b8-7a5a64c2e98e", @@ -11978,7 +12499,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 582 + "__id__": 604 }, "targetOverrides": null }, @@ -11992,52 +12513,52 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 583 + "__id__": 605 }, { - "__id__": 585 + "__id__": 607 }, { - "__id__": 587 + "__id__": 609 }, { - "__id__": 589 + "__id__": 611 }, { - "__id__": 591 + "__id__": 613 }, { - "__id__": 593 + "__id__": 615 }, { - "__id__": 596 + "__id__": 618 }, { - "__id__": 598 + "__id__": 620 }, { - "__id__": 600 + "__id__": 622 }, { - "__id__": 602 + "__id__": 624 }, { - "__id__": 604 + "__id__": 626 }, { - "__id__": 606 + "__id__": 628 }, { - "__id__": 608 + "__id__": 630 }, { - "__id__": 610 + "__id__": 632 }, { - "__id__": 612 + "__id__": 634 }, { - "__id__": 614 + "__id__": 636 } ], "removedComponents": [] @@ -12045,7 +12566,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 584 + "__id__": 606 }, "propertyPath": [ "_name" @@ -12061,7 +12582,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 586 + "__id__": 608 }, "propertyPath": [ "_lpos" @@ -12082,7 +12603,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 588 + "__id__": 610 }, "propertyPath": [ "_lrot" @@ -12104,7 +12625,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 590 + "__id__": 612 }, "propertyPath": [ "_euler" @@ -12125,7 +12646,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 592 + "__id__": 614 }, "propertyPath": [ "clickEvents", @@ -12142,14 +12663,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 594 + "__id__": 616 }, "propertyPath": [ "clickEvents", "0" ], "value": { - "__id__": 595 + "__id__": 617 } }, { @@ -12161,7 +12682,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 563 + "__id__": 585 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -12171,13 +12692,13 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 597 + "__id__": 619 }, "propertyPath": [ "_target" ], "value": { - "__id__": 580 + "__id__": 602 } }, { @@ -12189,7 +12710,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 599 + "__id__": 621 }, "propertyPath": [ "_bottom" @@ -12205,7 +12726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 601 + "__id__": 623 }, "propertyPath": [ "_spriteFrame" @@ -12224,7 +12745,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 603 + "__id__": 625 }, "propertyPath": [ "_contentSize" @@ -12244,7 +12765,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 605 + "__id__": 627 }, "propertyPath": [ "_contentSize" @@ -12264,7 +12785,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 607 + "__id__": 629 }, "propertyPath": [ "_lineHeight" @@ -12280,7 +12801,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 609 + "__id__": 631 }, "propertyPath": [ "_contentSize" @@ -12300,7 +12821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 611 + "__id__": 633 }, "propertyPath": [ "_fontSize" @@ -12316,7 +12837,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 613 + "__id__": 635 }, "propertyPath": [ "_actualFontSize" @@ -12332,7 +12853,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 615 + "__id__": 637 }, "propertyPath": [ "_outlineWidth" @@ -12351,33 +12872,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 563 + "__id__": 585 }, "_children": [ - { - "__id__": 617 - }, { "__id__": 639 }, { - "__id__": 663 + "__id__": 661 + }, + { + "__id__": 685 } ], "_active": true, "_components": [ { - "__id__": 685 + "__id__": 707 }, { - "__id__": 687 + "__id__": 709 }, { - "__id__": 689 + "__id__": 711 } ], "_prefab": { - "__id__": 691 + "__id__": 713 }, "_lpos": { "__type__": "cc.Vec3", @@ -12414,514 +12935,8 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 616 - }, - "_children": [ - { - "__id__": 618 - }, - { - "__id__": 624 - }, - { - "__id__": 630 - } - ], - "_active": true, - "_components": [ - { - "__id__": 636 - } - ], - "_prefab": { "__id__": 638 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -144, - "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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "bg", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 617 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 619 - }, - { - "__id__": 621 - } - ], - "_prefab": { - "__id__": 623 - }, - "_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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 618 - }, - "_enabled": true, - "__prefab": { - "__id__": 620 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 144, - "height": 97 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0b+S524pVNf63NWvo41yo9" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 618 - }, - "_enabled": true, - "__prefab": { - "__id__": 622 - }, - "_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@65cbe", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1bsU9RF9lCIqkCiqQkfKjH" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "71aFiHB8xGIJuSIEPZSxZq", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "active", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 617 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 625 - }, - { - "__id__": 627 - } - ], - "_prefab": { - "__id__": 629 - }, - "_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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 624 - }, - "_enabled": true, - "__prefab": { - "__id__": 626 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 144, - "height": 107 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0bgV1CDytP15zzyXaA+HPd" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 624 - }, - "_enabled": true, - "__prefab": { - "__id__": 628 - }, - "_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@7eac7", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "77ETeE2AxMt4sY4/KVQJiP" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b2FyCNMJdNbK8KuRd4V+h4", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 617 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 631 - }, - { - "__id__": 633 - } - ], - "_prefab": { - "__id__": 635 - }, - "_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": 0.7, - "y": 0.7, - "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__": 630 - }, - "_enabled": true, - "__prefab": { - "__id__": 632 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 116, - "height": 96 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "36SARH0vtPoJBTuG99LXPv" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 630 - }, - "_enabled": true, - "__prefab": { - "__id__": 634 - }, - "_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@23d2e", - "__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": "35x9I9q81L76T3ZxlF1JRV" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "2d9leUPv9PDrR5A8UmWlZZ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 617 - }, - "_enabled": true, - "__prefab": { - "__id__": 637 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 144, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "00UgJ3OodEa7IfNZrOAVg2" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d0gdbftb5MGYarmjYn6tGQ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "btn2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 616 - }, "_children": [ { "__id__": 640 @@ -12937,17 +12952,14 @@ "_components": [ { "__id__": 658 - }, - { - "__id__": 660 } ], "_prefab": { - "__id__": 662 + "__id__": 660 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -144, "y": 0, "z": 0 }, @@ -13050,7 +13062,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3dmZ6PcZ1O06B9Vy9yU761" + "fileId": "0b+S524pVNf63NWvo41yo9" }, { "__type__": "cc.Sprite", @@ -13095,7 +13107,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "58xYEIMtdG64TYb0cR8Dqn" + "fileId": "1bsU9RF9lCIqkCiqQkfKjH" }, { "__type__": "cc.PrefabInfo", @@ -13105,7 +13117,7 @@ "asset": { "__id__": 0 }, - "fileId": "8cNgawRaBANJHCmdHLH75E", + "fileId": "71aFiHB8xGIJuSIEPZSxZq", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -13119,7 +13131,7 @@ "__id__": 639 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 647 @@ -13186,7 +13198,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "80XSL57n5AcZmN7NmTG9+w" + "fileId": "0bgV1CDytP15zzyXaA+HPd" }, { "__type__": "cc.Sprite", @@ -13231,7 +13243,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b1M6uXXxFMLJqeWeC+L9Af" + "fileId": "77ETeE2AxMt4sY4/KVQJiP" }, { "__type__": "cc.PrefabInfo", @@ -13241,7 +13253,7 @@ "asset": { "__id__": 0 }, - "fileId": "11wAdqQr5OsKSgZTMJP6zQ", + "fileId": "b2FyCNMJdNbK8KuRd4V+h4", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -13308,6 +13320,515 @@ "__prefab": { "__id__": 654 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 116, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "36SARH0vtPoJBTuG99LXPv" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 652 + }, + "_enabled": true, + "__prefab": { + "__id__": 656 + }, + "_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@23d2e", + "__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": "35x9I9q81L76T3ZxlF1JRV" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2d9leUPv9PDrR5A8UmWlZZ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 639 + }, + "_enabled": true, + "__prefab": { + "__id__": 659 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 144, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "00UgJ3OodEa7IfNZrOAVg2" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d0gdbftb5MGYarmjYn6tGQ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "btn2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 638 + }, + "_children": [ + { + "__id__": 662 + }, + { + "__id__": 668 + }, + { + "__id__": 674 + } + ], + "_active": true, + "_components": [ + { + "__id__": 680 + }, + { + "__id__": 682 + } + ], + "_prefab": { + "__id__": 684 + }, + "_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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 661 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 663 + }, + { + "__id__": 665 + } + ], + "_prefab": { + "__id__": 667 + }, + "_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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 662 + }, + "_enabled": true, + "__prefab": { + "__id__": 664 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 144, + "height": 97 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3dmZ6PcZ1O06B9Vy9yU761" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 662 + }, + "_enabled": true, + "__prefab": { + "__id__": 666 + }, + "_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@65cbe", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "58xYEIMtdG64TYb0cR8Dqn" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8cNgawRaBANJHCmdHLH75E", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "active", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 661 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 669 + }, + { + "__id__": 671 + } + ], + "_prefab": { + "__id__": 673 + }, + "_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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 668 + }, + "_enabled": true, + "__prefab": { + "__id__": 670 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 144, + "height": 107 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "80XSL57n5AcZmN7NmTG9+w" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 668 + }, + "_enabled": true, + "__prefab": { + "__id__": 672 + }, + "_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@7eac7", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b1M6uXXxFMLJqeWeC+L9Af" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "11wAdqQr5OsKSgZTMJP6zQ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "icon", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 661 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 675 + }, + { + "__id__": 677 + } + ], + "_prefab": { + "__id__": 679 + }, + "_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": 0.7, + "y": 0.7, + "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__": 674 + }, + "_enabled": true, + "__prefab": { + "__id__": 676 + }, "_contentSize": { "__type__": "cc.Size", "width": 106, @@ -13330,11 +13851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 652 + "__id__": 674 }, "_enabled": true, "__prefab": { - "__id__": 656 + "__id__": 678 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13388,11 +13909,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 639 + "__id__": 661 }, "_enabled": true, "__prefab": { - "__id__": 659 + "__id__": 681 }, "_contentSize": { "__type__": "cc.Size", @@ -13416,11 +13937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 639 + "__id__": 661 }, "_enabled": true, "__prefab": { - "__id__": 661 + "__id__": 683 }, "clickEvents": [], "_interactable": true, @@ -13485,27 +14006,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 616 + "__id__": 638 }, "_children": [ { - "__id__": 664 + "__id__": 686 }, { - "__id__": 670 + "__id__": 692 }, { - "__id__": 676 + "__id__": 698 } ], "_active": true, "_components": [ { - "__id__": 682 + "__id__": 704 } ], "_prefab": { - "__id__": 684 + "__id__": 706 }, "_lpos": { "__type__": "cc.Vec3", @@ -13542,20 +14063,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 663 + "__id__": 685 }, "_children": [], "_active": true, "_components": [ { - "__id__": 665 + "__id__": 687 }, { - "__id__": 667 + "__id__": 689 } ], "_prefab": { - "__id__": 669 + "__id__": 691 }, "_lpos": { "__type__": "cc.Vec3", @@ -13592,11 +14113,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 664 + "__id__": 686 }, "_enabled": true, "__prefab": { - "__id__": 666 + "__id__": 688 }, "_contentSize": { "__type__": "cc.Size", @@ -13620,11 +14141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 664 + "__id__": 686 }, "_enabled": true, "__prefab": { - "__id__": 668 + "__id__": 690 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13678,20 +14199,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 663 + "__id__": 685 }, "_children": [], "_active": false, "_components": [ { - "__id__": 671 + "__id__": 693 }, { - "__id__": 673 + "__id__": 695 } ], "_prefab": { - "__id__": 675 + "__id__": 697 }, "_lpos": { "__type__": "cc.Vec3", @@ -13728,11 +14249,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 692 }, "_enabled": true, "__prefab": { - "__id__": 672 + "__id__": 694 }, "_contentSize": { "__type__": "cc.Size", @@ -13756,11 +14277,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 692 }, "_enabled": true, "__prefab": { - "__id__": 674 + "__id__": 696 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13814,20 +14335,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 663 + "__id__": 685 }, "_children": [], "_active": true, "_components": [ { - "__id__": 677 + "__id__": 699 }, { - "__id__": 679 + "__id__": 701 } ], "_prefab": { - "__id__": 681 + "__id__": 703 }, "_lpos": { "__type__": "cc.Vec3", @@ -13864,11 +14385,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 676 + "__id__": 698 }, "_enabled": true, "__prefab": { - "__id__": 678 + "__id__": 700 }, "_contentSize": { "__type__": "cc.Size", @@ -13892,11 +14413,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 676 + "__id__": 698 }, "_enabled": true, "__prefab": { - "__id__": 680 + "__id__": 702 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13950,11 +14471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 663 + "__id__": 685 }, "_enabled": true, "__prefab": { - "__id__": 683 + "__id__": 705 }, "_contentSize": { "__type__": "cc.Size", @@ -13991,11 +14512,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 616 + "__id__": 638 }, "_enabled": true, "__prefab": { - "__id__": 686 + "__id__": 708 }, "_contentSize": { "__type__": "cc.Size", @@ -14019,11 +14540,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 616 + "__id__": 638 }, "_enabled": true, "__prefab": { - "__id__": 688 + "__id__": 710 }, "_alignFlags": 44, "_target": null, @@ -14055,11 +14576,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 616 + "__id__": 638 }, "_enabled": true, "__prefab": { - "__id__": 690 + "__id__": 712 }, "_resizeMode": 1, "_layoutType": 1, @@ -14106,11 +14627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 693 + "__id__": 715 }, "_contentSize": { "__type__": "cc.Size", @@ -14134,11 +14655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 695 + "__id__": 717 }, "_alignFlags": 21, "_target": null, @@ -14170,11 +14691,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 563 + "__id__": 585 }, "_enabled": true, "__prefab": { - "__id__": 697 + "__id__": 719 }, "_id": "" }, @@ -14202,14 +14723,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 700 + "__id__": 722 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 699 + "__id__": 721 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -14217,7 +14738,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 701 + "__id__": 723 }, "targetOverrides": null }, @@ -14231,19 +14752,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 702 + "__id__": 724 }, { - "__id__": 704 + "__id__": 726 }, { - "__id__": 705 + "__id__": 727 }, { - "__id__": 706 + "__id__": 728 }, { - "__id__": 707 + "__id__": 729 } ], "removedComponents": [] @@ -14251,7 +14772,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 725 }, "propertyPath": [ "_name" @@ -14267,7 +14788,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 725 }, "propertyPath": [ "_lpos" @@ -14282,7 +14803,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 725 }, "propertyPath": [ "_lrot" @@ -14298,7 +14819,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 725 }, "propertyPath": [ "_euler" @@ -14313,7 +14834,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 725 }, "propertyPath": [ "_active" @@ -14330,23 +14851,23 @@ }, "_children": [ { - "__id__": 709 + "__id__": 731 } ], "_active": true, "_components": [ { - "__id__": 747 + "__id__": 769 }, { - "__id__": 749 + "__id__": 771 }, { - "__id__": 751 + "__id__": 773 } ], "_prefab": { - "__id__": 753 + "__id__": 775 }, "_lpos": { "__type__": "cc.Vec3", @@ -14383,30 +14904,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 708 + "__id__": 730 }, "_children": [ { - "__id__": 710 + "__id__": 732 } ], "_active": true, "_components": [ { - "__id__": 738 + "__id__": 760 }, { - "__id__": 740 + "__id__": 762 }, { - "__id__": 742 + "__id__": 764 }, { - "__id__": 744 + "__id__": 766 } ], "_prefab": { - "__id__": 746 + "__id__": 768 }, "_lpos": { "__type__": "cc.Vec3", @@ -14443,27 +14964,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 709 + "__id__": 731 }, "_children": [ { - "__id__": 711 + "__id__": 733 }, { - "__id__": 719 + "__id__": 741 }, { - "__id__": 725 + "__id__": 747 } ], "_active": true, "_components": [ { - "__id__": 735 + "__id__": 757 } ], "_prefab": { - "__id__": 737 + "__id__": 759 }, "_lpos": { "__type__": "cc.Vec3", @@ -14500,23 +15021,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 710 + "__id__": 732 }, "_children": [], "_active": true, "_components": [ { - "__id__": 712 + "__id__": 734 }, { - "__id__": 714 + "__id__": 736 }, { - "__id__": 716 + "__id__": 738 } ], "_prefab": { - "__id__": 718 + "__id__": 740 }, "_lpos": { "__type__": "cc.Vec3", @@ -14553,11 +15074,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 733 }, "_enabled": true, "__prefab": { - "__id__": 713 + "__id__": 735 }, "_contentSize": { "__type__": "cc.Size", @@ -14581,11 +15102,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 733 }, "_enabled": true, "__prefab": { - "__id__": 715 + "__id__": 737 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14629,11 +15150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 711 + "__id__": 733 }, "_enabled": true, "__prefab": { - "__id__": 717 + "__id__": 739 }, "_alignFlags": 40, "_target": null, @@ -14678,20 +15199,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 710 + "__id__": 732 }, "_children": [], "_active": true, "_components": [ { - "__id__": 720 + "__id__": 742 }, { - "__id__": 722 + "__id__": 744 } ], "_prefab": { - "__id__": 724 + "__id__": 746 }, "_lpos": { "__type__": "cc.Vec3", @@ -14728,11 +15249,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 719 + "__id__": 741 }, "_enabled": true, "__prefab": { - "__id__": 721 + "__id__": 743 }, "_contentSize": { "__type__": "cc.Size", @@ -14756,11 +15277,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 719 + "__id__": 741 }, "_enabled": true, "__prefab": { - "__id__": 723 + "__id__": 745 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14817,26 +15338,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 710 + "__id__": 732 }, "_children": [], "_active": true, "_components": [ { - "__id__": 726 + "__id__": 748 }, { - "__id__": 728 + "__id__": 750 }, { - "__id__": 730 + "__id__": 752 }, { - "__id__": 732 + "__id__": 754 } ], "_prefab": { - "__id__": 734 + "__id__": 756 }, "_lpos": { "__type__": "cc.Vec3", @@ -14873,11 +15394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 725 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 727 + "__id__": 749 }, "_contentSize": { "__type__": "cc.Size", @@ -14901,11 +15422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 725 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 729 + "__id__": 751 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14969,11 +15490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 725 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 731 + "__id__": 753 }, "_alignFlags": 10, "_target": null, @@ -15005,11 +15526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 725 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 733 + "__id__": 755 }, "templateMode": true, "watchPath": "data.data.gold", @@ -15042,11 +15563,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 710 + "__id__": 732 }, "_enabled": true, "__prefab": { - "__id__": 736 + "__id__": 758 }, "_contentSize": { "__type__": "cc.Size", @@ -15083,11 +15604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 709 + "__id__": 731 }, "_enabled": true, "__prefab": { - "__id__": 739 + "__id__": 761 }, "_contentSize": { "__type__": "cc.Size", @@ -15111,11 +15632,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 709 + "__id__": 731 }, "_enabled": true, "__prefab": { - "__id__": 741 + "__id__": 763 }, "_alignFlags": 8, "_target": null, @@ -15147,11 +15668,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 709 + "__id__": 731 }, "_enabled": true, "__prefab": { - "__id__": 743 + "__id__": 765 }, "_resizeMode": 0, "_layoutType": 1, @@ -15185,11 +15706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 709 + "__id__": 731 }, "_enabled": true, "__prefab": { - "__id__": 745 + "__id__": 767 }, "_alignFlags": 40, "_target": null, @@ -15234,11 +15755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 708 + "__id__": 730 }, "_enabled": true, "__prefab": { - "__id__": 748 + "__id__": 770 }, "_contentSize": { "__type__": "cc.Size", @@ -15262,11 +15783,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 708 + "__id__": 730 }, "_enabled": true, "__prefab": { - "__id__": 750 + "__id__": 772 }, "_alignFlags": 17, "_target": null, @@ -15298,11 +15819,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 708 + "__id__": 730 }, "_enabled": true, "__prefab": { - "__id__": 752 + "__id__": 774 }, "_id": "" }, @@ -15333,7 +15854,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 755 + "__id__": 777 }, "_contentSize": { "__type__": "cc.Size", @@ -15361,7 +15882,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 757 + "__id__": 779 }, "_alignFlags": 45, "_target": null, @@ -15397,7 +15918,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 759 + "__id__": 781 }, "debugMode": false, "_id": "" @@ -15419,13 +15940,13 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 699 + "__id__": 721 }, { - "__id__": 580 + "__id__": 602 }, { - "__id__": 528 + "__id__": 550 }, { "__id__": 329 diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index e4aa8a97..41180e94 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -3,7 +3,7 @@ import { _decorator, instantiate, Label, Node, NodeEventType, Prefab, SpriteAtla 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, CardInitCoins, CardsUpSet, getCardsByLv } from "../common/config/CardSet"; +import { CARD_POOL_INIT_LEVEL, CARD_POOL_MAX_LEVEL, CardConfig, CardsUpSet, getCardsByLv } from "../common/config/CardSet"; import { CardComp } from "./CardComp"; import { oops } from "db://oops-framework/core/Oops"; import { HeroAttrsComp } from "../hero/HeroAttrsComp"; @@ -25,6 +25,10 @@ export class MissionCardComp extends CCComp { /** 四个插卡槽位(固定顺序分发:1~4) */ @property(Node) cards_node:Node = null! + @property({ tooltip: "战斗阶段卡牌面板下移隐藏距离" }) + cardsBattleHideOffsetY: number = 1280; + @property({ tooltip: "卡牌面板位移动画时长" }) + cardsPanelMoveDuration: number = 0.2; @property(Node) card1:Node = null! @property(Node) @@ -55,6 +59,9 @@ export class MissionCardComp extends CCComp { private poolLv: number = CARD_POOL_INIT_LEVEL; private readonly heroInfoItemGap: number = 86; private heroInfoSyncTimer: number = 0; + private cardsShowPos: Vec3 = new Vec3(); + private cardsHidePos: Vec3 = new Vec3(); + private cardsPosReady: boolean = false; private heroInfoItems: Map 0); + return; + } const v = typeof args === 'number' ? args : (args?.delta ?? args?.value ?? 0); if (v === 0) return; this.setMissionCoin(this.getMissionCoin() + v); this.updatePoolLvUI(); this.playCoinChangeAnim(v > 0); } + + private onFightStart() { + this.enterBattlePhase(); + } /** 解除按钮监听,避免节点销毁后回调泄漏 */ private unbindEvents() { @@ -271,6 +290,34 @@ export class MissionCardComp extends CCComp { }); } + private initCardsPanelPos() { + if (!this.cards_node || !this.cards_node.isValid || this.cardsPosReady) return; + const pos = this.cards_node.position; + this.cardsShowPos = new Vec3(pos.x, pos.y, pos.z); + this.cardsHidePos = new Vec3(pos.x, pos.y - Math.abs(this.cardsBattleHideOffsetY), pos.z); + this.cardsPosReady = true; + } + + private enterPreparePhase() { + if (!this.cards_node || !this.cards_node.isValid) return; + this.initCardsPanelPos(); + this.cards_node.active = true; + Tween.stopAllByTarget(this.cards_node); + this.cards_node.setPosition(this.cardsShowPos); + } + + private enterBattlePhase() { + if (!this.cards_node || !this.cards_node.isValid) return; + this.initCardsPanelPos(); + this.cards_node.active = true; + Tween.stopAllByTarget(this.cards_node); + tween(this.cards_node) + .to(this.cardsPanelMoveDuration, { + position: this.cardsHidePos + }) + .start(); + } + /** 构建本次抽卡结果,保证最终可分发4条数据 */ private buildDrawCards(): CardConfig[] { const cards = getCardsByLv(this.poolLv); diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index 654f6d07..c5792319 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -1,4 +1,4 @@ -import { _decorator, Vec3,Animation, instantiate, Prefab, Node, ProgressBar, Label } from "cc"; +import { _decorator, Vec3,Animation, instantiate, Prefab, Node, NodeEventType, ProgressBar, Label } 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 { smc } from "../common/SingletonModuleComp"; @@ -30,11 +30,19 @@ export class MissionComp extends CCComp { private maxMonsterCount: number = 5; @property({ tooltip: "恢复刷怪阈值" }) private resumeMonsterCount: number = 3; - + @property({ tooltip: "准备阶段基础金币奖励" }) + private prepareBaseCoinReward: number = 10; + @property({ tooltip: "每波准备阶段额外金币" }) + private prepareCoinWaveGrow: number = 1; + @property({ tooltip: "准备阶段金币奖励上限" }) + private prepareCoinRewardCap: number = 20; + // VictoryComp:any = null; // reward:number = 0; // reward_num:number = 0; @property(Node) + start_btn:Node = null! + @property(Node) time_node:Node = null! FightTime:number = FightSet.FiIGHT_TIME @@ -61,6 +69,7 @@ export class MissionComp extends CCComp { private heapTrendBaseMB: number = -1; private monsterCountSyncTimer: number = 0; private currentWave: number = 0; + private lastPrepareCoinWave: number = 0; private readonly heroViewMatcher = ecs.allOf(HeroViewComp); private readonly skillViewMatcher = ecs.allOf(SkillView); private readonly heroAttrsMatcher = ecs.allOf(HeroAttrsComp); @@ -75,8 +84,12 @@ export class MissionComp extends CCComp { this.on(GameEvent.MissionEnd,this.mission_end,this) this.on(GameEvent.NewWave,this.onNewWave,this) this.on(GameEvent.DO_AD_BACK,this.do_ad,this) + this.start_btn?.on(NodeEventType.TOUCH_END, this.onStartFightBtnClick, this) this.removeMemoryPanel() } + onDestroy(){ + this.start_btn?.off(NodeEventType.TOUCH_END, this.onStartFightBtnClick, this) + } protected update(dt: number): void { if(!smc.mission.play) return if(smc.mission.pause) return @@ -131,22 +144,35 @@ export class MissionComp extends CCComp { this.node.active=true this.data_init() oops.message.dispatchEvent(GameEvent.FightReady) + this.enterPreparePhase() let loading=this.node.parent.getChildByName("loading") loading.active=true this.scheduleOnce(()=>{ loading.active=false },0.5) - this.scheduleOnce(()=>{ - this.to_fight() - },0.1) } to_fight(){ + smc.mission.stop_spawn_mon = false; smc.mission.in_fight=true + if (this.start_btn && this.start_btn.isValid) this.start_btn.active = false; oops.message.dispatchEvent(GameEvent.FightStart) //GameSetMonComp 监听刷怪 } + private enterPreparePhase() { + smc.mission.in_fight = false; + smc.mission.stop_spawn_mon = true; + if (this.start_btn && this.start_btn.isValid) this.start_btn.active = true; + } + + private onStartFightBtnClick() { + if (!smc.mission.play) return; + if (smc.mission.pause) return; + if (smc.mission.in_fight) return; + this.to_fight(); + } + open_Victory(e:any,is_hero_dead: boolean = false){ // 暂停游戏循环和怪物行为 @@ -181,14 +207,13 @@ export class MissionComp extends CCComp { smc.mission.play=false smc.mission.pause = false; smc.mission.in_fight = false; + if (this.start_btn && this.start_btn.isValid) this.start_btn.active = false; this.cleanComponents() this.clearBattlePools() this.node.active=false } data_init(){ - // 重置金币为初始值 (如果需要保留金币,请注释掉此行) - smc.vmdata.gold = 0; //局内数据初始化 smc 数据初始化 smc.mission.play = true; smc.mission.pause = false; @@ -215,6 +240,8 @@ export class MissionComp extends CCComp { this.heapTrendTimer = 0; this.heapTrendBaseMB = -1; this.monsterCountSyncTimer = 0; + this.lastPrepareCoinWave = 0; + smc.vmdata.mission_data.coin = 0; // 重置全局属性加成和主角引用 (确保新一局数据干净) // smc.role = null; @@ -229,10 +256,28 @@ export class MissionComp extends CCComp { if (wave <= 0) return; this.currentWave = wave; smc.vmdata.mission_data.level = wave; + this.grantPrepareCoinByWave(wave); this.lastTimeSecond = -1; this.update_time(); } + private grantPrepareCoinByWave(wave: number) { + if (wave <= 0) return; + if (wave <= this.lastPrepareCoinWave) return; + const base = Math.max(0, Math.floor(this.prepareBaseCoinReward)); + const grow = Math.max(0, Math.floor(this.prepareCoinWaveGrow)); + const cap = Math.max(0, Math.floor(this.prepareCoinRewardCap)); + const reward = Math.min(cap, base + (wave - 1) * grow); + if (reward <= 0) { + this.lastPrepareCoinWave = wave; + return; + } + smc.vmdata.mission_data.coin = Math.max(0, Math.floor((smc.vmdata.mission_data.coin ?? 0) + reward)); + this.lastPrepareCoinWave = wave; + oops.message.dispatchEvent(GameEvent.CoinAdd, { delta: reward, syncOnly: true }); + mLogger.log(this.debugMode, 'MissionComp', "prepare coin reward", { wave, reward, coin: smc.vmdata.mission_data.coin }); + } + private getMonsterThresholds(): { max: number; resume: number } { const max = Math.max(1, Math.floor(this.maxMonsterCount)); const resume = Math.min(max - 1, Math.max(0, Math.floor(this.resumeMonsterCount)));