diff --git a/assets/resources/gui/element/mission.prefab b/assets/resources/gui/element/mission.prefab index 2d3c6932..aada8e79 100644 --- a/assets/resources/gui/element/mission.prefab +++ b/assets/resources/gui/element/mission.prefab @@ -34,56 +34,56 @@ "__id__": 361 }, { - "__id__": 733 + "__id__": 734 }, { - "__id__": 773 + "__id__": 774 }, { - "__id__": 860 + "__id__": 861 }, { - "__id__": 979 + "__id__": 980 }, { - "__id__": 1068 + "__id__": 1069 }, { - "__id__": 1155 + "__id__": 1156 }, { - "__id__": 1185 + "__id__": 1186 } ], "_active": true, "_components": [ { - "__id__": 1229 + "__id__": 1230 }, { - "__id__": 1231 + "__id__": 1232 }, { - "__id__": 1233 + "__id__": 1234 }, { - "__id__": 1235 + "__id__": 1236 }, { - "__id__": 1237 + "__id__": 1238 }, { - "__id__": 1239 + "__id__": 1240 }, { - "__id__": 1241 + "__id__": 1242 }, { - "__id__": 1243 + "__id__": 1244 } ], "_prefab": { - "__id__": 1245 + "__id__": 1246 }, "_lpos": { "__type__": "cc.Vec3", @@ -6871,26 +6871,26 @@ "__id__": 455 }, { - "__id__": 547 + "__id__": 548 }, { - "__id__": 635 + "__id__": 636 } ], "_active": true, "_components": [ { - "__id__": 726 + "__id__": 727 }, { - "__id__": 728 + "__id__": 729 }, { - "__id__": 730 + "__id__": 731 } ], "_prefab": { - "__id__": 732 + "__id__": 733 }, "_lpos": { "__type__": "cc.Vec3", @@ -8204,7 +8204,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": -90, + "x": 0, "y": 0, "z": 0 } @@ -8652,6 +8652,9 @@ }, { "__id__": 545 + }, + { + "__id__": 547 } ], "removedComponents": [] @@ -10156,6 +10159,16 @@ "58xYEIMtdG64TYb0cR8Dqn" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 514 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -10163,14 +10176,14 @@ "__id__": 361 }, "_prefab": { - "__id__": 548 + "__id__": 549 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 547 + "__id__": 548 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -10178,7 +10191,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 549 + "__id__": 550 }, "targetOverrides": null }, @@ -10190,23 +10203,20 @@ }, "mountedChildren": [ { - "__id__": 550 + "__id__": 551 }, { - "__id__": 590 + "__id__": 591 } ], "mountedComponents": [ { - "__id__": 601 + "__id__": 602 } ], "propertyOverrides": [ { - "__id__": 605 - }, - { - "__id__": 607 + "__id__": 606 }, { "__id__": 608 @@ -10218,37 +10228,37 @@ "__id__": 610 }, { - "__id__": 612 + "__id__": 611 }, { - "__id__": 614 + "__id__": 613 }, { - "__id__": 616 + "__id__": 615 }, { - "__id__": 618 + "__id__": 617 }, { "__id__": 619 }, { - "__id__": 621 + "__id__": 620 }, { "__id__": 622 }, { - "__id__": 624 + "__id__": 623 }, { - "__id__": 626 + "__id__": 625 }, { - "__id__": 628 + "__id__": 627 }, { - "__id__": 630 + "__id__": 629 }, { "__id__": 631 @@ -10261,6 +10271,9 @@ }, { "__id__": 634 + }, + { + "__id__": 635 } ], "removedComponents": [] @@ -10268,11 +10281,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 551 + "__id__": 552 }, "nodes": [ { - "__id__": 552 + "__id__": 553 } ] }, @@ -10288,31 +10301,31 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 547 + "__id__": 548 } }, "_parent": { - "__id__": 553 + "__id__": 554 }, "_children": [ { - "__id__": 573 + "__id__": 574 }, { - "__id__": 579 + "__id__": 580 } ], "_active": true, "_components": [ { - "__id__": 585 + "__id__": 586 }, { - "__id__": 587 + "__id__": 588 } ], "_prefab": { - "__id__": 589 + "__id__": 590 }, "_lpos": { "__type__": "cc.Vec3", @@ -10349,30 +10362,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 547 + "__id__": 548 }, "_children": [ { - "__id__": 554 + "__id__": 555 }, { - "__id__": 552 + "__id__": 553 } ], "_active": true, "_components": [ { - "__id__": 566 + "__id__": 567 }, { - "__id__": 568 + "__id__": 569 }, { - "__id__": 570 + "__id__": 571 } ], "_prefab": { - "__id__": 572 + "__id__": 573 }, "_lpos": { "__type__": "cc.Vec3", @@ -10409,24 +10422,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 553 + "__id__": 554 }, "_children": [ { - "__id__": 555 + "__id__": 556 } ], "_active": true, "_components": [ { - "__id__": 561 + "__id__": 562 }, { - "__id__": 563 + "__id__": 564 } ], "_prefab": { - "__id__": 565 + "__id__": 566 }, "_lpos": { "__type__": "cc.Vec3", @@ -10463,20 +10476,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 554 + "__id__": 555 }, "_children": [], "_active": true, "_components": [ { - "__id__": 556 + "__id__": 557 }, { - "__id__": 558 + "__id__": 559 } ], "_prefab": { - "__id__": 560 + "__id__": 561 }, "_lpos": { "__type__": "cc.Vec3", @@ -10513,11 +10526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 555 + "__id__": 556 }, "_enabled": true, "__prefab": { - "__id__": 557 + "__id__": 558 }, "_contentSize": { "__type__": "cc.Size", @@ -10541,11 +10554,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 555 + "__id__": 556 }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 560 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10622,11 +10635,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 554 + "__id__": 555 }, "_enabled": true, "__prefab": { - "__id__": 562 + "__id__": 563 }, "_contentSize": { "__type__": "cc.Size", @@ -10650,11 +10663,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 554 + "__id__": 555 }, "_enabled": true, "__prefab": { - "__id__": 564 + "__id__": 565 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10711,11 +10724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 553 + "__id__": 554 }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 568 }, "_contentSize": { "__type__": "cc.Size", @@ -10739,11 +10752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 553 + "__id__": 554 }, "_enabled": true, "__prefab": { - "__id__": 569 + "__id__": 570 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10787,11 +10800,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 553 + "__id__": 554 }, "_enabled": true, "__prefab": { - "__id__": 571 + "__id__": 572 }, "_alignFlags": 45, "_target": null, @@ -10836,20 +10849,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 552 + "__id__": 553 }, "_children": [], "_active": true, "_components": [ { - "__id__": 574 + "__id__": 575 }, { - "__id__": 576 + "__id__": 577 } ], "_prefab": { - "__id__": 578 + "__id__": 579 }, "_lpos": { "__type__": "cc.Vec3", @@ -10886,11 +10899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 573 + "__id__": 574 }, "_enabled": true, "__prefab": { - "__id__": 575 + "__id__": 576 }, "_contentSize": { "__type__": "cc.Size", @@ -10914,11 +10927,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 573 + "__id__": 574 }, "_enabled": true, "__prefab": { - "__id__": 577 + "__id__": 578 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10972,20 +10985,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 552 + "__id__": 553 }, "_children": [], "_active": true, "_components": [ { - "__id__": 580 + "__id__": 581 }, { - "__id__": 582 + "__id__": 583 } ], "_prefab": { - "__id__": 584 + "__id__": 585 }, "_lpos": { "__type__": "cc.Vec3", @@ -11022,11 +11035,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 579 + "__id__": 580 }, "_enabled": true, "__prefab": { - "__id__": 581 + "__id__": 582 }, "_contentSize": { "__type__": "cc.Size", @@ -11050,11 +11063,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 579 + "__id__": 580 }, "_enabled": true, "__prefab": { - "__id__": 583 + "__id__": 584 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11131,11 +11144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 552 + "__id__": 553 }, "_enabled": true, "__prefab": { - "__id__": 586 + "__id__": 587 }, "_contentSize": { "__type__": "cc.Size", @@ -11159,11 +11172,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 552 + "__id__": 553 }, "_enabled": false, "__prefab": { - "__id__": 588 + "__id__": 589 }, "_resizeMode": 1, "_layoutType": 1, @@ -11207,11 +11220,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 591 + "__id__": 592 }, "nodes": [ { - "__id__": 592 + "__id__": 593 } ] }, @@ -11225,21 +11238,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 547 + "__id__": 548 }, "_prefab": { - "__id__": 593 + "__id__": 594 }, "__editorExtras__": { "mountedRoot": { - "__id__": 547 + "__id__": 548 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 592 + "__id__": 593 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -11247,7 +11260,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 594 + "__id__": 595 }, "targetOverrides": null }, @@ -11261,10 +11274,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 595 - }, - { - "__id__": 597 + "__id__": 596 }, { "__id__": 598 @@ -11274,6 +11284,9 @@ }, { "__id__": 600 + }, + { + "__id__": 601 } ], "removedComponents": [] @@ -11281,7 +11294,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 596 + "__id__": 597 }, "propertyPath": [ "_name" @@ -11297,7 +11310,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 596 + "__id__": 597 }, "propertyPath": [ "_lpos" @@ -11312,7 +11325,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 596 + "__id__": 597 }, "propertyPath": [ "_lrot" @@ -11328,7 +11341,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 596 + "__id__": 597 }, "propertyPath": [ "_euler" @@ -11343,7 +11356,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 596 + "__id__": 597 }, "propertyPath": [ "_active" @@ -11353,11 +11366,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 602 + "__id__": 603 }, "components": [ { - "__id__": 603 + "__id__": 604 } ] }, @@ -11373,15 +11386,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 547 + "__id__": 548 } }, "node": { - "__id__": 547 + "__id__": 548 }, "_enabled": true, "__prefab": { - "__id__": 604 + "__id__": 605 }, "_alignFlags": 4, "_target": null, @@ -11410,7 +11423,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 606 + "__id__": 607 }, "propertyPath": [ "_name" @@ -11426,7 +11439,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 606 + "__id__": 607 }, "propertyPath": [ "_lpos" @@ -11441,7 +11454,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 606 + "__id__": 607 }, "propertyPath": [ "_lrot" @@ -11457,7 +11470,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 606 + "__id__": 607 }, "propertyPath": [ "_euler" @@ -11472,7 +11485,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 611 + "__id__": 612 }, "propertyPath": [ "_contentSize" @@ -11492,7 +11505,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 613 + "__id__": 614 }, "propertyPath": [ "_contentSize" @@ -11512,7 +11525,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 615 + "__id__": 616 }, "propertyPath": [ "_contentSize" @@ -11532,7 +11545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 617 + "__id__": 618 }, "propertyPath": [ "_spriteFrame" @@ -11551,7 +11564,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 617 + "__id__": 618 }, "propertyPath": [ "_atlas" @@ -11564,7 +11577,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 620 + "__id__": 621 }, "propertyPath": [ "_string" @@ -11580,7 +11593,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 611 + "__id__": 612 }, "propertyPath": [ "_anchorPoint" @@ -11594,7 +11607,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 623 + "__id__": 624 }, "propertyPath": [ "_lpos" @@ -11615,7 +11628,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 625 + "__id__": 626 }, "propertyPath": [ "_lpos" @@ -11636,7 +11649,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 628 }, "propertyPath": [ "_lpos" @@ -11657,7 +11670,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 630 }, "propertyPath": [ "_left" @@ -11673,7 +11686,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 630 }, "propertyPath": [ "_right" @@ -11683,7 +11696,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 630 }, "propertyPath": [ "_top" @@ -11693,7 +11706,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 629 + "__id__": 630 }, "propertyPath": [ "_bottom" @@ -11703,7 +11716,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 606 + "__id__": 607 }, "propertyPath": [ "_active" @@ -11713,7 +11726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 627 + "__id__": 628 }, "propertyPath": [ "_lscale" @@ -11732,14 +11745,14 @@ "__id__": 361 }, "_prefab": { - "__id__": 636 + "__id__": 637 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 635 + "__id__": 636 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -11747,7 +11760,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 637 + "__id__": 638 }, "targetOverrides": null }, @@ -11759,23 +11772,20 @@ }, "mountedChildren": [ { - "__id__": 638 + "__id__": 639 }, { - "__id__": 678 + "__id__": 679 } ], "mountedComponents": [ { - "__id__": 689 + "__id__": 690 } ], "propertyOverrides": [ { - "__id__": 693 - }, - { - "__id__": 695 + "__id__": 694 }, { "__id__": 696 @@ -11787,43 +11797,43 @@ "__id__": 698 }, { - "__id__": 700 + "__id__": 699 }, { - "__id__": 702 + "__id__": 701 }, { - "__id__": 704 + "__id__": 703 }, { - "__id__": 706 + "__id__": 705 }, { "__id__": 707 }, { - "__id__": 709 + "__id__": 708 }, { - "__id__": 711 + "__id__": 710 }, { "__id__": 712 }, { - "__id__": 714 + "__id__": 713 }, { - "__id__": 716 + "__id__": 715 }, { - "__id__": 718 + "__id__": 717 }, { "__id__": 719 }, { - "__id__": 721 + "__id__": 720 }, { "__id__": 722 @@ -11836,6 +11846,9 @@ }, { "__id__": 725 + }, + { + "__id__": 726 } ], "removedComponents": [] @@ -11843,11 +11856,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 639 + "__id__": 640 }, "nodes": [ { - "__id__": 640 + "__id__": 641 } ] }, @@ -11863,31 +11876,31 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 635 + "__id__": 636 } }, "_parent": { - "__id__": 641 + "__id__": 642 }, "_children": [ { - "__id__": 661 + "__id__": 662 }, { - "__id__": 667 + "__id__": 668 } ], "_active": true, "_components": [ { - "__id__": 673 + "__id__": 674 }, { - "__id__": 675 + "__id__": 676 } ], "_prefab": { - "__id__": 677 + "__id__": 678 }, "_lpos": { "__type__": "cc.Vec3", @@ -11924,30 +11937,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 635 + "__id__": 636 }, "_children": [ { - "__id__": 642 + "__id__": 643 }, { - "__id__": 640 + "__id__": 641 } ], "_active": true, "_components": [ { - "__id__": 654 + "__id__": 655 }, { - "__id__": 656 + "__id__": 657 }, { - "__id__": 658 + "__id__": 659 } ], "_prefab": { - "__id__": 660 + "__id__": 661 }, "_lpos": { "__type__": "cc.Vec3", @@ -11984,24 +11997,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 641 + "__id__": 642 }, "_children": [ { - "__id__": 643 + "__id__": 644 } ], "_active": true, "_components": [ { - "__id__": 649 + "__id__": 650 }, { - "__id__": 651 + "__id__": 652 } ], "_prefab": { - "__id__": 653 + "__id__": 654 }, "_lpos": { "__type__": "cc.Vec3", @@ -12038,20 +12051,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 642 + "__id__": 643 }, "_children": [], "_active": true, "_components": [ { - "__id__": 644 + "__id__": 645 }, { - "__id__": 646 + "__id__": 647 } ], "_prefab": { - "__id__": 648 + "__id__": 649 }, "_lpos": { "__type__": "cc.Vec3", @@ -12088,11 +12101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 643 + "__id__": 644 }, "_enabled": true, "__prefab": { - "__id__": 645 + "__id__": 646 }, "_contentSize": { "__type__": "cc.Size", @@ -12116,11 +12129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 643 + "__id__": 644 }, "_enabled": true, "__prefab": { - "__id__": 647 + "__id__": 648 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12197,11 +12210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 642 + "__id__": 643 }, "_enabled": true, "__prefab": { - "__id__": 650 + "__id__": 651 }, "_contentSize": { "__type__": "cc.Size", @@ -12225,11 +12238,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 642 + "__id__": 643 }, "_enabled": true, "__prefab": { - "__id__": 652 + "__id__": 653 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12286,11 +12299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 641 + "__id__": 642 }, "_enabled": true, "__prefab": { - "__id__": 655 + "__id__": 656 }, "_contentSize": { "__type__": "cc.Size", @@ -12314,11 +12327,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 641 + "__id__": 642 }, "_enabled": true, "__prefab": { - "__id__": 657 + "__id__": 658 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12362,11 +12375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 641 + "__id__": 642 }, "_enabled": true, "__prefab": { - "__id__": 659 + "__id__": 660 }, "_alignFlags": 45, "_target": null, @@ -12411,20 +12424,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 640 + "__id__": 641 }, "_children": [], "_active": true, "_components": [ { - "__id__": 662 + "__id__": 663 }, { - "__id__": 664 + "__id__": 665 } ], "_prefab": { - "__id__": 666 + "__id__": 667 }, "_lpos": { "__type__": "cc.Vec3", @@ -12461,11 +12474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 661 + "__id__": 662 }, "_enabled": true, "__prefab": { - "__id__": 663 + "__id__": 664 }, "_contentSize": { "__type__": "cc.Size", @@ -12489,11 +12502,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 661 + "__id__": 662 }, "_enabled": true, "__prefab": { - "__id__": 665 + "__id__": 666 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12547,20 +12560,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 640 + "__id__": 641 }, "_children": [], "_active": true, "_components": [ { - "__id__": 668 + "__id__": 669 }, { - "__id__": 670 + "__id__": 671 } ], "_prefab": { - "__id__": 672 + "__id__": 673 }, "_lpos": { "__type__": "cc.Vec3", @@ -12597,11 +12610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 669 + "__id__": 670 }, "_contentSize": { "__type__": "cc.Size", @@ -12625,11 +12638,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 667 + "__id__": 668 }, "_enabled": true, "__prefab": { - "__id__": 671 + "__id__": 672 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12706,11 +12719,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 640 + "__id__": 641 }, "_enabled": true, "__prefab": { - "__id__": 674 + "__id__": 675 }, "_contentSize": { "__type__": "cc.Size", @@ -12734,11 +12747,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 640 + "__id__": 641 }, "_enabled": false, "__prefab": { - "__id__": 676 + "__id__": 677 }, "_resizeMode": 1, "_layoutType": 1, @@ -12782,11 +12795,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 679 + "__id__": 680 }, "nodes": [ { - "__id__": 680 + "__id__": 681 } ] }, @@ -12800,21 +12813,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 635 + "__id__": 636 }, "_prefab": { - "__id__": 681 + "__id__": 682 }, "__editorExtras__": { "mountedRoot": { - "__id__": 635 + "__id__": 636 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 680 + "__id__": 681 }, "asset": { "__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a", @@ -12822,7 +12835,7 @@ }, "fileId": "d3jYvT7whFS5scQFZeO5AK", "instance": { - "__id__": 682 + "__id__": 683 }, "targetOverrides": null }, @@ -12836,10 +12849,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 683 - }, - { - "__id__": 685 + "__id__": 684 }, { "__id__": 686 @@ -12849,6 +12859,9 @@ }, { "__id__": 688 + }, + { + "__id__": 689 } ], "removedComponents": [] @@ -12856,7 +12869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 684 + "__id__": 685 }, "propertyPath": [ "_name" @@ -12872,7 +12885,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 684 + "__id__": 685 }, "propertyPath": [ "_lpos" @@ -12887,7 +12900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 684 + "__id__": 685 }, "propertyPath": [ "_lrot" @@ -12903,7 +12916,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 684 + "__id__": 685 }, "propertyPath": [ "_euler" @@ -12918,7 +12931,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 684 + "__id__": 685 }, "propertyPath": [ "_active" @@ -12928,11 +12941,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 690 + "__id__": 691 }, "components": [ { - "__id__": 691 + "__id__": 692 } ] }, @@ -12948,15 +12961,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 635 + "__id__": 636 } }, "node": { - "__id__": 635 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 692 + "__id__": 693 }, "_alignFlags": 4, "_target": null, @@ -12985,7 +12998,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 694 + "__id__": 695 }, "propertyPath": [ "_name" @@ -13001,7 +13014,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 694 + "__id__": 695 }, "propertyPath": [ "_lpos" @@ -13016,7 +13029,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 694 + "__id__": 695 }, "propertyPath": [ "_lrot" @@ -13032,7 +13045,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 694 + "__id__": 695 }, "propertyPath": [ "_euler" @@ -13047,7 +13060,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 699 + "__id__": 700 }, "propertyPath": [ "_contentSize" @@ -13067,7 +13080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 701 + "__id__": 702 }, "propertyPath": [ "_contentSize" @@ -13087,7 +13100,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 703 + "__id__": 704 }, "propertyPath": [ "_contentSize" @@ -13107,7 +13120,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 705 + "__id__": 706 }, "propertyPath": [ "_spriteFrame" @@ -13126,7 +13139,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 705 + "__id__": 706 }, "propertyPath": [ "_atlas" @@ -13139,7 +13152,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 708 + "__id__": 709 }, "propertyPath": [ "_string" @@ -13155,7 +13168,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 710 + "__id__": 711 }, "propertyPath": [ "_contentSize" @@ -13175,7 +13188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 699 + "__id__": 700 }, "propertyPath": [ "_anchorPoint" @@ -13189,7 +13202,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 713 + "__id__": 714 }, "propertyPath": [ "_lpos" @@ -13210,7 +13223,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 715 + "__id__": 716 }, "propertyPath": [ "_lpos" @@ -13231,7 +13244,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 717 + "__id__": 718 }, "propertyPath": [ "_lpos" @@ -13252,7 +13265,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 694 + "__id__": 695 }, "propertyPath": [ "_active" @@ -13262,7 +13275,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 720 + "__id__": 721 }, "propertyPath": [ "_left" @@ -13278,7 +13291,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 720 + "__id__": 721 }, "propertyPath": [ "_right" @@ -13288,7 +13301,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 720 + "__id__": 721 }, "propertyPath": [ "_top" @@ -13298,7 +13311,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 720 + "__id__": 721 }, "propertyPath": [ "_bottom" @@ -13308,7 +13321,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 720 + "__id__": 721 }, "propertyPath": [ "_enabled" @@ -13318,7 +13331,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 717 + "__id__": 718 }, "propertyPath": [ "_lscale" @@ -13340,11 +13353,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 727 + "__id__": 728 }, "_contentSize": { "__type__": "cc.Size", - "width": 360, + "width": 180, "height": 150 }, "_anchorPoint": { @@ -13368,12 +13381,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 729 + "__id__": 730 }, "_alignFlags": 44, "_target": null, - "_left": 180, - "_right": 180, + "_left": 270, + "_right": 270, "_top": 0, "_bottom": 4.4210000000000065, "_horizontalCenter": 0, @@ -13404,7 +13417,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 731 + "__id__": 732 }, "_resizeMode": 1, "_layoutType": 1, @@ -13455,32 +13468,32 @@ }, "_children": [ { - "__id__": 734 + "__id__": 735 }, { - "__id__": 744 + "__id__": 745 }, { - "__id__": 754 + "__id__": 755 } ], "_active": false, "_components": [ { - "__id__": 764 + "__id__": 765 }, { - "__id__": 766 + "__id__": 767 }, { - "__id__": 768 + "__id__": 769 }, { - "__id__": 770 + "__id__": 771 } ], "_prefab": { - "__id__": 772 + "__id__": 773 }, "_lpos": { "__type__": "cc.Vec3", @@ -13517,21 +13530,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 733 + "__id__": 734 }, "_children": [ { - "__id__": 735 + "__id__": 736 } ], "_active": true, "_components": [ { - "__id__": 741 + "__id__": 742 } ], "_prefab": { - "__id__": 743 + "__id__": 744 }, "_lpos": { "__type__": "cc.Vec3", @@ -13568,20 +13581,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 734 + "__id__": 735 }, "_children": [], "_active": true, "_components": [ { - "__id__": 736 + "__id__": 737 }, { - "__id__": 738 + "__id__": 739 } ], "_prefab": { - "__id__": 740 + "__id__": 741 }, "_lpos": { "__type__": "cc.Vec3", @@ -13618,11 +13631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 735 + "__id__": 736 }, "_enabled": true, "__prefab": { - "__id__": 737 + "__id__": 738 }, "_contentSize": { "__type__": "cc.Size", @@ -13646,11 +13659,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 735 + "__id__": 736 }, "_enabled": true, "__prefab": { - "__id__": 739 + "__id__": 740 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13704,11 +13717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 734 + "__id__": 735 }, "_enabled": true, "__prefab": { - "__id__": 742 + "__id__": 743 }, "_contentSize": { "__type__": "cc.Size", @@ -13745,21 +13758,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 733 + "__id__": 734 }, "_children": [ { - "__id__": 745 + "__id__": 746 } ], "_active": true, "_components": [ { - "__id__": 751 + "__id__": 752 } ], "_prefab": { - "__id__": 753 + "__id__": 754 }, "_lpos": { "__type__": "cc.Vec3", @@ -13796,20 +13809,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 744 + "__id__": 745 }, "_children": [], "_active": true, "_components": [ { - "__id__": 746 + "__id__": 747 }, { - "__id__": 748 + "__id__": 749 } ], "_prefab": { - "__id__": 750 + "__id__": 751 }, "_lpos": { "__type__": "cc.Vec3", @@ -13846,11 +13859,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 745 + "__id__": 746 }, "_enabled": true, "__prefab": { - "__id__": 747 + "__id__": 748 }, "_contentSize": { "__type__": "cc.Size", @@ -13874,11 +13887,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 745 + "__id__": 746 }, "_enabled": true, "__prefab": { - "__id__": 749 + "__id__": 750 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13932,11 +13945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 744 + "__id__": 745 }, "_enabled": true, "__prefab": { - "__id__": 752 + "__id__": 753 }, "_contentSize": { "__type__": "cc.Size", @@ -13973,21 +13986,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 733 + "__id__": 734 }, "_children": [ { - "__id__": 755 + "__id__": 756 } ], "_active": true, "_components": [ { - "__id__": 761 + "__id__": 762 } ], "_prefab": { - "__id__": 763 + "__id__": 764 }, "_lpos": { "__type__": "cc.Vec3", @@ -14024,20 +14037,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 754 + "__id__": 755 }, "_children": [], "_active": true, "_components": [ { - "__id__": 756 + "__id__": 757 }, { - "__id__": 758 + "__id__": 759 } ], "_prefab": { - "__id__": 760 + "__id__": 761 }, "_lpos": { "__type__": "cc.Vec3", @@ -14074,11 +14087,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 755 + "__id__": 756 }, "_enabled": true, "__prefab": { - "__id__": 757 + "__id__": 758 }, "_contentSize": { "__type__": "cc.Size", @@ -14102,11 +14115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 755 + "__id__": 756 }, "_enabled": true, "__prefab": { - "__id__": 759 + "__id__": 760 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14160,11 +14173,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 754 + "__id__": 755 }, "_enabled": true, "__prefab": { - "__id__": 762 + "__id__": 763 }, "_contentSize": { "__type__": "cc.Size", @@ -14201,11 +14214,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 733 + "__id__": 734 }, "_enabled": true, "__prefab": { - "__id__": 765 + "__id__": 766 }, "_contentSize": { "__type__": "cc.Size", @@ -14229,11 +14242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 733 + "__id__": 734 }, "_enabled": true, "__prefab": { - "__id__": 767 + "__id__": 768 }, "_alignFlags": 44, "_target": null, @@ -14265,11 +14278,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 733 + "__id__": 734 }, "_enabled": true, "__prefab": { - "__id__": 769 + "__id__": 770 }, "_resizeMode": 0, "_layoutType": 1, @@ -14303,11 +14316,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 733 + "__id__": 734 }, "_enabled": true, "__prefab": { - "__id__": 771 + "__id__": 772 }, "_id": "" }, @@ -14338,35 +14351,35 @@ }, "_children": [ { - "__id__": 774 + "__id__": 775 }, { - "__id__": 782 + "__id__": 783 }, { - "__id__": 831 + "__id__": 832 }, { - "__id__": 839 + "__id__": 840 } ], "_active": false, "_components": [ { - "__id__": 851 + "__id__": 852 }, { - "__id__": 853 + "__id__": 854 }, { - "__id__": 855 + "__id__": 856 }, { - "__id__": 857 + "__id__": 858 } ], "_prefab": { - "__id__": 859 + "__id__": 860 }, "_lpos": { "__type__": "cc.Vec3", @@ -14403,23 +14416,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 773 + "__id__": 774 }, "_children": [], "_active": true, "_components": [ { - "__id__": 775 + "__id__": 776 }, { - "__id__": 777 + "__id__": 778 }, { - "__id__": 779 + "__id__": 780 } ], "_prefab": { - "__id__": 781 + "__id__": 782 }, "_lpos": { "__type__": "cc.Vec3", @@ -14456,11 +14469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 774 + "__id__": 775 }, "_enabled": true, "__prefab": { - "__id__": 776 + "__id__": 777 }, "_contentSize": { "__type__": "cc.Size", @@ -14484,11 +14497,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 774 + "__id__": 775 }, "_enabled": true, "__prefab": { - "__id__": 778 + "__id__": 779 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14529,11 +14542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 774 + "__id__": 775 }, "_enabled": true, "__prefab": { - "__id__": 780 + "__id__": 781 }, "_alignFlags": 45, "_target": null, @@ -14576,17 +14589,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 773 + "__id__": 774 }, "_prefab": { - "__id__": 783 + "__id__": 784 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 782 + "__id__": 783 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -14594,7 +14607,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 784 + "__id__": 785 }, "targetOverrides": null }, @@ -14606,16 +14619,13 @@ }, "mountedChildren": [ { - "__id__": 785 + "__id__": 786 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 815 - }, - { - "__id__": 817 + "__id__": 816 }, { "__id__": 818 @@ -14627,19 +14637,22 @@ "__id__": 820 }, { - "__id__": 822 + "__id__": 821 }, { - "__id__": 824 + "__id__": 823 }, { - "__id__": 826 + "__id__": 825 }, { - "__id__": 828 + "__id__": 827 }, { - "__id__": 830 + "__id__": 829 + }, + { + "__id__": 831 } ], "removedComponents": [] @@ -14647,11 +14660,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 786 + "__id__": 787 }, "nodes": [ { - "__id__": 787 + "__id__": 788 } ] }, @@ -14665,21 +14678,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 782 + "__id__": 783 }, "_prefab": { - "__id__": 788 + "__id__": 789 }, "__editorExtras__": { "mountedRoot": { - "__id__": 782 + "__id__": 783 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 787 + "__id__": 788 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -14687,7 +14700,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 789 + "__id__": 790 }, "targetOverrides": null }, @@ -14701,10 +14714,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 790 - }, - { - "__id__": 792 + "__id__": 791 }, { "__id__": 793 @@ -14716,28 +14726,28 @@ "__id__": 795 }, { - "__id__": 797 + "__id__": 796 }, { - "__id__": 799 + "__id__": 798 }, { "__id__": 800 }, { - "__id__": 802 + "__id__": 801 }, { - "__id__": 804 + "__id__": 803 }, { - "__id__": 806 + "__id__": 805 }, { "__id__": 807 }, { - "__id__": 809 + "__id__": 808 }, { "__id__": 810 @@ -14746,10 +14756,13 @@ "__id__": 811 }, { - "__id__": 813 + "__id__": 812 }, { "__id__": 814 + }, + { + "__id__": 815 } ], "removedComponents": [] @@ -14757,7 +14770,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 791 + "__id__": 792 }, "propertyPath": [ "_name" @@ -14773,7 +14786,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 791 + "__id__": 792 }, "propertyPath": [ "_lpos" @@ -14788,7 +14801,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 791 + "__id__": 792 }, "propertyPath": [ "_lrot" @@ -14804,7 +14817,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 791 + "__id__": 792 }, "propertyPath": [ "_euler" @@ -14819,7 +14832,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 797 }, "propertyPath": [ "_top" @@ -14835,7 +14848,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 798 + "__id__": 799 }, "propertyPath": [ "_active" @@ -14851,7 +14864,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 797 }, "propertyPath": [ "_left" @@ -14861,7 +14874,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 801 + "__id__": 802 }, "propertyPath": [ "_contentSize" @@ -14881,7 +14894,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 803 + "__id__": 804 }, "propertyPath": [ "_contentSize" @@ -14901,7 +14914,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 805 + "__id__": 806 }, "propertyPath": [ "_contentSize" @@ -14921,7 +14934,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 797 }, "propertyPath": [ "_right" @@ -14931,7 +14944,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 808 + "__id__": 809 }, "propertyPath": [ "_alignFlags" @@ -14947,7 +14960,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 808 + "__id__": 809 }, "propertyPath": [ "_top" @@ -14957,7 +14970,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 808 + "__id__": 809 }, "propertyPath": [ "_bottom" @@ -14967,7 +14980,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 812 + "__id__": 813 }, "propertyPath": [ "_lpos" @@ -14988,7 +15001,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 797 }, "propertyPath": [ "_alignFlags" @@ -14998,7 +15011,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 797 }, "propertyPath": [ "_bottom" @@ -15008,7 +15021,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 816 + "__id__": 817 }, "propertyPath": [ "_name" @@ -15024,7 +15037,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 816 + "__id__": 817 }, "propertyPath": [ "_lpos" @@ -15039,7 +15052,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 816 + "__id__": 817 }, "propertyPath": [ "_lrot" @@ -15055,7 +15068,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 816 + "__id__": 817 }, "propertyPath": [ "_euler" @@ -15070,7 +15083,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 821 + "__id__": 822 }, "propertyPath": [ "_contentSize" @@ -15090,7 +15103,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 823 + "__id__": 824 }, "propertyPath": [ "_contentSize" @@ -15110,7 +15123,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 825 + "__id__": 826 }, "propertyPath": [ "_contentSize" @@ -15130,7 +15143,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 827 + "__id__": 828 }, "propertyPath": [ "_contentSize" @@ -15150,7 +15163,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 829 + "__id__": 830 }, "propertyPath": [ "_active" @@ -15166,7 +15179,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 816 + "__id__": 817 }, "propertyPath": [ "_active" @@ -15179,23 +15192,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 773 + "__id__": 774 }, "_children": [], "_active": true, "_components": [ { - "__id__": 832 + "__id__": 833 }, { - "__id__": 834 + "__id__": 835 }, { - "__id__": 836 + "__id__": 837 } ], "_prefab": { - "__id__": 838 + "__id__": 839 }, "_lpos": { "__type__": "cc.Vec3", @@ -15232,11 +15245,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 831 + "__id__": 832 }, "_enabled": true, "__prefab": { - "__id__": 833 + "__id__": 834 }, "_contentSize": { "__type__": "cc.Size", @@ -15260,11 +15273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 831 + "__id__": 832 }, "_enabled": true, "__prefab": { - "__id__": 835 + "__id__": 836 }, "_alignFlags": 18, "_target": null, @@ -15296,11 +15309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 831 + "__id__": 832 }, "_enabled": false, "__prefab": { - "__id__": 837 + "__id__": 838 }, "_resizeMode": 0, "_layoutType": 1, @@ -15345,17 +15358,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 773 + "__id__": 774 }, "_prefab": { - "__id__": 840 + "__id__": 841 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 839 + "__id__": 840 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -15363,7 +15376,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 841 + "__id__": 842 }, "targetOverrides": null }, @@ -15376,21 +15389,21 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 842 + "__id__": 843 } ], "propertyOverrides": [ { - "__id__": 846 - }, - { - "__id__": 848 + "__id__": 847 }, { "__id__": 849 }, { "__id__": 850 + }, + { + "__id__": 851 } ], "removedComponents": [] @@ -15398,11 +15411,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 843 + "__id__": 844 }, "components": [ { - "__id__": 844 + "__id__": 845 } ] }, @@ -15418,15 +15431,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 839 + "__id__": 840 } }, "node": { - "__id__": 839 + "__id__": 840 }, "_enabled": true, "__prefab": { - "__id__": 845 + "__id__": 846 }, "_alignFlags": 2, "_target": null, @@ -15455,7 +15468,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 847 + "__id__": 848 }, "propertyPath": [ "_name" @@ -15471,7 +15484,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 847 + "__id__": 848 }, "propertyPath": [ "_lpos" @@ -15486,7 +15499,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 847 + "__id__": 848 }, "propertyPath": [ "_lrot" @@ -15502,7 +15515,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 847 + "__id__": 848 }, "propertyPath": [ "_euler" @@ -15520,11 +15533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 852 + "__id__": 853 }, "_contentSize": { "__type__": "cc.Size", @@ -15548,11 +15561,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 854 + "__id__": 855 }, "_alignFlags": 45, "_target": null, @@ -15584,11 +15597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 774 }, "_enabled": false, "__prefab": { - "__id__": 856 + "__id__": 857 }, "_resizeMode": 1, "_layoutType": 1, @@ -15622,11 +15635,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 858 + "__id__": 859 }, "_id": "" }, @@ -15657,35 +15670,35 @@ }, "_children": [ { - "__id__": 861 + "__id__": 862 }, { - "__id__": 869 + "__id__": 870 }, { - "__id__": 918 + "__id__": 919 }, { - "__id__": 926 + "__id__": 927 } ], "_active": false, "_components": [ { - "__id__": 970 + "__id__": 971 }, { - "__id__": 972 + "__id__": 973 }, { - "__id__": 974 + "__id__": 975 }, { - "__id__": 976 + "__id__": 977 } ], "_prefab": { - "__id__": 978 + "__id__": 979 }, "_lpos": { "__type__": "cc.Vec3", @@ -15722,23 +15735,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 860 + "__id__": 861 }, "_children": [], "_active": true, "_components": [ { - "__id__": 862 + "__id__": 863 }, { - "__id__": 864 + "__id__": 865 }, { - "__id__": 866 + "__id__": 867 } ], "_prefab": { - "__id__": 868 + "__id__": 869 }, "_lpos": { "__type__": "cc.Vec3", @@ -15775,11 +15788,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 861 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 863 + "__id__": 864 }, "_contentSize": { "__type__": "cc.Size", @@ -15803,11 +15816,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 861 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 865 + "__id__": 866 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15848,11 +15861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 861 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 867 + "__id__": 868 }, "_alignFlags": 45, "_target": null, @@ -15895,17 +15908,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 860 + "__id__": 861 }, "_prefab": { - "__id__": 870 + "__id__": 871 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 869 + "__id__": 870 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -15913,7 +15926,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 871 + "__id__": 872 }, "targetOverrides": null }, @@ -15925,16 +15938,13 @@ }, "mountedChildren": [ { - "__id__": 872 + "__id__": 873 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 902 - }, - { - "__id__": 904 + "__id__": 903 }, { "__id__": 905 @@ -15946,19 +15956,22 @@ "__id__": 907 }, { - "__id__": 909 + "__id__": 908 }, { - "__id__": 911 + "__id__": 910 }, { - "__id__": 913 + "__id__": 912 }, { - "__id__": 915 + "__id__": 914 }, { "__id__": 916 + }, + { + "__id__": 917 } ], "removedComponents": [] @@ -15966,11 +15979,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 873 + "__id__": 874 }, "nodes": [ { - "__id__": 874 + "__id__": 875 } ] }, @@ -15984,21 +15997,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 869 + "__id__": 870 }, "_prefab": { - "__id__": 875 + "__id__": 876 }, "__editorExtras__": { "mountedRoot": { - "__id__": 869 + "__id__": 870 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 874 + "__id__": 875 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -16006,7 +16019,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 876 + "__id__": 877 }, "targetOverrides": null }, @@ -16020,10 +16033,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 877 - }, - { - "__id__": 879 + "__id__": 878 }, { "__id__": 880 @@ -16035,28 +16045,28 @@ "__id__": 882 }, { - "__id__": 884 + "__id__": 883 }, { - "__id__": 886 + "__id__": 885 }, { "__id__": 887 }, { - "__id__": 889 + "__id__": 888 }, { - "__id__": 891 + "__id__": 890 }, { - "__id__": 893 + "__id__": 892 }, { "__id__": 894 }, { - "__id__": 896 + "__id__": 895 }, { "__id__": 897 @@ -16065,10 +16075,13 @@ "__id__": 898 }, { - "__id__": 900 + "__id__": 899 }, { "__id__": 901 + }, + { + "__id__": 902 } ], "removedComponents": [] @@ -16076,7 +16089,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 878 + "__id__": 879 }, "propertyPath": [ "_name" @@ -16092,7 +16105,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 878 + "__id__": 879 }, "propertyPath": [ "_lpos" @@ -16107,7 +16120,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 878 + "__id__": 879 }, "propertyPath": [ "_lrot" @@ -16123,7 +16136,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 878 + "__id__": 879 }, "propertyPath": [ "_euler" @@ -16138,7 +16151,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 883 + "__id__": 884 }, "propertyPath": [ "_top" @@ -16154,7 +16167,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 885 + "__id__": 886 }, "propertyPath": [ "_active" @@ -16170,7 +16183,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 883 + "__id__": 884 }, "propertyPath": [ "_left" @@ -16180,7 +16193,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 888 + "__id__": 889 }, "propertyPath": [ "_contentSize" @@ -16200,7 +16213,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 890 + "__id__": 891 }, "propertyPath": [ "_contentSize" @@ -16220,7 +16233,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 892 + "__id__": 893 }, "propertyPath": [ "_contentSize" @@ -16240,7 +16253,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 883 + "__id__": 884 }, "propertyPath": [ "_right" @@ -16250,7 +16263,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 895 + "__id__": 896 }, "propertyPath": [ "_alignFlags" @@ -16266,7 +16279,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 895 + "__id__": 896 }, "propertyPath": [ "_top" @@ -16276,7 +16289,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 895 + "__id__": 896 }, "propertyPath": [ "_bottom" @@ -16286,7 +16299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 899 + "__id__": 900 }, "propertyPath": [ "_lpos" @@ -16307,7 +16320,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 883 + "__id__": 884 }, "propertyPath": [ "_alignFlags" @@ -16317,7 +16330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 883 + "__id__": 884 }, "propertyPath": [ "_bottom" @@ -16327,7 +16340,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 903 + "__id__": 904 }, "propertyPath": [ "_name" @@ -16343,7 +16356,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 903 + "__id__": 904 }, "propertyPath": [ "_lpos" @@ -16358,7 +16371,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 903 + "__id__": 904 }, "propertyPath": [ "_lrot" @@ -16374,7 +16387,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 903 + "__id__": 904 }, "propertyPath": [ "_euler" @@ -16389,7 +16402,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 908 + "__id__": 909 }, "propertyPath": [ "_contentSize" @@ -16409,7 +16422,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 910 + "__id__": 911 }, "propertyPath": [ "_contentSize" @@ -16429,7 +16442,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 912 + "__id__": 913 }, "propertyPath": [ "_contentSize" @@ -16449,7 +16462,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 914 + "__id__": 915 }, "propertyPath": [ "_contentSize" @@ -16469,7 +16482,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 903 + "__id__": 904 }, "propertyPath": [ "_active" @@ -16479,7 +16492,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 917 + "__id__": 918 }, "propertyPath": [ "_active" @@ -16498,23 +16511,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 860 + "__id__": 861 }, "_children": [], "_active": true, "_components": [ { - "__id__": 919 + "__id__": 920 }, { - "__id__": 921 + "__id__": 922 }, { - "__id__": 923 + "__id__": 924 } ], "_prefab": { - "__id__": 925 + "__id__": 926 }, "_lpos": { "__type__": "cc.Vec3", @@ -16551,11 +16564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 918 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 920 + "__id__": 921 }, "_contentSize": { "__type__": "cc.Size", @@ -16579,11 +16592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 918 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 922 + "__id__": 923 }, "_alignFlags": 18, "_target": null, @@ -16615,11 +16628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 918 + "__id__": 919 }, "_enabled": false, "__prefab": { - "__id__": 924 + "__id__": 925 }, "_resizeMode": 0, "_layoutType": 1, @@ -16666,33 +16679,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 860 + "__id__": 861 }, "_children": [ { - "__id__": 927 + "__id__": 928 }, { - "__id__": 937 + "__id__": 938 } ], "_active": true, "_components": [ { - "__id__": 961 + "__id__": 962 }, { - "__id__": 963 + "__id__": 964 }, { - "__id__": 965 + "__id__": 966 }, { - "__id__": 967 + "__id__": 968 } ], "_prefab": { - "__id__": 969 + "__id__": 970 }, "_lpos": { "__type__": "cc.Vec3", @@ -16727,17 +16740,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 926 + "__id__": 927 }, "_prefab": { - "__id__": 928 + "__id__": 929 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 927 + "__id__": 928 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -16745,7 +16758,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 929 + "__id__": 930 }, "targetOverrides": null }, @@ -16759,31 +16772,31 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 930 - }, - { - "__id__": 932 + "__id__": 931 }, { "__id__": 933 }, { "__id__": 934 + }, + { + "__id__": 935 } ], "removedComponents": [ { - "__id__": 935 + "__id__": 936 }, { - "__id__": 936 + "__id__": 937 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 931 + "__id__": 932 }, "propertyPath": [ "_name" @@ -16799,7 +16812,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 931 + "__id__": 932 }, "propertyPath": [ "_lpos" @@ -16814,7 +16827,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 931 + "__id__": 932 }, "propertyPath": [ "_lrot" @@ -16830,7 +16843,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 931 + "__id__": 932 }, "propertyPath": [ "_euler" @@ -16858,17 +16871,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 926 + "__id__": 927 }, "_prefab": { - "__id__": 938 + "__id__": 939 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 937 + "__id__": 938 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -16876,7 +16889,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 939 + "__id__": 940 }, "targetOverrides": null }, @@ -16890,10 +16903,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 940 - }, - { - "__id__": 942 + "__id__": 941 }, { "__id__": 943 @@ -16905,40 +16915,43 @@ "__id__": 945 }, { - "__id__": 947 + "__id__": 946 }, { - "__id__": 949 + "__id__": 948 }, { - "__id__": 951 + "__id__": 950 }, { - "__id__": 953 + "__id__": 952 }, { "__id__": 954 }, { - "__id__": 956 + "__id__": 955 }, { - "__id__": 958 + "__id__": 957 + }, + { + "__id__": 959 } ], "removedComponents": [ { - "__id__": 959 + "__id__": 960 }, { - "__id__": 960 + "__id__": 961 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 941 + "__id__": 942 }, "propertyPath": [ "_name" @@ -16954,7 +16967,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 941 + "__id__": 942 }, "propertyPath": [ "_lpos" @@ -16969,7 +16982,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 941 + "__id__": 942 }, "propertyPath": [ "_lrot" @@ -16985,7 +16998,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 941 + "__id__": 942 }, "propertyPath": [ "_euler" @@ -17000,7 +17013,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 946 + "__id__": 947 }, "propertyPath": [ "_active" @@ -17016,7 +17029,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 948 + "__id__": 949 }, "propertyPath": [ "_lpos" @@ -17037,7 +17050,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 950 + "__id__": 951 }, "propertyPath": [ "_contentSize" @@ -17057,7 +17070,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 952 + "__id__": 953 }, "propertyPath": [ "_top" @@ -17073,7 +17086,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 952 + "__id__": 953 }, "propertyPath": [ "_bottom" @@ -17083,7 +17096,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 955 + "__id__": 956 }, "propertyPath": [ "_string" @@ -17099,7 +17112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 957 + "__id__": 958 }, "propertyPath": [ "_contentSize" @@ -17119,7 +17132,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 941 + "__id__": 942 }, "propertyPath": [ "_active" @@ -17144,11 +17157,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 927 }, "_enabled": true, "__prefab": { - "__id__": 962 + "__id__": 963 }, "_contentSize": { "__type__": "cc.Size", @@ -17172,11 +17185,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 927 }, "_enabled": true, "__prefab": { - "__id__": 964 + "__id__": 965 }, "_alignFlags": 42, "_target": null, @@ -17208,11 +17221,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 927 }, "_enabled": true, "__prefab": { - "__id__": 966 + "__id__": 967 }, "_resizeMode": 1, "_layoutType": 1, @@ -17246,11 +17259,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 926 + "__id__": 927 }, "_enabled": true, "__prefab": { - "__id__": 968 + "__id__": 969 }, "_alignFlags": 0, "_target": null, @@ -17295,11 +17308,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 860 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 971 + "__id__": 972 }, "_contentSize": { "__type__": "cc.Size", @@ -17323,11 +17336,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 860 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 973 + "__id__": 974 }, "_alignFlags": 45, "_target": null, @@ -17359,11 +17372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 860 + "__id__": 861 }, "_enabled": false, "__prefab": { - "__id__": 975 + "__id__": 976 }, "_resizeMode": 1, "_layoutType": 1, @@ -17397,11 +17410,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 860 + "__id__": 861 }, "_enabled": true, "__prefab": { - "__id__": 977 + "__id__": 978 }, "_id": "" }, @@ -17432,35 +17445,35 @@ }, "_children": [ { - "__id__": 980 + "__id__": 981 }, { - "__id__": 988 + "__id__": 989 }, { - "__id__": 1037 + "__id__": 1038 }, { - "__id__": 1045 + "__id__": 1046 } ], "_active": false, "_components": [ { - "__id__": 1059 + "__id__": 1060 }, { - "__id__": 1061 + "__id__": 1062 }, { - "__id__": 1063 + "__id__": 1064 }, { - "__id__": 1065 + "__id__": 1066 } ], "_prefab": { - "__id__": 1067 + "__id__": 1068 }, "_lpos": { "__type__": "cc.Vec3", @@ -17497,23 +17510,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 979 + "__id__": 980 }, "_children": [], "_active": true, "_components": [ { - "__id__": 981 + "__id__": 982 }, { - "__id__": 983 + "__id__": 984 }, { - "__id__": 985 + "__id__": 986 } ], "_prefab": { - "__id__": 987 + "__id__": 988 }, "_lpos": { "__type__": "cc.Vec3", @@ -17550,11 +17563,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 980 + "__id__": 981 }, "_enabled": true, "__prefab": { - "__id__": 982 + "__id__": 983 }, "_contentSize": { "__type__": "cc.Size", @@ -17578,11 +17591,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 980 + "__id__": 981 }, "_enabled": true, "__prefab": { - "__id__": 984 + "__id__": 985 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17623,11 +17636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 980 + "__id__": 981 }, "_enabled": true, "__prefab": { - "__id__": 986 + "__id__": 987 }, "_alignFlags": 45, "_target": null, @@ -17670,17 +17683,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 979 + "__id__": 980 }, "_prefab": { - "__id__": 989 + "__id__": 990 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 988 + "__id__": 989 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -17688,7 +17701,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 990 + "__id__": 991 }, "targetOverrides": null }, @@ -17700,16 +17713,13 @@ }, "mountedChildren": [ { - "__id__": 991 + "__id__": 992 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1021 - }, - { - "__id__": 1023 + "__id__": 1022 }, { "__id__": 1024 @@ -17721,19 +17731,22 @@ "__id__": 1026 }, { - "__id__": 1028 + "__id__": 1027 }, { - "__id__": 1030 + "__id__": 1029 }, { - "__id__": 1032 + "__id__": 1031 }, { - "__id__": 1034 + "__id__": 1033 }, { - "__id__": 1036 + "__id__": 1035 + }, + { + "__id__": 1037 } ], "removedComponents": [] @@ -17741,11 +17754,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 992 + "__id__": 993 }, "nodes": [ { - "__id__": 993 + "__id__": 994 } ] }, @@ -17759,21 +17772,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 988 + "__id__": 989 }, "_prefab": { - "__id__": 994 + "__id__": 995 }, "__editorExtras__": { "mountedRoot": { - "__id__": 988 + "__id__": 989 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 993 + "__id__": 994 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -17781,7 +17794,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 995 + "__id__": 996 }, "targetOverrides": null }, @@ -17795,10 +17808,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 996 - }, - { - "__id__": 998 + "__id__": 997 }, { "__id__": 999 @@ -17810,28 +17820,28 @@ "__id__": 1001 }, { - "__id__": 1003 + "__id__": 1002 }, { - "__id__": 1005 + "__id__": 1004 }, { "__id__": 1006 }, { - "__id__": 1008 + "__id__": 1007 }, { - "__id__": 1010 + "__id__": 1009 }, { - "__id__": 1012 + "__id__": 1011 }, { "__id__": 1013 }, { - "__id__": 1015 + "__id__": 1014 }, { "__id__": 1016 @@ -17840,10 +17850,13 @@ "__id__": 1017 }, { - "__id__": 1019 + "__id__": 1018 }, { "__id__": 1020 + }, + { + "__id__": 1021 } ], "removedComponents": [] @@ -17851,7 +17864,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 997 + "__id__": 998 }, "propertyPath": [ "_name" @@ -17867,7 +17880,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 997 + "__id__": 998 }, "propertyPath": [ "_lpos" @@ -17882,7 +17895,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 997 + "__id__": 998 }, "propertyPath": [ "_lrot" @@ -17898,7 +17911,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 997 + "__id__": 998 }, "propertyPath": [ "_euler" @@ -17913,7 +17926,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1002 + "__id__": 1003 }, "propertyPath": [ "_top" @@ -17929,7 +17942,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1004 + "__id__": 1005 }, "propertyPath": [ "_active" @@ -17945,7 +17958,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1002 + "__id__": 1003 }, "propertyPath": [ "_left" @@ -17955,7 +17968,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1007 + "__id__": 1008 }, "propertyPath": [ "_contentSize" @@ -17975,7 +17988,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1009 + "__id__": 1010 }, "propertyPath": [ "_contentSize" @@ -17995,7 +18008,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1011 + "__id__": 1012 }, "propertyPath": [ "_contentSize" @@ -18015,7 +18028,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1002 + "__id__": 1003 }, "propertyPath": [ "_right" @@ -18025,7 +18038,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1014 + "__id__": 1015 }, "propertyPath": [ "_alignFlags" @@ -18041,7 +18054,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1014 + "__id__": 1015 }, "propertyPath": [ "_top" @@ -18051,7 +18064,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1014 + "__id__": 1015 }, "propertyPath": [ "_bottom" @@ -18061,7 +18074,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1018 + "__id__": 1019 }, "propertyPath": [ "_lpos" @@ -18082,7 +18095,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1002 + "__id__": 1003 }, "propertyPath": [ "_alignFlags" @@ -18092,7 +18105,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1002 + "__id__": 1003 }, "propertyPath": [ "_bottom" @@ -18102,7 +18115,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1022 + "__id__": 1023 }, "propertyPath": [ "_name" @@ -18118,7 +18131,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1022 + "__id__": 1023 }, "propertyPath": [ "_lpos" @@ -18133,7 +18146,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1022 + "__id__": 1023 }, "propertyPath": [ "_lrot" @@ -18149,7 +18162,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1022 + "__id__": 1023 }, "propertyPath": [ "_euler" @@ -18164,7 +18177,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1027 + "__id__": 1028 }, "propertyPath": [ "_contentSize" @@ -18184,7 +18197,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1029 + "__id__": 1030 }, "propertyPath": [ "_contentSize" @@ -18204,7 +18217,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1031 + "__id__": 1032 }, "propertyPath": [ "_contentSize" @@ -18224,7 +18237,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1033 + "__id__": 1034 }, "propertyPath": [ "_contentSize" @@ -18244,7 +18257,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1035 + "__id__": 1036 }, "propertyPath": [ "_active" @@ -18260,7 +18273,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1022 + "__id__": 1023 }, "propertyPath": [ "_active" @@ -18273,23 +18286,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 979 + "__id__": 980 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1038 + "__id__": 1039 }, { - "__id__": 1040 + "__id__": 1041 }, { - "__id__": 1042 + "__id__": 1043 } ], "_prefab": { - "__id__": 1044 + "__id__": 1045 }, "_lpos": { "__type__": "cc.Vec3", @@ -18326,11 +18339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1037 + "__id__": 1038 }, "_enabled": true, "__prefab": { - "__id__": 1039 + "__id__": 1040 }, "_contentSize": { "__type__": "cc.Size", @@ -18354,11 +18367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1037 + "__id__": 1038 }, "_enabled": true, "__prefab": { - "__id__": 1041 + "__id__": 1042 }, "_alignFlags": 18, "_target": null, @@ -18390,11 +18403,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1037 + "__id__": 1038 }, "_enabled": false, "__prefab": { - "__id__": 1043 + "__id__": 1044 }, "_resizeMode": 0, "_layoutType": 1, @@ -18439,17 +18452,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 979 + "__id__": 980 }, "_prefab": { - "__id__": 1046 + "__id__": 1047 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1045 + "__id__": 1046 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -18457,7 +18470,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 1047 + "__id__": 1048 }, "targetOverrides": null }, @@ -18470,40 +18483,40 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 1048 + "__id__": 1049 } ], "propertyOverrides": [ { - "__id__": 1052 - }, - { - "__id__": 1054 + "__id__": 1053 }, { "__id__": 1055 }, { "__id__": 1056 + }, + { + "__id__": 1057 } ], "removedComponents": [ { - "__id__": 1057 + "__id__": 1058 }, { - "__id__": 1058 + "__id__": 1059 } ] }, { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 1049 + "__id__": 1050 }, "components": [ { - "__id__": 1050 + "__id__": 1051 } ] }, @@ -18519,15 +18532,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 1045 + "__id__": 1046 } }, "node": { - "__id__": 1045 + "__id__": 1046 }, "_enabled": true, "__prefab": { - "__id__": 1051 + "__id__": 1052 }, "_alignFlags": 2, "_target": null, @@ -18556,7 +18569,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1053 + "__id__": 1054 }, "propertyPath": [ "_name" @@ -18572,7 +18585,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1053 + "__id__": 1054 }, "propertyPath": [ "_lpos" @@ -18587,7 +18600,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1053 + "__id__": 1054 }, "propertyPath": [ "_lrot" @@ -18603,7 +18616,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1053 + "__id__": 1054 }, "propertyPath": [ "_euler" @@ -18633,11 +18646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 979 + "__id__": 980 }, "_enabled": true, "__prefab": { - "__id__": 1060 + "__id__": 1061 }, "_contentSize": { "__type__": "cc.Size", @@ -18661,11 +18674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 979 + "__id__": 980 }, "_enabled": true, "__prefab": { - "__id__": 1062 + "__id__": 1063 }, "_alignFlags": 45, "_target": null, @@ -18697,11 +18710,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 979 + "__id__": 980 }, "_enabled": false, "__prefab": { - "__id__": 1064 + "__id__": 1065 }, "_resizeMode": 1, "_layoutType": 1, @@ -18735,11 +18748,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 979 + "__id__": 980 }, "_enabled": true, "__prefab": { - "__id__": 1066 + "__id__": 1067 }, "_id": "" }, @@ -18770,35 +18783,35 @@ }, "_children": [ { - "__id__": 1069 + "__id__": 1070 }, { - "__id__": 1077 + "__id__": 1078 }, { - "__id__": 1126 + "__id__": 1127 }, { - "__id__": 1134 + "__id__": 1135 } ], "_active": false, "_components": [ { - "__id__": 1146 + "__id__": 1147 }, { - "__id__": 1148 + "__id__": 1149 }, { - "__id__": 1150 + "__id__": 1151 }, { - "__id__": 1152 + "__id__": 1153 } ], "_prefab": { - "__id__": 1154 + "__id__": 1155 }, "_lpos": { "__type__": "cc.Vec3", @@ -18835,23 +18848,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1068 + "__id__": 1069 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1070 + "__id__": 1071 }, { - "__id__": 1072 + "__id__": 1073 }, { - "__id__": 1074 + "__id__": 1075 } ], "_prefab": { - "__id__": 1076 + "__id__": 1077 }, "_lpos": { "__type__": "cc.Vec3", @@ -18888,11 +18901,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1069 + "__id__": 1070 }, "_enabled": true, "__prefab": { - "__id__": 1071 + "__id__": 1072 }, "_contentSize": { "__type__": "cc.Size", @@ -18916,11 +18929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1069 + "__id__": 1070 }, "_enabled": true, "__prefab": { - "__id__": 1073 + "__id__": 1074 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18961,11 +18974,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1069 + "__id__": 1070 }, "_enabled": true, "__prefab": { - "__id__": 1075 + "__id__": 1076 }, "_alignFlags": 45, "_target": null, @@ -19008,17 +19021,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1068 + "__id__": 1069 }, "_prefab": { - "__id__": 1078 + "__id__": 1079 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1077 + "__id__": 1078 }, "asset": { "__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3", @@ -19026,7 +19039,7 @@ }, "fileId": "50T0YGiGBH7qZZFeATiEP+", "instance": { - "__id__": 1079 + "__id__": 1080 }, "targetOverrides": null }, @@ -19038,16 +19051,13 @@ }, "mountedChildren": [ { - "__id__": 1080 + "__id__": 1081 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1110 - }, - { - "__id__": 1112 + "__id__": 1111 }, { "__id__": 1113 @@ -19059,19 +19069,22 @@ "__id__": 1115 }, { - "__id__": 1117 + "__id__": 1116 }, { - "__id__": 1119 + "__id__": 1118 }, { - "__id__": 1121 + "__id__": 1120 }, { - "__id__": 1123 + "__id__": 1122 }, { - "__id__": 1125 + "__id__": 1124 + }, + { + "__id__": 1126 } ], "removedComponents": [] @@ -19079,11 +19092,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1082 }, "nodes": [ { - "__id__": 1082 + "__id__": 1083 } ] }, @@ -19097,21 +19110,21 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1077 + "__id__": 1078 }, "_prefab": { - "__id__": 1083 + "__id__": 1084 }, "__editorExtras__": { "mountedRoot": { - "__id__": 1077 + "__id__": 1078 } } }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1082 + "__id__": 1083 }, "asset": { "__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2", @@ -19119,7 +19132,7 @@ }, "fileId": "99dvuw5eJJzqP11ZqucD+r", "instance": { - "__id__": 1084 + "__id__": 1085 }, "targetOverrides": null }, @@ -19133,10 +19146,7 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1085 - }, - { - "__id__": 1087 + "__id__": 1086 }, { "__id__": 1088 @@ -19148,28 +19158,28 @@ "__id__": 1090 }, { - "__id__": 1092 + "__id__": 1091 }, { - "__id__": 1094 + "__id__": 1093 }, { "__id__": 1095 }, { - "__id__": 1097 + "__id__": 1096 }, { - "__id__": 1099 + "__id__": 1098 }, { - "__id__": 1101 + "__id__": 1100 }, { "__id__": 1102 }, { - "__id__": 1104 + "__id__": 1103 }, { "__id__": 1105 @@ -19178,10 +19188,13 @@ "__id__": 1106 }, { - "__id__": 1108 + "__id__": 1107 }, { "__id__": 1109 + }, + { + "__id__": 1110 } ], "removedComponents": [] @@ -19189,7 +19202,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1086 + "__id__": 1087 }, "propertyPath": [ "_name" @@ -19205,7 +19218,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1086 + "__id__": 1087 }, "propertyPath": [ "_lpos" @@ -19220,7 +19233,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1086 + "__id__": 1087 }, "propertyPath": [ "_lrot" @@ -19236,7 +19249,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1086 + "__id__": 1087 }, "propertyPath": [ "_euler" @@ -19251,7 +19264,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1091 + "__id__": 1092 }, "propertyPath": [ "_top" @@ -19267,7 +19280,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1093 + "__id__": 1094 }, "propertyPath": [ "_active" @@ -19283,7 +19296,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1091 + "__id__": 1092 }, "propertyPath": [ "_left" @@ -19293,7 +19306,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1096 + "__id__": 1097 }, "propertyPath": [ "_contentSize" @@ -19313,7 +19326,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1098 + "__id__": 1099 }, "propertyPath": [ "_contentSize" @@ -19333,7 +19346,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1100 + "__id__": 1101 }, "propertyPath": [ "_contentSize" @@ -19353,7 +19366,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1091 + "__id__": 1092 }, "propertyPath": [ "_right" @@ -19363,7 +19376,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1103 + "__id__": 1104 }, "propertyPath": [ "_alignFlags" @@ -19379,7 +19392,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1103 + "__id__": 1104 }, "propertyPath": [ "_top" @@ -19389,7 +19402,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1103 + "__id__": 1104 }, "propertyPath": [ "_bottom" @@ -19399,7 +19412,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1107 + "__id__": 1108 }, "propertyPath": [ "_lpos" @@ -19420,7 +19433,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1091 + "__id__": 1092 }, "propertyPath": [ "_alignFlags" @@ -19430,7 +19443,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1091 + "__id__": 1092 }, "propertyPath": [ "_bottom" @@ -19440,7 +19453,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1112 }, "propertyPath": [ "_name" @@ -19456,7 +19469,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1112 }, "propertyPath": [ "_lpos" @@ -19471,7 +19484,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1112 }, "propertyPath": [ "_lrot" @@ -19487,7 +19500,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1112 }, "propertyPath": [ "_euler" @@ -19502,7 +19515,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1116 + "__id__": 1117 }, "propertyPath": [ "_contentSize" @@ -19522,7 +19535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1118 + "__id__": 1119 }, "propertyPath": [ "_contentSize" @@ -19542,7 +19555,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1120 + "__id__": 1121 }, "propertyPath": [ "_contentSize" @@ -19562,7 +19575,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1122 + "__id__": 1123 }, "propertyPath": [ "_contentSize" @@ -19582,7 +19595,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1124 + "__id__": 1125 }, "propertyPath": [ "_active" @@ -19598,7 +19611,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1111 + "__id__": 1112 }, "propertyPath": [ "_active" @@ -19611,23 +19624,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1068 + "__id__": 1069 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1127 + "__id__": 1128 }, { - "__id__": 1129 + "__id__": 1130 }, { - "__id__": 1131 + "__id__": 1132 } ], "_prefab": { - "__id__": 1133 + "__id__": 1134 }, "_lpos": { "__type__": "cc.Vec3", @@ -19664,11 +19677,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1126 + "__id__": 1127 }, "_enabled": true, "__prefab": { - "__id__": 1128 + "__id__": 1129 }, "_contentSize": { "__type__": "cc.Size", @@ -19692,11 +19705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1126 + "__id__": 1127 }, "_enabled": true, "__prefab": { - "__id__": 1130 + "__id__": 1131 }, "_alignFlags": 18, "_target": null, @@ -19728,11 +19741,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1126 + "__id__": 1127 }, "_enabled": false, "__prefab": { - "__id__": 1132 + "__id__": 1133 }, "_resizeMode": 0, "_layoutType": 1, @@ -19777,17 +19790,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 1068 + "__id__": 1069 }, "_prefab": { - "__id__": 1135 + "__id__": 1136 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1134 + "__id__": 1135 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -19795,7 +19808,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 1136 + "__id__": 1137 }, "targetOverrides": null }, @@ -19808,21 +19821,21 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 1137 + "__id__": 1138 } ], "propertyOverrides": [ { - "__id__": 1141 - }, - { - "__id__": 1143 + "__id__": 1142 }, { "__id__": 1144 }, { "__id__": 1145 + }, + { + "__id__": 1146 } ], "removedComponents": [] @@ -19830,11 +19843,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 1138 + "__id__": 1139 }, "components": [ { - "__id__": 1139 + "__id__": 1140 } ] }, @@ -19850,15 +19863,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 1134 + "__id__": 1135 } }, "node": { - "__id__": 1134 + "__id__": 1135 }, "_enabled": true, "__prefab": { - "__id__": 1140 + "__id__": 1141 }, "_alignFlags": 2, "_target": null, @@ -19887,7 +19900,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1142 + "__id__": 1143 }, "propertyPath": [ "_name" @@ -19903,7 +19916,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1142 + "__id__": 1143 }, "propertyPath": [ "_lpos" @@ -19918,7 +19931,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1142 + "__id__": 1143 }, "propertyPath": [ "_lrot" @@ -19934,7 +19947,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1142 + "__id__": 1143 }, "propertyPath": [ "_euler" @@ -19952,11 +19965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1068 + "__id__": 1069 }, "_enabled": true, "__prefab": { - "__id__": 1147 + "__id__": 1148 }, "_contentSize": { "__type__": "cc.Size", @@ -19980,11 +19993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1068 + "__id__": 1069 }, "_enabled": true, "__prefab": { - "__id__": 1149 + "__id__": 1150 }, "_alignFlags": 45, "_target": null, @@ -20016,11 +20029,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1068 + "__id__": 1069 }, "_enabled": false, "__prefab": { - "__id__": 1151 + "__id__": 1152 }, "_resizeMode": 1, "_layoutType": 1, @@ -20054,11 +20067,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1068 + "__id__": 1069 }, "_enabled": true, "__prefab": { - "__id__": 1153 + "__id__": 1154 }, "_id": "" }, @@ -20089,26 +20102,26 @@ }, "_children": [ { - "__id__": 1156 + "__id__": 1157 }, { - "__id__": 1162 + "__id__": 1163 }, { - "__id__": 1170 + "__id__": 1171 } ], "_active": true, "_components": [ { - "__id__": 1180 + "__id__": 1181 }, { - "__id__": 1182 + "__id__": 1183 } ], "_prefab": { - "__id__": 1184 + "__id__": 1185 }, "_lpos": { "__type__": "cc.Vec3", @@ -20145,20 +20158,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1155 + "__id__": 1156 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1157 + "__id__": 1158 }, { - "__id__": 1159 + "__id__": 1160 } ], "_prefab": { - "__id__": 1161 + "__id__": 1162 }, "_lpos": { "__type__": "cc.Vec3", @@ -20195,11 +20208,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1156 + "__id__": 1157 }, "_enabled": true, "__prefab": { - "__id__": 1158 + "__id__": 1159 }, "_contentSize": { "__type__": "cc.Size", @@ -20223,11 +20236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1156 + "__id__": 1157 }, "_enabled": true, "__prefab": { - "__id__": 1160 + "__id__": 1161 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20281,23 +20294,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1155 + "__id__": 1156 }, "_children": [], "_active": false, "_components": [ { - "__id__": 1163 + "__id__": 1164 }, { - "__id__": 1165 + "__id__": 1166 }, { - "__id__": 1167 + "__id__": 1168 } ], "_prefab": { - "__id__": 1169 + "__id__": 1170 }, "_lpos": { "__type__": "cc.Vec3", @@ -20334,11 +20347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1162 + "__id__": 1163 }, "_enabled": true, "__prefab": { - "__id__": 1164 + "__id__": 1165 }, "_contentSize": { "__type__": "cc.Size", @@ -20362,11 +20375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1162 + "__id__": 1163 }, "_enabled": true, "__prefab": { - "__id__": 1166 + "__id__": 1167 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20410,11 +20423,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1162 + "__id__": 1163 }, "_enabled": true, "__prefab": { - "__id__": 1168 + "__id__": 1169 }, "_alignFlags": 40, "_target": null, @@ -20459,26 +20472,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1155 + "__id__": 1156 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1171 + "__id__": 1172 }, { - "__id__": 1173 + "__id__": 1174 }, { - "__id__": 1175 + "__id__": 1176 }, { - "__id__": 1177 + "__id__": 1178 } ], "_prefab": { - "__id__": 1179 + "__id__": 1180 }, "_lpos": { "__type__": "cc.Vec3", @@ -20515,11 +20528,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1170 + "__id__": 1171 }, "_enabled": true, "__prefab": { - "__id__": 1172 + "__id__": 1173 }, "_contentSize": { "__type__": "cc.Size", @@ -20543,11 +20556,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1170 + "__id__": 1171 }, "_enabled": true, "__prefab": { - "__id__": 1174 + "__id__": 1175 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20611,11 +20624,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1170 + "__id__": 1171 }, "_enabled": true, "__prefab": { - "__id__": 1176 + "__id__": 1177 }, "_params": [], "_dataID": "", @@ -20631,11 +20644,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1170 + "__id__": 1171 }, "_enabled": true, "__prefab": { - "__id__": 1178 + "__id__": 1179 }, "_alignFlags": 45, "_target": null, @@ -20680,11 +20693,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1155 + "__id__": 1156 }, "_enabled": true, "__prefab": { - "__id__": 1181 + "__id__": 1182 }, "_contentSize": { "__type__": "cc.Size", @@ -20708,11 +20721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1155 + "__id__": 1156 }, "_enabled": true, "__prefab": { - "__id__": 1183 + "__id__": 1184 }, "_alignFlags": 1, "_target": null, @@ -20761,26 +20774,26 @@ }, "_children": [ { - "__id__": 1186 + "__id__": 1187 }, { - "__id__": 1202 + "__id__": 1203 }, { - "__id__": 1212 + "__id__": 1213 } ], "_active": true, "_components": [ { - "__id__": 1224 + "__id__": 1225 }, { - "__id__": 1226 + "__id__": 1227 } ], "_prefab": { - "__id__": 1228 + "__id__": 1229 }, "_lpos": { "__type__": "cc.Vec3", @@ -20817,24 +20830,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1185 + "__id__": 1186 }, "_children": [ { - "__id__": 1187 + "__id__": 1188 }, { - "__id__": 1193 + "__id__": 1194 } ], "_active": true, "_components": [ { - "__id__": 1199 + "__id__": 1200 } ], "_prefab": { - "__id__": 1201 + "__id__": 1202 }, "_lpos": { "__type__": "cc.Vec3", @@ -20871,20 +20884,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1186 + "__id__": 1187 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1188 + "__id__": 1189 }, { - "__id__": 1190 + "__id__": 1191 } ], "_prefab": { - "__id__": 1192 + "__id__": 1193 }, "_lpos": { "__type__": "cc.Vec3", @@ -20921,11 +20934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1187 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1189 + "__id__": 1190 }, "_contentSize": { "__type__": "cc.Size", @@ -20949,11 +20962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1187 + "__id__": 1188 }, "_enabled": true, "__prefab": { - "__id__": 1191 + "__id__": 1192 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21010,20 +21023,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1186 + "__id__": 1187 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1194 + "__id__": 1195 }, { - "__id__": 1196 + "__id__": 1197 } ], "_prefab": { - "__id__": 1198 + "__id__": 1199 }, "_lpos": { "__type__": "cc.Vec3", @@ -21060,11 +21073,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1193 + "__id__": 1194 }, "_enabled": true, "__prefab": { - "__id__": 1195 + "__id__": 1196 }, "_contentSize": { "__type__": "cc.Size", @@ -21088,11 +21101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1193 + "__id__": 1194 }, "_enabled": true, "__prefab": { - "__id__": 1197 + "__id__": 1198 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21169,11 +21182,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1186 + "__id__": 1187 }, "_enabled": true, "__prefab": { - "__id__": 1200 + "__id__": 1201 }, "_contentSize": { "__type__": "cc.Size", @@ -21210,21 +21223,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1185 + "__id__": 1186 }, "_children": [ { - "__id__": 1203 + "__id__": 1204 } ], "_active": false, "_components": [ { - "__id__": 1209 + "__id__": 1210 } ], "_prefab": { - "__id__": 1211 + "__id__": 1212 }, "_lpos": { "__type__": "cc.Vec3", @@ -21261,20 +21274,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1202 + "__id__": 1203 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1204 + "__id__": 1205 }, { - "__id__": 1206 + "__id__": 1207 } ], "_prefab": { - "__id__": 1208 + "__id__": 1209 }, "_lpos": { "__type__": "cc.Vec3", @@ -21311,11 +21324,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1203 + "__id__": 1204 }, "_enabled": true, "__prefab": { - "__id__": 1205 + "__id__": 1206 }, "_contentSize": { "__type__": "cc.Size", @@ -21339,11 +21352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1203 + "__id__": 1204 }, "_enabled": true, "__prefab": { - "__id__": 1207 + "__id__": 1208 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21420,11 +21433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1202 + "__id__": 1203 }, "_enabled": true, "__prefab": { - "__id__": 1210 + "__id__": 1211 }, "_contentSize": { "__type__": "cc.Size", @@ -21461,24 +21474,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1185 + "__id__": 1186 }, "_children": [ { - "__id__": 1213 + "__id__": 1214 } ], "_active": true, "_components": [ { - "__id__": 1219 + "__id__": 1220 }, { - "__id__": 1221 + "__id__": 1222 } ], "_prefab": { - "__id__": 1223 + "__id__": 1224 }, "_lpos": { "__type__": "cc.Vec3", @@ -21515,20 +21528,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1212 + "__id__": 1213 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1214 + "__id__": 1215 }, { - "__id__": 1216 + "__id__": 1217 } ], "_prefab": { - "__id__": 1218 + "__id__": 1219 }, "_lpos": { "__type__": "cc.Vec3", @@ -21565,11 +21578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1213 + "__id__": 1214 }, "_enabled": true, "__prefab": { - "__id__": 1215 + "__id__": 1216 }, "_contentSize": { "__type__": "cc.Size", @@ -21593,11 +21606,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1213 + "__id__": 1214 }, "_enabled": true, "__prefab": { - "__id__": 1217 + "__id__": 1218 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21654,11 +21667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1212 + "__id__": 1213 }, "_enabled": true, "__prefab": { - "__id__": 1220 + "__id__": 1221 }, "_contentSize": { "__type__": "cc.Size", @@ -21682,11 +21695,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1212 + "__id__": 1213 }, "_enabled": true, "__prefab": { - "__id__": 1222 + "__id__": 1223 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21763,11 +21776,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1185 + "__id__": 1186 }, "_enabled": true, "__prefab": { - "__id__": 1225 + "__id__": 1226 }, "_contentSize": { "__type__": "cc.Size", @@ -21791,11 +21804,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1185 + "__id__": 1186 }, "_enabled": true, "__prefab": { - "__id__": 1227 + "__id__": 1228 }, "_alignFlags": 41, "_target": null, @@ -21844,7 +21857,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1230 + "__id__": 1231 }, "_contentSize": { "__type__": "cc.Size", @@ -21872,7 +21885,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1232 + "__id__": 1233 }, "_alignFlags": 21, "_target": null, @@ -21908,16 +21921,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 1234 + "__id__": 1235 }, "debugMode": false, "showMemoryPanel": true, "start_btn": null, "time_node": { - "__id__": 1185 + "__id__": 1186 }, "tooltip": { - "__id__": 1155 + "__id__": 1156 }, "_id": "" }, @@ -21935,23 +21948,23 @@ }, "_enabled": true, "__prefab": { - "__id__": 1236 + "__id__": 1237 }, "cardPanNode": { - "__id__": 860 + "__id__": 861 }, "cards_node": { - "__id__": 918 + "__id__": 919 }, "cardPrefab": { "__uuid__": "f2f9a3e0-d0f5-46f4-84bd-dd54c2248470", "__expectedType__": "cc.Prefab" }, "closeCards": { - "__id__": 937 + "__id__": 938 }, "nock_node": { - "__id__": 733 + "__id__": 734 }, "showHeros": { "__id__": 362 @@ -21969,10 +21982,10 @@ "__id__": 455 }, "equipsPanNode": { - "__id__": 773 + "__id__": 774 }, "equipsBoxNode": { - "__id__": 831 + "__id__": 832 }, "equipPrefab": { "__uuid__": "f30f91b1-3100-4d9e-befb-cdde5f86e6f8", @@ -21982,48 +21995,48 @@ "__id__": 487 }, "showSkills": { - "__id__": 547 + "__id__": 548 }, "skillPanNode": { - "__id__": 979 + "__id__": 980 }, "skillBoxNode": { - "__id__": 1037 + "__id__": 1038 }, "sCardPrefab": { "__uuid__": "78a5b2d1-a34b-4190-895d-7d0aa22037cc", "__expectedType__": "cc.Prefab" }, "showSkillsCost": { - "__id__": 579 + "__id__": 580 }, "showShop": { - "__id__": 635 + "__id__": 636 }, "shopPanNode": { - "__id__": 1068 + "__id__": 1069 }, "shopBoxNode": { - "__id__": 1126 + "__id__": 1127 }, "itemPrefab": { "__uuid__": "abae16b3-c2a2-4971-95b1-fc121f769554", "__expectedType__": "cc.Prefab" }, "showShopCost": { - "__id__": 667 + "__id__": 668 }, "skill_refresh": { - "__id__": 1045 + "__id__": 1046 }, "equip_refresh": { - "__id__": 839 + "__id__": 840 }, "shop_refresh": { - "__id__": 1134 + "__id__": 1135 }, - "cards_chou": { - "__id__": 927 + "cards_refresh": { + "__id__": 928 }, "coins_node": { "__id__": 46 @@ -22050,7 +22063,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1238 + "__id__": 1239 }, "_id": "" }, @@ -22068,7 +22081,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1240 + "__id__": 1241 }, "debugMode": false, "_id": "" @@ -22087,7 +22100,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1242 + "__id__": 1243 }, "skill_box": { "__uuid__": "d19cde30-f5d0-47de-a0d5-3a272b696343", @@ -22109,7 +22122,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1244 + "__id__": 1245 }, "equip_box": { "__uuid__": "66d7902d-2a85-43d5-8cbb-671cc7dbb275", @@ -22136,69 +22149,69 @@ "instance": null, "targetOverrides": [ { - "__id__": 1246 + "__id__": 1247 }, { - "__id__": 1248 + "__id__": 1249 }, { - "__id__": 1250 + "__id__": 1251 }, { - "__id__": 1252 + "__id__": 1253 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 1134 + "__id__": 1135 }, { - "__id__": 1077 + "__id__": 1078 }, { - "__id__": 1082 + "__id__": 1083 }, { - "__id__": 1045 + "__id__": 1046 }, { - "__id__": 988 + "__id__": 989 }, { - "__id__": 993 + "__id__": 994 }, { - "__id__": 937 + "__id__": 938 }, { - "__id__": 927 + "__id__": 928 }, { - "__id__": 869 + "__id__": 870 }, { - "__id__": 874 + "__id__": 875 }, { - "__id__": 839 + "__id__": 840 }, { - "__id__": 782 + "__id__": 783 }, { - "__id__": 787 + "__id__": 788 }, { - "__id__": 635 + "__id__": 636 }, { - "__id__": 680 + "__id__": 681 }, { - "__id__": 547 + "__id__": 548 }, { - "__id__": 592 + "__id__": 593 }, { "__id__": 455 @@ -22238,7 +22251,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1235 + "__id__": 1236 }, "sourceInfo": null, "propertyPath": [ @@ -22248,7 +22261,7 @@ "__id__": 362 }, "targetInfo": { - "__id__": 1247 + "__id__": 1248 } }, { @@ -22260,7 +22273,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1235 + "__id__": 1236 }, "sourceInfo": null, "propertyPath": [ @@ -22270,7 +22283,7 @@ "__id__": 455 }, "targetInfo": { - "__id__": 1249 + "__id__": 1250 } }, { @@ -22282,17 +22295,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1235 + "__id__": 1236 }, "sourceInfo": null, "propertyPath": [ "showSkillsCost" ], "target": { - "__id__": 547 + "__id__": 548 }, "targetInfo": { - "__id__": 1251 + "__id__": 1252 } }, { @@ -22304,17 +22317,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 1235 + "__id__": 1236 }, "sourceInfo": null, "propertyPath": [ "showShopCost" ], "target": { - "__id__": 635 + "__id__": 636 }, "targetInfo": { - "__id__": 1253 + "__id__": 1254 } }, { diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts index 629b90f1..e20f0e61 100644 --- a/assets/script/game/map/MissionCardComp.ts +++ b/assets/script/game/map/MissionCardComp.ts @@ -5,7 +5,7 @@ * 职责： * 1. **卡牌分发管理** —— 从卡池抽取 3 张英雄卡，分发到 3 个 CHeroComp 槽位。 * 抽卡规则：从基础英雄卡池按权重抽取，同一次抽卡内英雄不重复； - * 场上已召唤的英雄不再刷出。 + * 不过滤已召唤英雄，抽到同 uuid 可触发二合一合成升级。 * 2. **金币费用管理** —— 抽卡费用（refreshCost）的扣除。 * 3. **英雄数量上限校验** —— 在 UseHeroCard 事件的 guard 阶段判断是否允许再召唤英雄。 * 4. **场上英雄信息面板（HInfoComp 列表）同步** —— @@ -160,9 +160,9 @@ export class MissionCardComp extends CCComp { /** 药品刷新按钮节点 */ @property(Node) shop_refresh: Node = null!; - /** 抽卡（刷新）按钮节点 */ + /** 刷新卡池按钮节点 */ @property(Node) - cards_chou: Node = null! + cards_refresh: Node = null! /** 金币显示节点（含 icon + num 子节点） */ @property(Node) @@ -192,6 +192,13 @@ export class MissionCardComp extends CCComp { private itemCardComps: ItemListComp[] = []; /** 是否已召唤过英雄（用于控制其他面板按钮是否可点击） */ private hasCalledHero: boolean = false; + /** + * 招募计数：每次点击招募 +1。 + * 节奏为「每 4 次一循环」：前 3 次直接随机召唤，第 4 次走三选一。 + */ + private recruitCount: number = 0; + /** 全远程阵容时近战卡的权重放大倍数（近战保底） */ + private static readonly MELEE_PITY_WEIGHT_MUL = 3; // ======================== 面板划出状态 ======================== @@ -271,10 +278,10 @@ export class MissionCardComp extends CCComp { // 清理新手按钮指引的调度与动画，防止回调泄漏 this.stopButtonGuide(); this.unscheduleAllCallbacks(); - if (this.cards_chou && this.cards_chou.isValid) { - this.cards_chou.off(NodeEventType.TOUCH_START, this.onDrawTouchStart, this); - this.cards_chou.off(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this); - this.cards_chou.off(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this); + if (this.cards_refresh && this.cards_refresh.isValid) { + this.cards_refresh.off(NodeEventType.TOUCH_START, this.onDrawTouchStart, this); + this.cards_refresh.off(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this); + this.cards_refresh.off(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this); } if (this.showHeros && this.showHeros.isValid) { this.showHeros.off(NodeEventType.TOUCH_END, this.onShowHerosClick, this); @@ -324,7 +331,7 @@ export class MissionCardComp extends CCComp { this.layoutCardSlots(); this.clearAllCards(); - this.resetButtonScale(this.cards_chou); + this.resetButtonScale(this.cards_refresh); this.resetPanelOpenCosts(); this.updateCoinAndCostUI(); this.updateHeroNumUI(false, false); @@ -399,7 +406,7 @@ export class MissionCardComp extends CCComp { * 绑定所有事件监听： * - 节点级事件：MissionStart / MissionEnd / FightStart * - 全局消息：CoinAdd / MasterCalled / HeroDead / UseHeroCard / UseSpecialCard - * - 按钮触控：抽卡（cards_chou） + * - 按钮触控：刷新卡池（cards_refresh） */ private bindEvents() { /** 生命周期事件（节点级） */ @@ -422,9 +429,9 @@ export class MissionCardComp extends CCComp { oops.message.on(GameEvent.HeroUpgrade, this.onHeroUpgrade, this); /** 按钮触控事件：抽卡 */ - this.cards_chou?.on(NodeEventType.TOUCH_START, this.onDrawTouchStart, this); - this.cards_chou?.on(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this); - this.cards_chou?.on(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this); + this.cards_refresh?.on(NodeEventType.TOUCH_START, this.onDrawTouchStart, this); + this.cards_refresh?.on(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this); + this.cards_refresh?.on(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this); /** 隐藏卡牌面板按钮 */ @@ -512,7 +519,7 @@ export class MissionCardComp extends CCComp { let targetNode: Node | null = null; switch (type) { case "refresh_coin": - targetNode = this.cards_chou; + targetNode = this.cards_refresh; break; case "buy_coin": targetNode = this.coins_node; @@ -686,10 +693,10 @@ export class MissionCardComp extends CCComp { oops.message.off(GameEvent.CardUsed, this.onCardUsed, this); oops.message.off(GameEvent.HeroBoxEmptyClick, this.onHeroBoxEmptyClick, this); oops.message.off(GameEvent.HeroUpgrade, this.onHeroUpgrade, this); - if (this.cards_chou && this.cards_chou.isValid) { - this.cards_chou.off(NodeEventType.TOUCH_START, this.onDrawTouchStart, this); - this.cards_chou.off(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this); - this.cards_chou.off(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this); + if (this.cards_refresh && this.cards_refresh.isValid) { + this.cards_refresh.off(NodeEventType.TOUCH_START, this.onDrawTouchStart, this); + this.cards_refresh.off(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this); + this.cards_refresh.off(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this); } if (this.showHeros && this.showHeros.isValid) { this.showHeros.off(NodeEventType.TOUCH_END, this.onShowHerosClick, this); @@ -910,16 +917,16 @@ export class MissionCardComp extends CCComp { /** 抽卡按钮按下反馈 */ private onDrawTouchStart() { - this.playButtonPressAnim(this.cards_chou); + this.playButtonPressAnim(this.cards_refresh); } /** 抽卡按钮释放 → 执行抽卡逻辑 */ private onDrawTouchEnd() { oops.audio.playEffect("music/button"); - this.playButtonClickAnim(this.cards_chou, () => this.onClickDraw()); + this.playButtonClickAnim(this.cards_refresh, () => this.onClickDraw()); } /** 抽卡按钮取消 → 恢复缩放 */ private onDrawTouchCancel() { - this.playButtonResetAnim(this.cards_chou); + this.playButtonResetAnim(this.cards_refresh); } // ======================== 新手按钮指引 ======================== @@ -1214,25 +1221,40 @@ export class MissionCardComp extends CCComp { } /** - * 英雄面板按钮回调： - * 英雄面板（herosPanNode）为常驻基准面板，固定不动； - * 点击按钮收起装备/技能/药品覆盖面板，并显示英雄抽卡面板（cardPanNode）。 + * 英雄招募按钮（每 4 次一循环）： + * - 前 3 次：扣面板开启费后直接随机召唤 1 个英雄（不开面板，无需玩家选）。 + * - 第 4 次：扣费后展开三选一面板（缩放 0→1），玩家选 1。 + * 满员（HERO_MAX_NUM）时气泡提示并拦截，不扣费、不计数。 */ private onShowHerosClick() { oops.audio.playEffect("music/button"); - // 已展开则不重复开启（不重复扣费） - if (this.isCardPanelShown) return; - // 英雄槽位已满：气泡提示并中止，不再展开三选一，也不扣开启费用 + // 满员拦截：随机招募与三选一都禁止 if (this.getAliveHeroCount() >= this.getMissionHeroMaxNum()) { this.showSmallTip("panel_hero_full", "英雄槽已满"); return; } - // 开启英雄抽卡面板需支付金币，金币不足则提示并中止 + // 随机招募与三选一都需支付面板开启费，金币不足则提示并中止 if (!this.tryPayPanelOpenCost(0)) return; - // 收起装备/技能/药品覆盖面板 + + // 先计数，再按节奏分支：count % 4 == 0 展开三选一，其余直接随机召唤 + this.recruitCount++; + const isPickOneOfThree = (this.recruitCount % 4) === 0; + + mLogger.log(this.debugMode, "MissionCardComp", "hero recruit", { + recruitCount: this.recruitCount, + mode: isPickOneOfThree ? "pick_one_of_three" : "random_summon" + }); + + // 收起装备/技能/药品覆盖面板，回到英雄面板 this.slideToPanel(0); - // 显示英雄抽卡面板（缩放 0→1，并点亮按钮 active 高亮） - this.showCardsPanel(); + + if (isPickOneOfThree) { + // 第 4 次：展开英雄抽卡面板（缩放 0→1，点亮按钮 active 高亮） + this.showCardsPanel(); + } else { + // 前 3 次：直接随机召唤，不开面板 + this.randomSummonOne(); + } } // ======================== 英雄信息盒（herosBoxNode） ======================== @@ -1752,10 +1774,10 @@ export class MissionCardComp extends CCComp { // ======================== 核心业务：抽卡 ======================== /** - * 抽卡按钮核心逻辑： - * 1. 检查金币是否足够 → 不够则 toast 提示。 + * 刷新卡池按钮核心逻辑： + * 1. 检查金币/刷新石是否足够 → 不够则 toast 提示。 * 2. 扣除费用、播放金币动画。 - * 3. 重新布局槽位 → 从卡池构建 3 张卡 → 分发到槽位。 + * 3. 重新布局槽位 → 从卡池构建 3 张卡 → 分发到槽位（三选一展示）。 */ private onClickDraw() { const cost = MissionEconomy.getRefreshCost(this.refreshCost); @@ -1770,7 +1792,7 @@ export class MissionCardComp extends CCComp { return; } - mLogger.log(this.debugMode, "MissionCardComp", "click draw", { + mLogger.log(this.debugMode, "MissionCardComp", "click refresh", { cost, leftCoin: MissionEconomy.getCoin() }); @@ -1779,6 +1801,63 @@ export class MissionCardComp extends CCComp { this.dispatchCardsToSlots(cards); } + /** + * 直接随机召唤 1 个英雄： + * - 全英雄卡池按权重随机（不过滤已召唤英雄，配合二合一合成）。 + * - 近战保底：场上已有英雄且全部为远程/中程（无近战）时，近战卡权重放大。 + */ + private randomSummonOne() { + const pool = this.buildRandomSummonPool(); + if (pool.length === 0) return; + const pick = this.weightedPick(pool); + if (!pick) return; + + mLogger.log(this.debugMode, "MissionCardComp", "random summon", { uuid: pick.uuid }); + oops.message.dispatchEvent(GameEvent.CallHero, { + uuid: pick.uuid, + hero_lv: 1, + card_lv: pick.card_lv ?? 1 + }); + } + + /** + * 构建随机召唤卡池：全英雄卡，必要时按近战保底放大近战权重。 + * @returns 带运行时权重的卡配置数组（weight 已按保底调整） + */ + private buildRandomSummonPool(): CardConfig[] { + const heroCards = CardPoolList.filter(c => c.type === CardType.Hero); + if (heroCards.length === 0) return []; + + // 全远程判定：有存活英雄但没有任何近战 → 触发放大近战权重 + const meleeMul = this.isAllRangedFormation() + ? MissionCardComp.MELEE_PITY_WEIGHT_MUL + : 1; + if (meleeMul === 1) return heroCards; + + return heroCards.map(c => { + const hero = HeroInfo[c.uuid]; + const isMelee = hero && hero.type === HType.Melee; + // 复制一份避免污染卡池原始 weight + return isMelee ? { ...c, weight: (c.weight ?? 0) * meleeMul } : c; + }); + } + + /** + * 判断当前场上是否为「全远程阵容」： + * 有至少 1 个存活英雄，且没有任何近战（Melee）英雄。 + */ + private isAllRangedFormation(): boolean { + let heroCount = 0; + let meleeCount = 0; + ecs.query(ecs.allOf(HeroAttrsComp)).forEach((entity: ecs.Entity) => { + const model = entity.get(HeroAttrsComp); + if (!model || model.fac !== FacSet.HERO || model.is_dead) return; + heroCount++; + if (model.type === HType.Melee) meleeCount++; + }); + return heroCount > 0 && meleeCount === 0; + } + // ======================== 阶段切换 ======================== /** 缓存卡牌面板的基准缩放值（从场景初始状态读取，仅缓存一次） */ @@ -1852,15 +1931,13 @@ export class MissionCardComp extends CCComp { * * 规则： * 1. 从基础英雄卡池按权重抽取，同一次抽卡内英雄不重复。 - * 2. 过滤掉场上已召唤的英雄（已召唤的英雄不再刷出，仅通过升级卡升级）。 + * 2. 不过滤已召唤英雄：抽到同 uuid 可触发二合一合成升级。 * 3. 不足 3 张时循环补齐（允许重复）。 * * 注：升级卡机制已移除，英雄卡池只出普通英雄卡。 */ private buildDrawCards(): CardConfig[] { - const heroCards = CardPoolList.filter(c => c.type === CardType.Hero); - const aliveHeroUuids = this.getAliveHeroUuids(); - const availableHeroCards = heroCards.filter(c => !aliveHeroUuids.has(c.uuid)); + const availableHeroCards = CardPoolList.filter(c => c.type === CardType.Hero); if (availableHeroCards.length === 0) return []; @@ -1903,12 +1980,10 @@ export class MissionCardComp extends CCComp { heroType, unique: true, // 保证一次刷新内的英雄卡不重复 }); - // 过滤掉场上已召唤英雄的普通英雄卡（已召唤的英雄不再重复刷出） - const aliveHeroUuids = this.getAliveHeroUuids(); - const available = cards.filter(c => !aliveHeroUuids.has(c.uuid)); - if (available.length <= 0) return false; + // 不过滤已召唤英雄：抽到同 uuid 可触发二合一合成升级 + if (cards.length <= 0) return false; this.layoutCardSlots(); - this.dispatchCardsToSlots(available.slice(0, 3)); + this.dispatchCardsToSlots(cards.slice(0, 3)); return true; } @@ -2029,7 +2104,7 @@ export class MissionCardComp extends CCComp { private updateDrawCostUI() { const stones = MissionEconomy.getRefreshStone(); const stoneCost = MissionEconomy.getRefreshStoneCost(); - this.updateOneRefreshBtnUI(this.cards_chou, stones, stoneCost); + this.updateOneRefreshBtnUI(this.cards_refresh, stones, stoneCost); this.updateOneRefreshBtnUI(this.equip_refresh, stones, stoneCost); this.updateOneRefreshBtnUI(this.shop_refresh, stones, stoneCost); this.updateOneRefreshBtnUI(this.skill_refresh, stones, stoneCost); @@ -2163,22 +2238,6 @@ export class MissionCardComp extends CCComp { return actors; } - /** - * 获取场上所有存活英雄的 hero_uuid 集合。 - * 用于抽卡时过滤：已召唤的英雄不再从普通英雄卡池中刷出。 - */ - private getAliveHeroUuids(): Set { - const uuids = new Set(); - ecs.query(ecs.allOf(HeroAttrsComp)).forEach((entity: ecs.Entity) => { - const model = entity.get(HeroAttrsComp); - if (!model) return; - if (model.fac !== FacSet.HERO) return; - if (model.is_dead) return; - uuids.add(model.hero_uuid); - }); - return uuids; - } - /** * 按 eid 精确升级场上对应英雄实体。 * @@ -2343,7 +2402,7 @@ export class MissionCardComp extends CCComp { /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ reset() { - this.resetButtonScale(this.cards_chou); + this.resetButtonScale(this.cards_refresh); // 关键：在 reset/销毁 时将 Map 置空，彻底切断引用 this.cardComps = [];