diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index 385986dc..a0656340 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -25,29 +25,29 @@ "__id__": 88 }, { - "__id__": 748 + "__id__": 749 }, { - "__id__": 762 + "__id__": 763 } ], "_active": true, "_components": [ { - "__id__": 860 + "__id__": 861 }, { - "__id__": 862 + "__id__": 863 }, { - "__id__": 864 + "__id__": 865 }, { - "__id__": 922 + "__id__": 923 } ], "_prefab": { - "__id__": 924 + "__id__": 925 }, "_lpos": { "__type__": "cc.Vec3", @@ -1263,20 +1263,20 @@ "__id__": 589 }, { - "__id__": 698 + "__id__": 699 } ], "_active": true, "_components": [ { - "__id__": 743 + "__id__": 744 }, { - "__id__": 745 + "__id__": 746 } ], "_prefab": { - "__id__": 747 + "__id__": 748 }, "_lpos": { "__type__": "cc.Vec3", @@ -12528,17 +12528,17 @@ "_active": true, "_components": [ { - "__id__": 691 + "__id__": 692 }, { - "__id__": 693 + "__id__": 694 }, { - "__id__": 695 + "__id__": 696 } ], "_prefab": { - "__id__": 697 + "__id__": 698 }, "_lpos": { "__type__": "cc.Vec3", @@ -13111,6 +13111,9 @@ }, { "__id__": 690 + }, + { + "__id__": 691 } ], "removedComponents": [] @@ -13431,7 +13434,7 @@ "value": { "__type__": "cc.Size", "width": 240, - "height": 76.8 + "height": 56.4 } }, { @@ -13448,7 +13451,7 @@ "propertyPath": [ "_top" ], - "value": 9.064 + "value": 18.264 }, { "__type__": "cc.TargetInfo", @@ -13464,7 +13467,7 @@ "propertyPath": [ "_bottom" ], - "value": 14.136000000000003 + "value": 23.336000000000002 }, { "__type__": "CCPropertyOverrideInfo", @@ -13492,8 +13495,8 @@ ], "value": { "__type__": "cc.Size", - "width": 64, - "height": 41.8 + "width": 86, + "height": 56.4 } }, { @@ -13598,7 +13601,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -17.5, + "y": 0, "z": 0 } }, @@ -13637,7 +13640,7 @@ "propertyPath": [ "_lineHeight" ], - "value": 30 + "value": 40 }, { "__type__": "CCPropertyOverrideInfo", @@ -13647,7 +13650,7 @@ "propertyPath": [ "_fontSize" ], - "value": 30 + "value": 40 }, { "__type__": "CCPropertyOverrideInfo", @@ -13657,7 +13660,7 @@ "propertyPath": [ "_actualFontSize" ], - "value": 30 + "value": 40 }, { "__type__": "CCPropertyOverrideInfo", @@ -13821,7 +13824,7 @@ "propertyPath": [ "_active" ], - "value": true + "value": false }, { "__type__": "CCPropertyOverrideInfo", @@ -13833,6 +13836,16 @@ ], "value": false }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 654 + }, + "propertyPath": [ + "_outlineWidth" + ], + "value": 3 + }, { "__type__": "cc.UITransform", "_name": "", @@ -13843,7 +13856,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 692 + "__id__": 693 }, "_contentSize": { "__type__": "cc.Size", @@ -13871,7 +13884,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 694 + "__id__": 695 }, "_resizeMode": 0, "_layoutType": 1, @@ -13909,7 +13922,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 696 + "__id__": 697 }, "_alignFlags": 4, "_target": null, @@ -13958,26 +13971,26 @@ }, "_children": [ { - "__id__": 699 + "__id__": 700 }, { - "__id__": 726 + "__id__": 727 }, { - "__id__": 732 + "__id__": 733 } ], "_active": true, "_components": [ { - "__id__": 738 + "__id__": 739 }, { - "__id__": 740 + "__id__": 741 } ], "_prefab": { - "__id__": 742 + "__id__": 743 }, "_lpos": { "__type__": "cc.Vec3", @@ -14012,17 +14025,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 698 + "__id__": 699 }, "_prefab": { - "__id__": 700 + "__id__": 701 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 699 + "__id__": 700 }, "asset": { "__uuid__": "c85dc4d5-6ebf-4cee-aa3e-6c027334e622", @@ -14030,7 +14043,7 @@ }, "fileId": "40LEKxke9Hs6tfg2pVspXT", "instance": { - "__id__": 701 + "__id__": 702 }, "targetOverrides": null }, @@ -14043,15 +14056,12 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 702 + "__id__": 703 } ], "propertyOverrides": [ { - "__id__": 706 - }, - { - "__id__": 708 + "__id__": 707 }, { "__id__": 709 @@ -14063,25 +14073,28 @@ "__id__": 711 }, { - "__id__": 713 + "__id__": 712 }, { - "__id__": 715 + "__id__": 714 }, { - "__id__": 717 + "__id__": 716 }, { - "__id__": 719 + "__id__": 718 }, { - "__id__": 721 + "__id__": 720 }, { - "__id__": 723 + "__id__": 722 }, { - "__id__": 725 + "__id__": 724 + }, + { + "__id__": 726 } ], "removedComponents": [] @@ -14089,11 +14102,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 703 + "__id__": 704 }, "components": [ { - "__id__": 704 + "__id__": 705 } ] }, @@ -14109,15 +14122,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 699 + "__id__": 700 } }, "node": { - "__id__": 699 + "__id__": 700 }, "_enabled": true, "__prefab": { - "__id__": 705 + "__id__": 706 }, "_alignFlags": 40, "_target": null, @@ -14146,7 +14159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 707 + "__id__": 708 }, "propertyPath": [ "_name" @@ -14162,7 +14175,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 707 + "__id__": 708 }, "propertyPath": [ "_lpos" @@ -14177,7 +14190,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 707 + "__id__": 708 }, "propertyPath": [ "_lrot" @@ -14193,7 +14206,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 707 + "__id__": 708 }, "propertyPath": [ "_euler" @@ -14208,7 +14221,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 712 + "__id__": 713 }, "propertyPath": [ "_contentSize" @@ -14228,7 +14241,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 714 + "__id__": 715 }, "propertyPath": [ "_contentSize" @@ -14248,7 +14261,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 716 + "__id__": 717 }, "propertyPath": [ "_contentSize" @@ -14268,7 +14281,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 718 + "__id__": 719 }, "propertyPath": [ "_contentSize" @@ -14288,7 +14301,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 720 + "__id__": 721 }, "propertyPath": [ "_color" @@ -14310,7 +14323,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 722 + "__id__": 723 }, "propertyPath": [ "_color" @@ -14332,7 +14345,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 724 + "__id__": 725 }, "propertyPath": [ "_enabled" @@ -14348,7 +14361,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 707 + "__id__": 708 }, "propertyPath": [ "_lscale" @@ -14366,20 +14379,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 699 }, "_children": [], "_active": false, "_components": [ { - "__id__": 727 + "__id__": 728 }, { - "__id__": 729 + "__id__": 730 } ], "_prefab": { - "__id__": 731 + "__id__": 732 }, "_lpos": { "__type__": "cc.Vec3", @@ -14416,11 +14429,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 726 + "__id__": 727 }, "_enabled": true, "__prefab": { - "__id__": 728 + "__id__": 729 }, "_contentSize": { "__type__": "cc.Size", @@ -14444,11 +14457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 726 + "__id__": 727 }, "_enabled": true, "__prefab": { - "__id__": 730 + "__id__": 731 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14525,20 +14538,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 698 + "__id__": 699 }, "_children": [], "_active": true, "_components": [ { - "__id__": 733 + "__id__": 734 }, { - "__id__": 735 + "__id__": 736 } ], "_prefab": { - "__id__": 737 + "__id__": 738 }, "_lpos": { "__type__": "cc.Vec3", @@ -14575,11 +14588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 732 + "__id__": 733 }, "_enabled": true, "__prefab": { - "__id__": 734 + "__id__": 735 }, "_contentSize": { "__type__": "cc.Size", @@ -14603,11 +14616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 732 + "__id__": 733 }, "_enabled": true, "__prefab": { - "__id__": 736 + "__id__": 737 }, "_lineHeight": 22, "_string": "RichText", @@ -14654,11 +14667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 699 }, "_enabled": true, "__prefab": { - "__id__": 739 + "__id__": 740 }, "_contentSize": { "__type__": "cc.Size", @@ -14682,11 +14695,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 698 + "__id__": 699 }, "_enabled": true, "__prefab": { - "__id__": 741 + "__id__": 742 }, "_alignFlags": 4, "_target": null, @@ -14735,7 +14748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 744 + "__id__": 745 }, "_contentSize": { "__type__": "cc.Size", @@ -14763,7 +14776,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 746 + "__id__": 747 }, "_alignFlags": 45, "_target": null, @@ -14812,20 +14825,20 @@ }, "_children": [ { - "__id__": 749 + "__id__": 750 } ], "_active": true, "_components": [ { - "__id__": 757 + "__id__": 758 }, { - "__id__": 759 + "__id__": 760 } ], "_prefab": { - "__id__": 761 + "__id__": 762 }, "_lpos": { "__type__": "cc.Vec3", @@ -14862,23 +14875,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 748 + "__id__": 749 }, "_children": [], "_active": true, "_components": [ { - "__id__": 750 + "__id__": 751 }, { - "__id__": 752 + "__id__": 753 }, { - "__id__": 754 + "__id__": 755 } ], "_prefab": { - "__id__": 756 + "__id__": 757 }, "_lpos": { "__type__": "cc.Vec3", @@ -14915,11 +14928,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 749 + "__id__": 750 }, "_enabled": true, "__prefab": { - "__id__": 751 + "__id__": 752 }, "_contentSize": { "__type__": "cc.Size", @@ -14943,11 +14956,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 749 + "__id__": 750 }, "_enabled": true, "__prefab": { - "__id__": 753 + "__id__": 754 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14991,11 +15004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 749 + "__id__": 750 }, "_enabled": true, "__prefab": { - "__id__": 755 + "__id__": 756 }, "_alignFlags": 45, "_target": null, @@ -15040,11 +15053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 748 + "__id__": 749 }, "_enabled": true, "__prefab": { - "__id__": 758 + "__id__": 759 }, "_contentSize": { "__type__": "cc.Size", @@ -15068,11 +15081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 748 + "__id__": 749 }, "_enabled": true, "__prefab": { - "__id__": 760 + "__id__": 761 }, "_alignFlags": 44, "_target": null, @@ -15121,20 +15134,20 @@ }, "_children": [ { - "__id__": 763 + "__id__": 764 } ], "_active": true, "_components": [ { - "__id__": 855 + "__id__": 856 }, { - "__id__": 857 + "__id__": 858 } ], "_prefab": { - "__id__": 859 + "__id__": 860 }, "_lpos": { "__type__": "cc.Vec3", @@ -15171,33 +15184,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 762 + "__id__": 763 }, "_children": [ { - "__id__": 764 + "__id__": 765 }, { - "__id__": 782 + "__id__": 783 } ], "_active": true, "_components": [ { - "__id__": 848 + "__id__": 849 }, { - "__id__": 850 + "__id__": 851 }, { - "__id__": 779 + "__id__": 780 }, { - "__id__": 852 + "__id__": 853 } ], "_prefab": { - "__id__": 854 + "__id__": 855 }, "_lpos": { "__type__": "cc.Vec3", @@ -15234,30 +15247,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 763 + "__id__": 764 }, "_children": [ { - "__id__": 765 + "__id__": 766 } ], "_active": false, "_components": [ { - "__id__": 771 + "__id__": 772 }, { - "__id__": 773 + "__id__": 774 }, { - "__id__": 775 + "__id__": 776 }, { - "__id__": 777 + "__id__": 778 } ], "_prefab": { - "__id__": 847 + "__id__": 848 }, "_lpos": { "__type__": "cc.Vec3", @@ -15294,20 +15307,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 764 + "__id__": 765 }, "_children": [], "_active": true, "_components": [ { - "__id__": 766 + "__id__": 767 }, { - "__id__": 768 + "__id__": 769 } ], "_prefab": { - "__id__": 770 + "__id__": 771 }, "_lpos": { "__type__": "cc.Vec3", @@ -15344,11 +15357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 765 + "__id__": 766 }, "_enabled": true, "__prefab": { - "__id__": 767 + "__id__": 768 }, "_contentSize": { "__type__": "cc.Size", @@ -15372,11 +15385,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 765 + "__id__": 766 }, "_enabled": true, "__prefab": { - "__id__": 769 + "__id__": 770 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15430,11 +15443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 764 + "__id__": 765 }, "_enabled": true, "__prefab": { - "__id__": 772 + "__id__": 773 }, "_contentSize": { "__type__": "cc.Size", @@ -15458,11 +15471,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 764 + "__id__": 765 }, "_enabled": true, "__prefab": { - "__id__": 774 + "__id__": 775 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15503,11 +15516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 764 + "__id__": 765 }, "_enabled": true, "__prefab": { - "__id__": 776 + "__id__": 777 }, "_alignFlags": 37, "_target": null, @@ -15539,17 +15552,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 764 + "__id__": 765 }, "_enabled": true, "__prefab": { - "__id__": 778 - }, - "_scrollView": { "__id__": 779 }, + "_scrollView": { + "__id__": 780 + }, "_handle": { - "__id__": 768 + "__id__": 769 }, "_direction": 1, "_enableAutoHide": false, @@ -15566,11 +15579,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 763 + "__id__": 764 }, "_enabled": true, "__prefab": { - "__id__": 780 + "__id__": 781 }, "bounceDuration": 0.23, "brake": 0.75, @@ -15581,11 +15594,11 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 781 + "__id__": 782 }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 777 + "__id__": 778 }, "_id": "" }, @@ -15599,42 +15612,42 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 782 + "__id__": 783 }, "_children": [ { - "__id__": 792 + "__id__": 793 }, { - "__id__": 800 + "__id__": 801 }, { - "__id__": 808 + "__id__": 809 }, { - "__id__": 816 + "__id__": 817 }, { - "__id__": 824 + "__id__": 825 }, { - "__id__": 832 + "__id__": 833 } ], "_active": true, "_components": [ { - "__id__": 840 + "__id__": 841 }, { - "__id__": 842 + "__id__": 843 }, { - "__id__": 844 + "__id__": 845 } ], "_prefab": { - "__id__": 846 + "__id__": 847 }, "_lpos": { "__type__": "cc.Vec3", @@ -15671,30 +15684,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 763 + "__id__": 764 }, "_children": [ { - "__id__": 781 + "__id__": 782 } ], "_active": true, "_components": [ { - "__id__": 783 + "__id__": 784 }, { - "__id__": 785 + "__id__": 786 }, { - "__id__": 787 + "__id__": 788 }, { - "__id__": 789 + "__id__": 790 } ], "_prefab": { - "__id__": 791 + "__id__": 792 }, "_lpos": { "__type__": "cc.Vec3", @@ -15731,11 +15744,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 783 }, "_enabled": true, "__prefab": { - "__id__": 784 + "__id__": 785 }, "_contentSize": { "__type__": "cc.Size", @@ -15759,11 +15772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 783 }, "_enabled": true, "__prefab": { - "__id__": 786 + "__id__": 787 }, "_type": 0, "_inverted": false, @@ -15781,11 +15794,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 783 }, "_enabled": true, "__prefab": { - "__id__": 788 + "__id__": 789 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15827,11 +15840,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 782 + "__id__": 783 }, "_enabled": true, "__prefab": { - "__id__": 790 + "__id__": 791 }, "_alignFlags": 45, "_target": null, @@ -15874,17 +15887,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 781 + "__id__": 782 }, "_prefab": { - "__id__": 793 + "__id__": 794 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 792 + "__id__": 793 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -15892,7 +15905,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 794 + "__id__": 795 }, "targetOverrides": null }, @@ -15906,16 +15919,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 795 - }, - { - "__id__": 797 + "__id__": 796 }, { "__id__": 798 }, { "__id__": 799 + }, + { + "__id__": 800 } ], "removedComponents": [] @@ -15923,7 +15936,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 797 }, "propertyPath": [ "_name" @@ -15939,7 +15952,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 797 }, "propertyPath": [ "_lpos" @@ -15954,7 +15967,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 797 }, "propertyPath": [ "_lrot" @@ -15970,7 +15983,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 796 + "__id__": 797 }, "propertyPath": [ "_euler" @@ -15986,17 +15999,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 781 + "__id__": 782 }, "_prefab": { - "__id__": 801 + "__id__": 802 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 800 + "__id__": 801 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -16004,7 +16017,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 802 + "__id__": 803 }, "targetOverrides": null }, @@ -16018,16 +16031,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 803 - }, - { - "__id__": 805 + "__id__": 804 }, { "__id__": 806 }, { "__id__": 807 + }, + { + "__id__": 808 } ], "removedComponents": [] @@ -16035,7 +16048,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 804 + "__id__": 805 }, "propertyPath": [ "_name" @@ -16051,7 +16064,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 804 + "__id__": 805 }, "propertyPath": [ "_lpos" @@ -16066,7 +16079,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 804 + "__id__": 805 }, "propertyPath": [ "_lrot" @@ -16082,7 +16095,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 804 + "__id__": 805 }, "propertyPath": [ "_euler" @@ -16098,17 +16111,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 781 + "__id__": 782 }, "_prefab": { - "__id__": 809 + "__id__": 810 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 808 + "__id__": 809 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -16116,7 +16129,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 810 + "__id__": 811 }, "targetOverrides": null }, @@ -16130,16 +16143,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 811 - }, - { - "__id__": 813 + "__id__": 812 }, { "__id__": 814 }, { "__id__": 815 + }, + { + "__id__": 816 } ], "removedComponents": [] @@ -16147,7 +16160,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 812 + "__id__": 813 }, "propertyPath": [ "_name" @@ -16163,7 +16176,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 812 + "__id__": 813 }, "propertyPath": [ "_lpos" @@ -16178,7 +16191,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 812 + "__id__": 813 }, "propertyPath": [ "_lrot" @@ -16194,7 +16207,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 812 + "__id__": 813 }, "propertyPath": [ "_euler" @@ -16210,17 +16223,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 781 + "__id__": 782 }, "_prefab": { - "__id__": 817 + "__id__": 818 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 816 + "__id__": 817 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -16228,7 +16241,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 818 + "__id__": 819 }, "targetOverrides": null }, @@ -16242,16 +16255,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 819 - }, - { - "__id__": 821 + "__id__": 820 }, { "__id__": 822 }, { "__id__": 823 + }, + { + "__id__": 824 } ], "removedComponents": [] @@ -16259,7 +16272,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 820 + "__id__": 821 }, "propertyPath": [ "_name" @@ -16275,7 +16288,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 820 + "__id__": 821 }, "propertyPath": [ "_lpos" @@ -16290,7 +16303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 820 + "__id__": 821 }, "propertyPath": [ "_lrot" @@ -16306,7 +16319,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 820 + "__id__": 821 }, "propertyPath": [ "_euler" @@ -16322,17 +16335,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 781 + "__id__": 782 }, "_prefab": { - "__id__": 825 + "__id__": 826 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 824 + "__id__": 825 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -16340,7 +16353,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 826 + "__id__": 827 }, "targetOverrides": null }, @@ -16354,16 +16367,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 827 - }, - { - "__id__": 829 + "__id__": 828 }, { "__id__": 830 }, { "__id__": 831 + }, + { + "__id__": 832 } ], "removedComponents": [] @@ -16371,7 +16384,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 828 + "__id__": 829 }, "propertyPath": [ "_name" @@ -16387,7 +16400,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 828 + "__id__": 829 }, "propertyPath": [ "_lpos" @@ -16402,7 +16415,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 828 + "__id__": 829 }, "propertyPath": [ "_lrot" @@ -16418,7 +16431,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 828 + "__id__": 829 }, "propertyPath": [ "_euler" @@ -16434,17 +16447,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 781 + "__id__": 782 }, "_prefab": { - "__id__": 833 + "__id__": 834 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 832 + "__id__": 833 }, "asset": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -16452,7 +16465,7 @@ }, "fileId": "24rlgXRJ9AHLGpMW+aYyEx", "instance": { - "__id__": 834 + "__id__": 835 }, "targetOverrides": null }, @@ -16466,16 +16479,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 835 - }, - { - "__id__": 837 + "__id__": 836 }, { "__id__": 838 }, { "__id__": 839 + }, + { + "__id__": 840 } ], "removedComponents": [] @@ -16483,7 +16496,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 836 + "__id__": 837 }, "propertyPath": [ "_name" @@ -16499,7 +16512,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 836 + "__id__": 837 }, "propertyPath": [ "_lpos" @@ -16514,7 +16527,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 836 + "__id__": 837 }, "propertyPath": [ "_lrot" @@ -16530,7 +16543,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 836 + "__id__": 837 }, "propertyPath": [ "_euler" @@ -16548,11 +16561,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 782 }, "_enabled": true, "__prefab": { - "__id__": 841 + "__id__": 842 }, "_contentSize": { "__type__": "cc.Size", @@ -16576,11 +16589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 782 }, "_enabled": true, "__prefab": { - "__id__": 843 + "__id__": 844 }, "_alignFlags": 13, "_target": null, @@ -16612,11 +16625,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 782 }, "_enabled": true, "__prefab": { - "__id__": 845 + "__id__": 846 }, "_resizeMode": 0, "_layoutType": 1, @@ -16676,11 +16689,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 763 + "__id__": 764 }, "_enabled": true, "__prefab": { - "__id__": 849 + "__id__": 850 }, "_contentSize": { "__type__": "cc.Size", @@ -16704,11 +16717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 763 + "__id__": 764 }, "_enabled": false, "__prefab": { - "__id__": 851 + "__id__": 852 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16749,11 +16762,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 763 + "__id__": 764 }, "_enabled": true, "__prefab": { - "__id__": 853 + "__id__": 854 }, "_alignFlags": 45, "_target": null, @@ -16798,11 +16811,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 762 + "__id__": 763 }, "_enabled": true, "__prefab": { - "__id__": 856 + "__id__": 857 }, "_contentSize": { "__type__": "cc.Size", @@ -16826,11 +16839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 762 + "__id__": 763 }, "_enabled": true, "__prefab": { - "__id__": 858 + "__id__": 859 }, "_alignFlags": 44, "_target": null, @@ -16879,7 +16892,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 861 + "__id__": 862 }, "_contentSize": { "__type__": "cc.Size", @@ -16907,7 +16920,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 863 + "__id__": 864 }, "_alignFlags": 45, "_target": null, @@ -16943,7 +16956,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 865 + "__id__": 866 }, "hero_icon": { "__id__": 96 @@ -16970,7 +16983,7 @@ "__id__": 129 }, "cards_node": { - "__id__": 781 + "__id__": 782 }, "card_lite_prefab": { "__uuid__": "b8313fa7-28e5-4d92-9d64-a1e0ecb040a8", @@ -16986,7 +16999,7 @@ "__id__": 621 }, "fragment_node": { - "__id__": 866 + "__id__": 867 }, "chip_node": { "__id__": 590 @@ -17005,10 +17018,10 @@ "__id__": 102 }, "fragment_label": { - "__id__": 916 + "__id__": 917 }, "upgrade_info_label": { - "__id__": 735 + "__id__": 736 }, "_id": "" }, @@ -17022,20 +17035,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 867 + "__id__": 868 }, "_children": [], "_active": true, "_components": [ { - "__id__": 911 + "__id__": 912 }, { - "__id__": 913 + "__id__": 914 } ], "_prefab": { - "__id__": 915 + "__id__": 916 }, "_lpos": { "__type__": "cc.Vec3", @@ -17074,27 +17087,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 868 + "__id__": 869 }, "_children": [ { - "__id__": 900 + "__id__": 901 }, { - "__id__": 866 + "__id__": 867 } ], - "_active": true, + "_active": false, "_components": [ { - "__id__": 906 + "__id__": 907 }, { - "__id__": 908 + "__id__": 909 } ], "_prefab": { - "__id__": 910 + "__id__": 911 }, "_lpos": { "__type__": "cc.Vec3", @@ -17135,29 +17148,29 @@ }, "_children": [ { - "__id__": 867 + "__id__": 868 }, { - "__id__": 869 + "__id__": 870 }, { - "__id__": 887 + "__id__": 888 } ], "_active": true, "_components": [ { - "__id__": 893 + "__id__": 894 }, { - "__id__": 895 + "__id__": 896 }, { - "__id__": 897 + "__id__": 898 } ], "_prefab": { - "__id__": 899 + "__id__": 900 }, "_lpos": { "__type__": "cc.Vec3", @@ -17196,27 +17209,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 868 + "__id__": 869 }, "_children": [ { - "__id__": 870 + "__id__": 871 }, { - "__id__": 876 + "__id__": 877 } ], "_active": false, "_components": [ { - "__id__": 882 + "__id__": 883 }, { - "__id__": 884 + "__id__": 885 } ], "_prefab": { - "__id__": 886 + "__id__": 887 }, "_lpos": { "__type__": "cc.Vec3", @@ -17253,20 +17266,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 869 + "__id__": 870 }, "_children": [], "_active": true, "_components": [ { - "__id__": 871 + "__id__": 872 }, { - "__id__": 873 + "__id__": 874 } ], "_prefab": { - "__id__": 875 + "__id__": 876 }, "_lpos": { "__type__": "cc.Vec3", @@ -17303,11 +17316,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 870 + "__id__": 871 }, "_enabled": true, "__prefab": { - "__id__": 872 + "__id__": 873 }, "_contentSize": { "__type__": "cc.Size", @@ -17331,11 +17344,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 870 + "__id__": 871 }, "_enabled": true, "__prefab": { - "__id__": 874 + "__id__": 875 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17392,20 +17405,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 869 + "__id__": 870 }, "_children": [], "_active": true, "_components": [ { - "__id__": 877 + "__id__": 878 }, { - "__id__": 879 + "__id__": 880 } ], "_prefab": { - "__id__": 881 + "__id__": 882 }, "_lpos": { "__type__": "cc.Vec3", @@ -17442,11 +17455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 876 + "__id__": 877 }, "_enabled": true, "__prefab": { - "__id__": 878 + "__id__": 879 }, "_contentSize": { "__type__": "cc.Size", @@ -17470,11 +17483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 876 + "__id__": 877 }, "_enabled": true, "__prefab": { - "__id__": 880 + "__id__": 881 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17551,11 +17564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 870 }, "_enabled": true, "__prefab": { - "__id__": 883 + "__id__": 884 }, "_contentSize": { "__type__": "cc.Size", @@ -17579,11 +17592,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 869 + "__id__": 870 }, "_enabled": true, "__prefab": { - "__id__": 885 + "__id__": 886 }, "_resizeMode": 1, "_layoutType": 1, @@ -17632,25 +17645,25 @@ "mountedRoot": null }, "_parent": { - "__id__": 868 + "__id__": 869 }, "_children": [], "_active": true, "_components": [ { - "__id__": 888 + "__id__": 889 }, { - "__id__": 890 + "__id__": 891 } ], "_prefab": { - "__id__": 892 + "__id__": 893 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -17.5, + "y": 0, "z": 0 }, "_lrot": { @@ -17682,16 +17695,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 887 + "__id__": 888 }, "_enabled": true, "__prefab": { - "__id__": 889 + "__id__": 890 }, "_contentSize": { "__type__": "cc.Size", - "width": 64, - "height": 41.8 + "width": 86, + "height": 56.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -17710,11 +17723,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 887 + "__id__": 888 }, "_enabled": true, "__prefab": { - "__id__": 891 + "__id__": 892 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17729,10 +17742,10 @@ "_string": "升级", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, + "_actualFontSize": 40, + "_fontSize": 40, "_fontFamily": "Arial", - "_lineHeight": 30, + "_lineHeight": 40, "_overflow": 0, "_enableWrapText": true, "_font": null, @@ -17751,7 +17764,7 @@ "b": 0, "a": 255 }, - "_outlineWidth": 2, + "_outlineWidth": 3, "_enableShadow": false, "_shadowColor": { "__type__": "cc.Color", @@ -17791,16 +17804,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 869 }, "_enabled": true, "__prefab": { - "__id__": 894 + "__id__": 895 }, "_contentSize": { "__type__": "cc.Size", "width": 240, - "height": 76.8 + "height": 56.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -17819,18 +17832,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 869 }, "_enabled": true, "__prefab": { - "__id__": 896 + "__id__": 897 }, "_alignFlags": 45, "_target": null, "_left": 0, "_right": 0, - "_top": 9.064, - "_bottom": 14.136000000000003, + "_top": 19.264, + "_bottom": 24.336000000000002, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -17855,11 +17868,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 869 }, "_enabled": true, "__prefab": { - "__id__": 898 + "__id__": 899 }, "_resizeMode": 1, "_layoutType": 2, @@ -17906,20 +17919,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 867 + "__id__": 868 }, "_children": [], "_active": false, "_components": [ { - "__id__": 901 + "__id__": 902 }, { - "__id__": 903 + "__id__": 904 } ], "_prefab": { - "__id__": 905 + "__id__": 906 }, "_lpos": { "__type__": "cc.Vec3", @@ -17956,11 +17969,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 900 + "__id__": 901 }, "_enabled": true, "__prefab": { - "__id__": 902 + "__id__": 903 }, "_contentSize": { "__type__": "cc.Size", @@ -17984,11 +17997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 900 + "__id__": 901 }, "_enabled": true, "__prefab": { - "__id__": 904 + "__id__": 905 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18042,11 +18055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 907 + "__id__": 908 }, "_contentSize": { "__type__": "cc.Size", @@ -18070,11 +18083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 868 }, "_enabled": false, "__prefab": { - "__id__": 909 + "__id__": 910 }, "_resizeMode": 1, "_layoutType": 1, @@ -18121,11 +18134,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 866 + "__id__": 867 }, "_enabled": true, "__prefab": { - "__id__": 912 + "__id__": 913 }, "_contentSize": { "__type__": "cc.Size", @@ -18149,11 +18162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 866 + "__id__": 867 }, "_enabled": true, "__prefab": { - "__id__": 914 + "__id__": 915 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18230,11 +18243,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 921 + "__id__": 922 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18300,14 +18313,14 @@ "_active": true, "_components": [ { - "__id__": 918 + "__id__": 919 }, { - "__id__": 916 + "__id__": 917 } ], "_prefab": { - "__id__": 920 + "__id__": 921 }, "_lpos": { "__type__": "cc.Vec3", @@ -18344,11 +18357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 919 + "__id__": 920 }, "_contentSize": { "__type__": "cc.Size", @@ -18393,7 +18406,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 923 + "__id__": 924 }, "_id": "" }, @@ -18413,33 +18426,33 @@ "instance": null, "targetOverrides": [ { - "__id__": 925 + "__id__": 926 }, { - "__id__": 927 + "__id__": 928 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 832 + "__id__": 833 }, { - "__id__": 824 + "__id__": 825 }, { - "__id__": 816 + "__id__": 817 }, { - "__id__": 808 + "__id__": 809 }, { - "__id__": 800 + "__id__": 801 }, { - "__id__": 792 + "__id__": 793 }, { - "__id__": 699 + "__id__": 700 }, { "__id__": 621 @@ -18488,7 +18501,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 864 + "__id__": 865 }, "sourceInfo": null, "propertyPath": [ @@ -18498,7 +18511,7 @@ "__id__": 621 }, "targetInfo": { - "__id__": 926 + "__id__": 927 } }, { @@ -18510,7 +18523,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 864 + "__id__": 865 }, "sourceInfo": null, "propertyPath": [ @@ -18520,7 +18533,7 @@ "__id__": 590 }, "targetInfo": { - "__id__": 928 + "__id__": 929 } }, { diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 18a85972..db926f7c 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,26 +22,26 @@ "__id__": 2 }, { - "__id__": 280 + "__id__": 302 }, { - "__id__": 262 + "__id__": 284 } ], "_active": true, "_components": [ { - "__id__": 289 + "__id__": 311 }, { - "__id__": 291 + "__id__": 313 }, { - "__id__": 293 + "__id__": 315 } ], "_prefab": { - "__id__": 295 + "__id__": 317 }, "_lpos": { "__type__": "cc.Vec3", @@ -91,23 +91,23 @@ "__id__": 77 }, { - "__id__": 125 + "__id__": 131 } ], "_active": true, "_components": [ { - "__id__": 256 + "__id__": 278 }, { - "__id__": 258 + "__id__": 280 }, { - "__id__": 260 + "__id__": 282 } ], "_prefab": { - "__id__": 279 + "__id__": 301 }, "_lpos": { "__type__": "cc.Vec3", @@ -1163,23 +1163,23 @@ "__id__": 78 }, { - "__id__": 98 + "__id__": 104 }, { - "__id__": 107 + "__id__": 113 } ], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 126 }, { - "__id__": 122 + "__id__": 128 } ], "_prefab": { - "__id__": 124 + "__id__": 130 }, "_lpos": { "__type__": "cc.Vec3", @@ -1236,7 +1236,10 @@ }, "targetOverrides": [ { - "__id__": 95 + "__id__": 98 + }, + { + "__id__": 101 } ] }, @@ -1275,6 +1278,12 @@ }, { "__id__": 93 + }, + { + "__id__": 95 + }, + { + "__id__": 97 } ], "removedComponents": [] @@ -1428,6 +1437,33 @@ "e03E8E9MNHWqlyzsRwdhQj" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 96 + }, + "propertyPath": [ + "_top" + ], + "value": 19.264 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "11zOlOXhVHUJv5IO7G4ABU", + "71o6/V/3VMMZ/CnSZBIkZ0" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 96 + }, + "propertyPath": [ + "_bottom" + ], + "value": 24.336000000000002 + }, { "__type__": "cc.TargetOverrideInfo", "source": null, @@ -1436,10 +1472,10 @@ "fragment_node" ], "target": { - "__id__": 96 + "__id__": 99 }, "targetInfo": { - "__id__": 97 + "__id__": 100 } }, { @@ -1452,6 +1488,30 @@ "bfLo+sXdxPSY6pJ+TTshHA" ] }, + { + "__type__": "cc.TargetOverrideInfo", + "source": null, + "sourceInfo": null, + "propertyPath": [ + "fragment_label" + ], + "target": { + "__id__": 102 + }, + "targetInfo": { + "__id__": 103 + } + }, + { + "__type__": "cc.Node", + "__editorExtras__": {} + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "bckAjBBO9Ob5COKSUTDEcI" + ] + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -1459,14 +1519,14 @@ "__id__": 77 }, "_prefab": { - "__id__": 99 + "__id__": 105 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 98 + "__id__": 104 }, "asset": { "__uuid__": "b0c70366-b71c-4ccd-b0fd-90af5149be5e", @@ -1474,7 +1534,7 @@ }, "fileId": "f2zPd6AOdBrIgj89xLzmRM", "instance": { - "__id__": 100 + "__id__": 106 }, "targetOverrides": null }, @@ -1488,19 +1548,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 101 + "__id__": 107 }, { - "__id__": 103 + "__id__": 109 }, { - "__id__": 104 + "__id__": 110 }, { - "__id__": 105 + "__id__": 111 }, { - "__id__": 106 + "__id__": 112 } ], "removedComponents": [] @@ -1508,7 +1568,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 108 }, "propertyPath": [ "_name" @@ -1524,7 +1584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 108 }, "propertyPath": [ "_lpos" @@ -1539,7 +1599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 108 }, "propertyPath": [ "_lrot" @@ -1555,7 +1615,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 108 }, "propertyPath": [ "_euler" @@ -1570,7 +1630,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 108 }, "propertyPath": [ "_active" @@ -1584,14 +1644,14 @@ "__id__": 77 }, "_prefab": { - "__id__": 108 + "__id__": 114 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 107 + "__id__": 113 }, "asset": { "__uuid__": "6ab76980-0704-4190-9acf-ec5ab44a33b0", @@ -1599,7 +1659,7 @@ }, "fileId": "84hrfbDo1AOq3VROGZvWWt", "instance": { - "__id__": 109 + "__id__": 115 }, "targetOverrides": null }, @@ -1612,26 +1672,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 110 - }, - { - "__id__": 112 - }, - { - "__id__": 113 - }, - { - "__id__": 114 - }, - { - "__id__": 115 - }, { "__id__": 116 }, { "__id__": 118 + }, + { + "__id__": 119 + }, + { + "__id__": 120 + }, + { + "__id__": 121 + }, + { + "__id__": 122 + }, + { + "__id__": 124 } ], "removedComponents": [] @@ -1639,7 +1699,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 117 }, "propertyPath": [ "_name" @@ -1655,7 +1715,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 117 }, "propertyPath": [ "_lpos" @@ -1670,7 +1730,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 117 }, "propertyPath": [ "_lrot" @@ -1686,7 +1746,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 117 }, "propertyPath": [ "_euler" @@ -1701,7 +1761,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 117 }, "propertyPath": [ "_active" @@ -1711,7 +1771,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 117 + "__id__": 123 }, "propertyPath": [ "_active" @@ -1727,7 +1787,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 119 + "__id__": 125 }, "propertyPath": [ "_active" @@ -1750,7 +1810,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 127 }, "_contentSize": { "__type__": "cc.Size", @@ -1778,7 +1838,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 129 }, "_alignFlags": 45, "_target": null, @@ -1827,23 +1887,23 @@ }, "_children": [ { - "__id__": 126 + "__id__": 132 }, { - "__id__": 134 + "__id__": 140 } ], "_active": true, "_components": [ { - "__id__": 251 + "__id__": 273 }, { - "__id__": 253 + "__id__": 275 } ], "_prefab": { - "__id__": 255 + "__id__": 277 }, "_lpos": { "__type__": "cc.Vec3", @@ -1880,23 +1940,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 131 }, "_children": [], "_active": true, "_components": [ { - "__id__": 127 + "__id__": 133 }, { - "__id__": 129 + "__id__": 135 }, { - "__id__": 131 + "__id__": 137 } ], "_prefab": { - "__id__": 133 + "__id__": 139 }, "_lpos": { "__type__": "cc.Vec3", @@ -1933,11 +1993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 134 }, "_contentSize": { "__type__": "cc.Size", @@ -1961,11 +2021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 136 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2006,11 +2066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 132 }, "_enabled": true, "__prefab": { - "__id__": 132 + "__id__": 138 }, "_alignFlags": 44, "_target": null, @@ -2055,33 +2115,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 131 }, "_children": [ { - "__id__": 135 + "__id__": 141 }, { - "__id__": 175 + "__id__": 189 }, { - "__id__": 206 + "__id__": 220 } ], "_active": true, "_components": [ { - "__id__": 244 + "__id__": 266 }, { - "__id__": 246 + "__id__": 268 }, { - "__id__": 248 + "__id__": 270 } ], "_prefab": { - "__id__": 250 + "__id__": 272 }, "_lpos": { "__type__": "cc.Vec3", @@ -2116,17 +2176,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 134 + "__id__": 140 }, "_prefab": { - "__id__": 136 + "__id__": 142 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 135 + "__id__": 141 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -2134,7 +2194,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 137 + "__id__": 143 }, "targetOverrides": null }, @@ -2144,45 +2204,25 @@ "prefabRootNode": { "__id__": 1 }, - "mountedChildren": [], + "mountedChildren": [ + { + "__id__": 144 + } + ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 138 + "__id__": 152 }, { - "__id__": 140 - }, - { - "__id__": 141 - }, - { - "__id__": 142 - }, - { - "__id__": 143 - }, - { - "__id__": 145 - }, - { - "__id__": 146 - }, - { - "__id__": 147 - }, - { - "__id__": 149 - }, - { - "__id__": 151 - }, - { - "__id__": 153 + "__id__": 154 }, { "__id__": 155 }, + { + "__id__": 156 + }, { "__id__": 157 }, @@ -2190,22 +2230,19 @@ "__id__": 159 }, { - "__id__": 161 + "__id__": 160 }, { - "__id__": 162 + "__id__": 161 }, { "__id__": 163 }, { - "__id__": 164 + "__id__": 165 }, { - "__id__": 166 - }, - { - "__id__": 168 + "__id__": 167 }, { "__id__": 169 @@ -2214,18 +2251,202 @@ "__id__": 171 }, { - "__id__": 172 + "__id__": 173 }, { - "__id__": 174 + "__id__": 175 + }, + { + "__id__": 176 + }, + { + "__id__": 177 + }, + { + "__id__": 178 + }, + { + "__id__": 180 + }, + { + "__id__": 182 + }, + { + "__id__": 183 + }, + { + "__id__": 185 + }, + { + "__id__": 186 + }, + { + "__id__": 188 } ], "removedComponents": [] }, + { + "__type__": "cc.MountedChildrenInfo", + "targetInfo": { + "__id__": 145 + }, + "nodes": [ + { + "__id__": 146 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cfWG6+EKVJ3IlHCuz5Pa35" + ] + }, + { + "__type__": "cc.Node", + "_name": "red_dot", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 141 + } + }, + "_parent": { + "__id__": 141 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 147 + }, + { + "__id__": 149 + } + ], + "_prefab": { + "__id__": 151 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 95, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 146 + }, + "_enabled": true, + "__prefab": { + "__id__": 148 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 36, + "height": 36 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fcrsLhzSxL4YbMriCJ4z/8" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 146 + }, + "_enabled": true, + "__prefab": { + "__id__": 150 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@13522", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fcWO4RpUZGS5EWIYNKtrhl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8dNo9k1ZlOXo9p5J1tHKcd", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 153 }, "propertyPath": [ "_name" @@ -2241,7 +2462,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 153 }, "propertyPath": [ "_lpos" @@ -2256,7 +2477,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 153 }, "propertyPath": [ "_lrot" @@ -2272,7 +2493,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 153 }, "propertyPath": [ "_euler" @@ -2287,7 +2508,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 144 + "__id__": 158 }, "propertyPath": [ "clickEvents", @@ -2307,7 +2528,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 144 + "__id__": 158 }, "propertyPath": [ "clickEvents", @@ -2319,7 +2540,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 144 + "__id__": 158 }, "propertyPath": [ "clickEvents", @@ -2331,7 +2552,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 148 + "__id__": 162 }, "propertyPath": [ "_contentSize" @@ -2351,7 +2572,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 150 + "__id__": 164 }, "propertyPath": [ "_contentSize" @@ -2371,7 +2592,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 152 + "__id__": 166 }, "propertyPath": [ "_lpos" @@ -2392,7 +2613,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 154 + "__id__": 168 }, "propertyPath": [ "_contentSize" @@ -2412,7 +2633,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 156 + "__id__": 170 }, "propertyPath": [ "_contentSize" @@ -2432,7 +2653,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 158 + "__id__": 172 }, "propertyPath": [ "_contentSize" @@ -2452,7 +2673,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 160 + "__id__": 174 }, "propertyPath": [ "_lpos" @@ -2473,7 +2694,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 144 + "__id__": 158 }, "propertyPath": [ "clickEvents", @@ -2485,7 +2706,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 152 + "__id__": 166 }, "propertyPath": [ "_active" @@ -2495,7 +2716,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 153 }, "propertyPath": [ "_active" @@ -2505,7 +2726,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 165 + "__id__": 179 }, "propertyPath": [ "_contentSize" @@ -2525,7 +2746,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 167 + "__id__": 181 }, "propertyPath": [ "_spriteFrame" @@ -2544,7 +2765,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 167 + "__id__": 181 }, "propertyPath": [ "_atlas" @@ -2557,7 +2778,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 184 }, "propertyPath": [ "_string" @@ -2573,7 +2794,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 184 }, "propertyPath": [ "_fontSize" @@ -2583,7 +2804,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 173 + "__id__": 187 }, "propertyPath": [ "_contentSize" @@ -2603,7 +2824,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 184 }, "propertyPath": [ "_actualFontSize" @@ -2614,17 +2835,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 134 + "__id__": 140 }, "_prefab": { - "__id__": 176 + "__id__": 190 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 175 + "__id__": 189 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -2632,7 +2853,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 177 + "__id__": 191 }, "targetOverrides": null }, @@ -2646,47 +2867,26 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 178 + "__id__": 192 }, { - "__id__": 180 - }, - { - "__id__": 181 - }, - { - "__id__": 182 - }, - { - "__id__": 183 - }, - { - "__id__": 185 - }, - { - "__id__": 186 - }, - { - "__id__": 187 - }, - { - "__id__": 189 - }, - { - "__id__": 191 - }, - { - "__id__": 193 + "__id__": 194 }, { "__id__": 195 }, + { + "__id__": 196 + }, { "__id__": 197 }, { "__id__": 199 }, + { + "__id__": 200 + }, { "__id__": 201 }, @@ -2695,6 +2895,27 @@ }, { "__id__": 205 + }, + { + "__id__": 207 + }, + { + "__id__": 209 + }, + { + "__id__": 211 + }, + { + "__id__": 213 + }, + { + "__id__": 215 + }, + { + "__id__": 217 + }, + { + "__id__": 219 } ], "removedComponents": [] @@ -2702,7 +2923,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 179 + "__id__": 193 }, "propertyPath": [ "_name" @@ -2718,7 +2939,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 179 + "__id__": 193 }, "propertyPath": [ "_lpos" @@ -2733,7 +2954,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 179 + "__id__": 193 }, "propertyPath": [ "_lrot" @@ -2749,7 +2970,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 179 + "__id__": 193 }, "propertyPath": [ "_euler" @@ -2764,7 +2985,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 184 + "__id__": 198 }, "propertyPath": [ "clickEvents", @@ -2784,7 +3005,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 184 + "__id__": 198 }, "propertyPath": [ "clickEvents", @@ -2796,7 +3017,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 184 + "__id__": 198 }, "propertyPath": [ "clickEvents", @@ -2808,7 +3029,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 188 + "__id__": 202 }, "propertyPath": [ "_contentSize" @@ -2828,7 +3049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 190 + "__id__": 204 }, "propertyPath": [ "_contentSize" @@ -2848,7 +3069,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 192 + "__id__": 206 }, "propertyPath": [ "_lpos" @@ -2869,7 +3090,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 194 + "__id__": 208 }, "propertyPath": [ "_contentSize" @@ -2889,7 +3110,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 196 + "__id__": 210 }, "propertyPath": [ "_contentSize" @@ -2909,7 +3130,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 198 + "__id__": 212 }, "propertyPath": [ "_contentSize" @@ -2929,7 +3150,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 200 + "__id__": 214 }, "propertyPath": [ "_lpos" @@ -2950,7 +3171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 202 + "__id__": 216 }, "propertyPath": [ "_fontSize" @@ -2966,7 +3187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 204 + "__id__": 218 }, "propertyPath": [ "_contentSize" @@ -2986,7 +3207,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 202 + "__id__": 216 }, "propertyPath": [ "_actualFontSize" @@ -2997,17 +3218,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 134 + "__id__": 140 }, "_prefab": { - "__id__": 207 + "__id__": 221 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 206 + "__id__": 220 }, "asset": { "__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510", @@ -3015,7 +3236,7 @@ }, "fileId": "cfWG6+EKVJ3IlHCuz5Pa35", "instance": { - "__id__": 208 + "__id__": 222 }, "targetOverrides": null }, @@ -3025,66 +3246,34 @@ "prefabRootNode": { "__id__": 1 }, - "mountedChildren": [], + "mountedChildren": [ + { + "__id__": 223 + } + ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 209 - }, - { - "__id__": 211 - }, - { - "__id__": 212 - }, - { - "__id__": 213 - }, - { - "__id__": 214 - }, - { - "__id__": 216 - }, - { - "__id__": 217 - }, - { - "__id__": 218 - }, - { - "__id__": 220 - }, - { - "__id__": 222 - }, - { - "__id__": 224 - }, - { - "__id__": 226 - }, - { - "__id__": 228 - }, - { - "__id__": 230 - }, - { - "__id__": 232 + "__id__": 231 }, { "__id__": 233 }, + { + "__id__": 234 + }, { "__id__": 235 }, { - "__id__": 237 + "__id__": 236 }, { "__id__": 238 }, + { + "__id__": 239 + }, { "__id__": 240 }, @@ -3092,15 +3281,208 @@ "__id__": 242 }, { - "__id__": 243 + "__id__": 244 + }, + { + "__id__": 246 + }, + { + "__id__": 248 + }, + { + "__id__": 250 + }, + { + "__id__": 252 + }, + { + "__id__": 254 + }, + { + "__id__": 255 + }, + { + "__id__": 257 + }, + { + "__id__": 259 + }, + { + "__id__": 260 + }, + { + "__id__": 262 + }, + { + "__id__": 264 + }, + { + "__id__": 265 } ], "removedComponents": [] }, + { + "__type__": "cc.MountedChildrenInfo", + "targetInfo": { + "__id__": 224 + }, + "nodes": [ + { + "__id__": 225 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cfWG6+EKVJ3IlHCuz5Pa35" + ] + }, + { + "__type__": "cc.Node", + "_name": "red_dot", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 220 + } + }, + "_parent": { + "__id__": 220 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 226 + }, + { + "__id__": 228 + } + ], + "_prefab": { + "__id__": 230 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 95, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 225 + }, + "_enabled": true, + "__prefab": { + "__id__": 227 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 36, + "height": 36 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "deqaJuY1xIuY0yg7URCQhO" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 225 + }, + "_enabled": true, + "__prefab": { + "__id__": 229 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@13522", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "abgzqGIqdF4bbb/r8X1HiH" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d2oMmyHIBE962awDDZFuhX", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 210 + "__id__": 232 }, "propertyPath": [ "_name" @@ -3116,7 +3498,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 210 + "__id__": 232 }, "propertyPath": [ "_lpos" @@ -3131,7 +3513,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 210 + "__id__": 232 }, "propertyPath": [ "_lrot" @@ -3147,7 +3529,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 210 + "__id__": 232 }, "propertyPath": [ "_euler" @@ -3162,7 +3544,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 215 + "__id__": 237 }, "propertyPath": [ "clickEvents", @@ -3182,7 +3564,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 215 + "__id__": 237 }, "propertyPath": [ "clickEvents", @@ -3194,7 +3576,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 215 + "__id__": 237 }, "propertyPath": [ "clickEvents", @@ -3206,7 +3588,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 219 + "__id__": 241 }, "propertyPath": [ "_contentSize" @@ -3226,7 +3608,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 221 + "__id__": 243 }, "propertyPath": [ "_contentSize" @@ -3246,7 +3628,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 223 + "__id__": 245 }, "propertyPath": [ "_lpos" @@ -3267,7 +3649,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 225 + "__id__": 247 }, "propertyPath": [ "_contentSize" @@ -3287,7 +3669,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 227 + "__id__": 249 }, "propertyPath": [ "_contentSize" @@ -3307,7 +3689,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 229 + "__id__": 251 }, "propertyPath": [ "_contentSize" @@ -3327,7 +3709,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 253 }, "propertyPath": [ "_lpos" @@ -3348,7 +3730,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 223 + "__id__": 245 }, "propertyPath": [ "_active" @@ -3358,7 +3740,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 234 + "__id__": 256 }, "propertyPath": [ "_contentSize" @@ -3378,7 +3760,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 236 + "__id__": 258 }, "propertyPath": [ "_spriteFrame" @@ -3397,7 +3779,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 236 + "__id__": 258 }, "propertyPath": [ "_atlas" @@ -3410,7 +3792,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 239 + "__id__": 261 }, "propertyPath": [ "_fontSize" @@ -3426,7 +3808,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 263 }, "propertyPath": [ "_contentSize" @@ -3446,7 +3828,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 239 + "__id__": 261 }, "propertyPath": [ "_actualFontSize" @@ -3456,7 +3838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 239 + "__id__": 261 }, "propertyPath": [ "_string" @@ -3469,11 +3851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 267 }, "_contentSize": { "__type__": "cc.Size", @@ -3497,11 +3879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 269 }, "_alignFlags": 44, "_target": null, @@ -3533,11 +3915,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 271 }, "_resizeMode": 1, "_layoutType": 1, @@ -3584,11 +3966,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 274 }, "_contentSize": { "__type__": "cc.Size", @@ -3612,11 +3994,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 131 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 276 }, "_alignFlags": 44, "_target": null, @@ -3665,7 +4047,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 279 }, "_contentSize": { "__type__": "cc.Size", @@ -3693,7 +4075,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 281 }, "_alignFlags": 21, "_target": null, @@ -3729,32 +4111,32 @@ }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 283 }, "start_btn": { "__id__": 18 }, "home_btn": { - "__id__": 175 + "__id__": 189 }, "hero_btn": { - "__id__": 135 + "__id__": 141 }, "rank_btn": null, "tals_btn": { - "__id__": 206 + "__id__": 220 }, "top_bar_node": { - "__id__": 262 + "__id__": 284 }, "heros_page": { "__id__": 78 }, "talents_page": { - "__id__": 98 + "__id__": 104 }, "ranks_page": { - "__id__": 107 + "__id__": 113 }, "_id": "" }, @@ -3769,14 +4151,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 263 + "__id__": 285 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 262 + "__id__": 284 }, "asset": { "__uuid__": "56aee962-4a5e-45ae-a779-999444d06d18", @@ -3784,7 +4166,7 @@ }, "fileId": "cboM54s0hM07XCtrpFp0/b", "instance": { - "__id__": 264 + "__id__": 286 }, "targetOverrides": null }, @@ -3798,34 +4180,34 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 265 + "__id__": 287 }, { - "__id__": 267 + "__id__": 289 }, { - "__id__": 268 + "__id__": 290 }, { - "__id__": 269 + "__id__": 291 }, { - "__id__": 270 + "__id__": 292 }, { - "__id__": 272 + "__id__": 294 }, { - "__id__": 273 + "__id__": 295 }, { - "__id__": 274 + "__id__": 296 }, { - "__id__": 275 + "__id__": 297 }, { - "__id__": 277 + "__id__": 299 } ], "removedComponents": [] @@ -3833,7 +4215,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 266 + "__id__": 288 }, "propertyPath": [ "_name" @@ -3849,7 +4231,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 266 + "__id__": 288 }, "propertyPath": [ "_lpos" @@ -3864,7 +4246,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 266 + "__id__": 288 }, "propertyPath": [ "_lrot" @@ -3880,7 +4262,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 266 + "__id__": 288 }, "propertyPath": [ "_euler" @@ -3895,7 +4277,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 271 + "__id__": 293 }, "propertyPath": [ "_top" @@ -3911,7 +4293,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 271 + "__id__": 293 }, "propertyPath": [ "_alignFlags" @@ -3921,7 +4303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 271 + "__id__": 293 }, "propertyPath": [ "_bottom" @@ -3931,7 +4313,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 266 + "__id__": 288 }, "propertyPath": [ "_active" @@ -3941,7 +4323,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 276 + "__id__": 298 }, "propertyPath": [ "_active" @@ -3957,7 +4339,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 278 + "__id__": 300 }, "propertyPath": [ "_active" @@ -3990,14 +4372,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 281 + "__id__": 303 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 280 + "__id__": 302 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -4005,7 +4387,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 282 + "__id__": 304 }, "targetOverrides": null }, @@ -4019,19 +4401,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 283 + "__id__": 305 }, { - "__id__": 285 + "__id__": 307 }, { - "__id__": 286 + "__id__": 308 }, { - "__id__": 287 + "__id__": 309 }, { - "__id__": 288 + "__id__": 310 } ], "removedComponents": [] @@ -4039,7 +4421,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 306 }, "propertyPath": [ "_name" @@ -4055,7 +4437,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 306 }, "propertyPath": [ "_lpos" @@ -4070,7 +4452,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 306 }, "propertyPath": [ "_lrot" @@ -4086,7 +4468,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 306 }, "propertyPath": [ "_euler" @@ -4101,7 +4483,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 306 }, "propertyPath": [ "_active" @@ -4118,7 +4500,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 290 + "__id__": 312 }, "_contentSize": { "__type__": "cc.Size", @@ -4146,7 +4528,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 314 }, "_alignFlags": 45, "_target": null, @@ -4182,7 +4564,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 316 }, "debugMode": false, "_id": "" @@ -4203,42 +4585,42 @@ "instance": null, "targetOverrides": [ { - "__id__": 296 + "__id__": 318 }, { - "__id__": 299 + "__id__": 321 + }, + { + "__id__": 324 + }, + { + "__id__": 327 + }, + { + "__id__": 330 + } + ], + "nestedPrefabInstanceRoots": [ + { + "__id__": 284 }, { "__id__": 302 }, { - "__id__": 305 + "__id__": 220 }, { - "__id__": 308 - } - ], - "nestedPrefabInstanceRoots": [ - { - "__id__": 262 + "__id__": 189 }, { - "__id__": 280 + "__id__": 141 }, { - "__id__": 206 + "__id__": 113 }, { - "__id__": 175 - }, - { - "__id__": 135 - }, - { - "__id__": 107 - }, - { - "__id__": 98 + "__id__": 104 }, { "__id__": 78 @@ -4260,7 +4642,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 297 + "__id__": 319 }, "propertyPath": [ "hero1" @@ -4269,7 +4651,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 298 + "__id__": 320 } }, { @@ -4290,7 +4672,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 300 + "__id__": 322 }, "propertyPath": [ "hero2" @@ -4299,7 +4681,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 301 + "__id__": 323 } }, { @@ -4320,7 +4702,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 303 + "__id__": 325 }, "propertyPath": [ "hero3" @@ -4329,7 +4711,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 304 + "__id__": 326 } }, { @@ -4350,7 +4732,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 306 + "__id__": 328 }, "propertyPath": [ "hero4" @@ -4359,7 +4741,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 307 + "__id__": 329 } }, { @@ -4380,7 +4762,7 @@ "__id__": 3 }, "sourceInfo": { - "__id__": 309 + "__id__": 331 }, "propertyPath": [ "hero5" @@ -4389,7 +4771,7 @@ "__id__": 3 }, "targetInfo": { - "__id__": 310 + "__id__": 332 } }, { diff --git a/assets/script/game/map/HerosListComp.ts b/assets/script/game/map/HerosListComp.ts index c29f781f..476e1e62 100644 --- a/assets/script/game/map/HerosListComp.ts +++ b/assets/script/game/map/HerosListComp.ts @@ -114,6 +114,18 @@ export class HerosListComp extends CCComp { @property(RichText) upgrade_info_label = null! + /** 卡片宽度 */ + @property + card_w = 120 + + /** 卡片横向间隔 */ + @property + spacing_x = 10 + + /** 卡片左右边距 */ + @property + margin_x = 15 + // ======================== 运行时状态 ======================== huuid: number = 0 @@ -364,6 +376,11 @@ export class HerosListComp extends CCComp { const total = this.cards_node.children.length if (total === 0) return + // 宽度 = 卡片总宽 + 卡片间隔 + 左右边距 + const contentW = total * this.card_w + + (total - 1) * this.spacing_x + + this.margin_x * 2 + const cols = 4 const rows = Math.ceil(total / cols) const cardH = 200 @@ -372,11 +389,11 @@ export class HerosListComp extends CCComp { const uiTrans = this.cards_node.getComponent(UITransform) if (uiTrans) { - uiTrans.setContentSize(uiTrans.width, contentH) + uiTrans.setContentSize(contentW, contentH) } mLogger.log(this.debugMode, "HerosListComp", "updateContentSize", { - total, cols, rows, contentH, + total, cols, rows, contentW, contentH, }) } diff --git a/assets/script/game/map/MissionHomeComp.ts b/assets/script/game/map/MissionHomeComp.ts index 0ec3a90b..67606778 100644 --- a/assets/script/game/map/MissionHomeComp.ts +++ b/assets/script/game/map/MissionHomeComp.ts @@ -26,6 +26,8 @@ import { GameEvent } from "../common/config/GameEvent"; import { Timer } from "db://oops-framework/core/common/timer/Timer"; import { mLogger } from "../common/Logger"; import { UIID } from "../common/config/GameUIConfig"; +import { HeroList } from "../common/config/heroSet"; +import { canHeroUpgrade } from "../common/config/heroUpSet"; const { ccclass, property } = _decorator; @@ -84,6 +86,14 @@ export class MissionHomeComp extends CCComp { /** 注册任务结束事件 */ protected onLoad(): void { this.on(GameEvent.MissionEnd, this.mission_end, this) + // oops.message 事件总线：成长/天赋数据变化时刷新页签红点 + oops.message.on(GameEvent.HERO_GROWTH_UPDATE, this.refreshRedDots, this) + oops.message.on(GameEvent.TALENT_UPDATE, this.refreshRedDots, this) + } + + protected onDestroy(): void { + oops.message.off(GameEvent.HERO_GROWTH_UPDATE, this.refreshRedDots, this) + oops.message.off(GameEvent.TALENT_UPDATE, this.refreshRedDots, this) } /** 启动时显示主页 */ @@ -97,6 +107,8 @@ export class MissionHomeComp extends CCComp { } onEnable() { + // 节点重新激活时补刷一次红点（事件分发期间本节点可能处于隐藏态） + this.refreshRedDots() } update(dt: number) { @@ -233,6 +245,32 @@ export class MissionHomeComp extends CCComp { if (child) child.active = active } + /** + * 刷新页签按钮红点： + * - hero_btn/red_dot：任意英雄碎片满足升级条件（canHeroUpgrade）时显示 + * - tals_btn/red_dot：存在未分配的天赋点（talent_points > 0）时显示 + */ + private refreshRedDots() { + this.setRedDot(this.hero_btn, this.hasUpgradableHero()) + this.setRedDot(this.tals_btn, smc.getTalentPoints() > 0) + } + + /** 遍历全量英雄，判定是否存在可升级者（未满级且碎片充足） */ + private hasUpgradableHero(): boolean { + for (const uuid of HeroList) { + const growth = smc.getHeroGrowth(uuid); + if (canHeroUpgrade(growth.lv, growth.fragments)) return true; + } + return false; + } + + /** 切换按钮下 red_dot 子节点的显示 */ + private setRedDot(btn: Node, active: boolean) { + if (!btn || !btn.isValid) return + const dot = btn.getChildByName("red_dot") + if (dot) dot.active = active + } + openRanks() { this.showPage(this.ranks_page) } @@ -254,6 +292,7 @@ export class MissionHomeComp extends CCComp { this.stopStartGuide(); this.uodate_data() this.hideAllPages() + this.refreshRedDots() this.node.active = true // 播放主页背景音乐，恢复默认音量 oops.audio.volumeMusic = 1.0;