diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index aba7aaf3..64573741 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -25,23 +25,23 @@ "__id__": 725 }, { - "__id__": 773 + "__id__": 774 } ], "_active": true, "_components": [ { - "__id__": 981 + "__id__": 982 }, { - "__id__": 983 + "__id__": 984 }, { - "__id__": 985 + "__id__": 986 } ], "_prefab": { - "__id__": 987 + "__id__": 988 }, "_lpos": { "__type__": "cc.Vec3", @@ -15760,17 +15760,17 @@ "_active": true, "_components": [ { - "__id__": 766 + "__id__": 767 }, { - "__id__": 768 + "__id__": 769 }, { - "__id__": 770 + "__id__": 771 } ], "_prefab": { - "__id__": 772 + "__id__": 773 }, "_lpos": { "__type__": "cc.Vec3", @@ -15817,14 +15817,14 @@ "_active": true, "_components": [ { - "__id__": 761 + "__id__": 762 }, { - "__id__": 763 + "__id__": 764 } ], "_prefab": { - "__id__": 765 + "__id__": 766 }, "_lpos": { "__type__": "cc.Vec3", @@ -15887,7 +15887,7 @@ } ], "_prefab": { - "__id__": 760 + "__id__": 761 }, "_lpos": { "__type__": "cc.Vec3", @@ -16517,6 +16517,9 @@ "clickEvents": [ { "__id__": 759 + }, + { + "__id__": 760 } ], "_interactable": true, @@ -16571,7 +16574,17 @@ }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", - "handler": "to_start", + "handler": "start_mission", + "customEventData": "" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 2 + }, + "component": "", + "_componentId": "e7482dUVpJEJZzHkqJl1ZWP", + "handler": "mission_start", "customEventData": "" }, { @@ -16597,7 +16610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 762 + "__id__": 763 }, "_contentSize": { "__type__": "cc.Size", @@ -16625,7 +16638,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 764 + "__id__": 765 }, "_resizeMode": 0, "_layoutType": 0, @@ -16676,7 +16689,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 767 + "__id__": 768 }, "_contentSize": { "__type__": "cc.Size", @@ -16704,7 +16717,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 769 + "__id__": 770 }, "_alignFlags": 20, "_target": null, @@ -16740,7 +16753,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 771 + "__id__": 772 }, "_id": "" }, @@ -16771,35 +16784,35 @@ }, "_children": [ { - "__id__": 774 + "__id__": 775 }, { - "__id__": 814 + "__id__": 815 }, { - "__id__": 854 + "__id__": 855 }, { - "__id__": 894 + "__id__": 895 }, { - "__id__": 934 + "__id__": 935 } ], "_active": true, "_components": [ { - "__id__": 974 + "__id__": 975 }, { - "__id__": 976 + "__id__": 977 }, { - "__id__": 978 + "__id__": 979 } ], "_prefab": { - "__id__": 980 + "__id__": 981 }, "_lpos": { "__type__": "cc.Vec3", @@ -16836,33 +16849,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 773 + "__id__": 774 }, "_children": [ { - "__id__": 775 + "__id__": 776 }, { - "__id__": 781 + "__id__": 782 }, { - "__id__": 787 + "__id__": 788 }, { - "__id__": 797 + "__id__": 798 } ], "_active": true, "_components": [ { - "__id__": 809 + "__id__": 810 }, { - "__id__": 811 + "__id__": 812 } ], "_prefab": { - "__id__": 813 + "__id__": 814 }, "_lpos": { "__type__": "cc.Vec3", @@ -16899,20 +16912,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 774 + "__id__": 775 }, "_children": [], "_active": true, "_components": [ { - "__id__": 776 + "__id__": 777 }, { - "__id__": 778 + "__id__": 779 } ], "_prefab": { - "__id__": 780 + "__id__": 781 }, "_lpos": { "__type__": "cc.Vec3", @@ -16949,11 +16962,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 775 + "__id__": 776 }, "_enabled": true, "__prefab": { - "__id__": 777 + "__id__": 778 }, "_contentSize": { "__type__": "cc.Size", @@ -16977,11 +16990,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 775 + "__id__": 776 }, "_enabled": true, "__prefab": { - "__id__": 779 + "__id__": 780 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17035,20 +17048,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 774 + "__id__": 775 }, "_children": [], "_active": true, "_components": [ { - "__id__": 782 + "__id__": 783 }, { - "__id__": 784 + "__id__": 785 } ], "_prefab": { - "__id__": 786 + "__id__": 787 }, "_lpos": { "__type__": "cc.Vec3", @@ -17085,11 +17098,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 782 }, "_enabled": true, "__prefab": { - "__id__": 783 + "__id__": 784 }, "_contentSize": { "__type__": "cc.Size", @@ -17113,11 +17126,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 782 }, "_enabled": true, "__prefab": { - "__id__": 785 + "__id__": 786 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17171,26 +17184,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 774 + "__id__": 775 }, "_children": [], "_active": true, "_components": [ { - "__id__": 788 + "__id__": 789 }, { - "__id__": 790 + "__id__": 791 }, { - "__id__": 792 + "__id__": 793 }, { - "__id__": 794 + "__id__": 795 } ], "_prefab": { - "__id__": 796 + "__id__": 797 }, "_lpos": { "__type__": "cc.Vec3", @@ -17227,11 +17240,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 787 + "__id__": 788 }, "_enabled": true, "__prefab": { - "__id__": 789 + "__id__": 790 }, "_contentSize": { "__type__": "cc.Size", @@ -17255,11 +17268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 787 + "__id__": 788 }, "_enabled": true, "__prefab": { - "__id__": 791 + "__id__": 792 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17323,11 +17336,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 787 + "__id__": 788 }, "_enabled": true, "__prefab": { - "__id__": 793 + "__id__": 794 }, "_id": "" }, @@ -17341,11 +17354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 787 + "__id__": 788 }, "_enabled": true, "__prefab": { - "__id__": 795 + "__id__": 796 }, "templateMode": true, "watchPath": "data.role.gold", @@ -17378,24 +17391,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 774 + "__id__": 775 }, "_children": [ { - "__id__": 798 + "__id__": 799 } ], "_active": false, "_components": [ { - "__id__": 804 + "__id__": 805 }, { - "__id__": 806 + "__id__": 807 } ], "_prefab": { - "__id__": 808 + "__id__": 809 }, "_lpos": { "__type__": "cc.Vec3", @@ -17432,20 +17445,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 797 + "__id__": 798 }, "_children": [], "_active": true, "_components": [ { - "__id__": 799 + "__id__": 800 }, { - "__id__": 801 + "__id__": 802 } ], "_prefab": { - "__id__": 803 + "__id__": 804 }, "_lpos": { "__type__": "cc.Vec3", @@ -17482,11 +17495,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 799 }, "_enabled": true, "__prefab": { - "__id__": 800 + "__id__": 801 }, "_contentSize": { "__type__": "cc.Size", @@ -17510,11 +17523,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 798 + "__id__": 799 }, "_enabled": true, "__prefab": { - "__id__": 802 + "__id__": 803 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17568,11 +17581,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 805 + "__id__": 806 }, "_contentSize": { "__type__": "cc.Size", @@ -17596,11 +17609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 797 + "__id__": 798 }, "_enabled": true, "__prefab": { - "__id__": 807 + "__id__": 808 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17654,11 +17667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 774 + "__id__": 775 }, "_enabled": true, "__prefab": { - "__id__": 810 + "__id__": 811 }, "_contentSize": { "__type__": "cc.Size", @@ -17682,11 +17695,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 774 + "__id__": 775 }, "_enabled": true, "__prefab": { - "__id__": 812 + "__id__": 813 }, "_alignFlags": 12, "_target": null, @@ -17731,33 +17744,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 773 + "__id__": 774 }, "_children": [ { - "__id__": 815 + "__id__": 816 }, { - "__id__": 821 + "__id__": 822 }, { - "__id__": 827 + "__id__": 828 }, { - "__id__": 837 + "__id__": 838 } ], "_active": false, "_components": [ { - "__id__": 849 + "__id__": 850 }, { - "__id__": 851 + "__id__": 852 } ], "_prefab": { - "__id__": 853 + "__id__": 854 }, "_lpos": { "__type__": "cc.Vec3", @@ -17794,20 +17807,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 814 + "__id__": 815 }, "_children": [], "_active": true, "_components": [ { - "__id__": 816 + "__id__": 817 }, { - "__id__": 818 + "__id__": 819 } ], "_prefab": { - "__id__": 820 + "__id__": 821 }, "_lpos": { "__type__": "cc.Vec3", @@ -17844,11 +17857,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 815 + "__id__": 816 }, "_enabled": true, "__prefab": { - "__id__": 817 + "__id__": 818 }, "_contentSize": { "__type__": "cc.Size", @@ -17872,11 +17885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 815 + "__id__": 816 }, "_enabled": true, "__prefab": { - "__id__": 819 + "__id__": 820 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17930,20 +17943,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 814 + "__id__": 815 }, "_children": [], "_active": true, "_components": [ { - "__id__": 822 + "__id__": 823 }, { - "__id__": 824 + "__id__": 825 } ], "_prefab": { - "__id__": 826 + "__id__": 827 }, "_lpos": { "__type__": "cc.Vec3", @@ -17980,11 +17993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 822 }, "_enabled": true, "__prefab": { - "__id__": 823 + "__id__": 824 }, "_contentSize": { "__type__": "cc.Size", @@ -18008,11 +18021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 822 }, "_enabled": true, "__prefab": { - "__id__": 825 + "__id__": 826 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18066,26 +18079,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 814 + "__id__": 815 }, "_children": [], "_active": true, "_components": [ { - "__id__": 828 + "__id__": 829 }, { - "__id__": 830 + "__id__": 831 }, { - "__id__": 832 + "__id__": 833 }, { - "__id__": 834 + "__id__": 835 } ], "_prefab": { - "__id__": 836 + "__id__": 837 }, "_lpos": { "__type__": "cc.Vec3", @@ -18122,11 +18135,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 828 }, "_enabled": true, "__prefab": { - "__id__": 829 + "__id__": 830 }, "_contentSize": { "__type__": "cc.Size", @@ -18150,11 +18163,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 828 }, "_enabled": true, "__prefab": { - "__id__": 831 + "__id__": 832 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18218,11 +18231,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 828 }, "_enabled": true, "__prefab": { - "__id__": 833 + "__id__": 834 }, "_id": "" }, @@ -18236,11 +18249,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 827 + "__id__": 828 }, "_enabled": true, "__prefab": { - "__id__": 835 + "__id__": 836 }, "templateMode": true, "watchPath": "data.role.gold", @@ -18273,24 +18286,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 814 + "__id__": 815 }, "_children": [ { - "__id__": 838 + "__id__": 839 } ], "_active": false, "_components": [ { - "__id__": 844 + "__id__": 845 }, { - "__id__": 846 + "__id__": 847 } ], "_prefab": { - "__id__": 848 + "__id__": 849 }, "_lpos": { "__type__": "cc.Vec3", @@ -18327,20 +18340,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 837 + "__id__": 838 }, "_children": [], "_active": true, "_components": [ { - "__id__": 839 + "__id__": 840 }, { - "__id__": 841 + "__id__": 842 } ], "_prefab": { - "__id__": 843 + "__id__": 844 }, "_lpos": { "__type__": "cc.Vec3", @@ -18377,11 +18390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 839 }, "_enabled": true, "__prefab": { - "__id__": 840 + "__id__": 841 }, "_contentSize": { "__type__": "cc.Size", @@ -18405,11 +18418,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 839 }, "_enabled": true, "__prefab": { - "__id__": 842 + "__id__": 843 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18463,11 +18476,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 837 + "__id__": 838 }, "_enabled": true, "__prefab": { - "__id__": 845 + "__id__": 846 }, "_contentSize": { "__type__": "cc.Size", @@ -18491,11 +18504,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 837 + "__id__": 838 }, "_enabled": true, "__prefab": { - "__id__": 847 + "__id__": 848 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18549,11 +18562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 814 + "__id__": 815 }, "_enabled": true, "__prefab": { - "__id__": 850 + "__id__": 851 }, "_contentSize": { "__type__": "cc.Size", @@ -18577,11 +18590,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 814 + "__id__": 815 }, "_enabled": true, "__prefab": { - "__id__": 852 + "__id__": 853 }, "_alignFlags": 12, "_target": null, @@ -18626,33 +18639,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 773 + "__id__": 774 }, "_children": [ { - "__id__": 855 + "__id__": 856 }, { - "__id__": 861 + "__id__": 862 }, { - "__id__": 867 + "__id__": 868 }, { - "__id__": 877 + "__id__": 878 } ], "_active": false, "_components": [ { - "__id__": 889 + "__id__": 890 }, { - "__id__": 891 + "__id__": 892 } ], "_prefab": { - "__id__": 893 + "__id__": 894 }, "_lpos": { "__type__": "cc.Vec3", @@ -18689,20 +18702,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 854 + "__id__": 855 }, "_children": [], "_active": true, "_components": [ { - "__id__": 856 + "__id__": 857 }, { - "__id__": 858 + "__id__": 859 } ], "_prefab": { - "__id__": 860 + "__id__": 861 }, "_lpos": { "__type__": "cc.Vec3", @@ -18739,11 +18752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 855 + "__id__": 856 }, "_enabled": true, "__prefab": { - "__id__": 857 + "__id__": 858 }, "_contentSize": { "__type__": "cc.Size", @@ -18767,11 +18780,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 855 + "__id__": 856 }, "_enabled": true, "__prefab": { - "__id__": 859 + "__id__": 860 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18825,20 +18838,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 854 + "__id__": 855 }, "_children": [], "_active": true, "_components": [ { - "__id__": 862 + "__id__": 863 }, { - "__id__": 864 + "__id__": 865 } ], "_prefab": { - "__id__": 866 + "__id__": 867 }, "_lpos": { "__type__": "cc.Vec3", @@ -18875,11 +18888,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 861 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 863 + "__id__": 864 }, "_contentSize": { "__type__": "cc.Size", @@ -18903,11 +18916,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 861 + "__id__": 862 }, "_enabled": true, "__prefab": { - "__id__": 865 + "__id__": 866 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18961,26 +18974,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 854 + "__id__": 855 }, "_children": [], "_active": true, "_components": [ { - "__id__": 868 + "__id__": 869 }, { - "__id__": 870 + "__id__": 871 }, { - "__id__": 872 + "__id__": 873 }, { - "__id__": 874 + "__id__": 875 } ], "_prefab": { - "__id__": 876 + "__id__": 877 }, "_lpos": { "__type__": "cc.Vec3", @@ -19017,11 +19030,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 869 + "__id__": 870 }, "_contentSize": { "__type__": "cc.Size", @@ -19045,11 +19058,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 871 + "__id__": 872 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19113,11 +19126,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 873 + "__id__": 874 }, "_id": "" }, @@ -19131,11 +19144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 868 }, "_enabled": true, "__prefab": { - "__id__": 875 + "__id__": 876 }, "templateMode": true, "watchPath": "data.role.gold", @@ -19168,24 +19181,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 854 + "__id__": 855 }, "_children": [ { - "__id__": 878 + "__id__": 879 } ], "_active": false, "_components": [ { - "__id__": 884 + "__id__": 885 }, { - "__id__": 886 + "__id__": 887 } ], "_prefab": { - "__id__": 888 + "__id__": 889 }, "_lpos": { "__type__": "cc.Vec3", @@ -19222,20 +19235,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 877 + "__id__": 878 }, "_children": [], "_active": true, "_components": [ { - "__id__": 879 + "__id__": 880 }, { - "__id__": 881 + "__id__": 882 } ], "_prefab": { - "__id__": 883 + "__id__": 884 }, "_lpos": { "__type__": "cc.Vec3", @@ -19272,11 +19285,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 878 + "__id__": 879 }, "_enabled": true, "__prefab": { - "__id__": 880 + "__id__": 881 }, "_contentSize": { "__type__": "cc.Size", @@ -19300,11 +19313,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 878 + "__id__": 879 }, "_enabled": true, "__prefab": { - "__id__": 882 + "__id__": 883 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19358,11 +19371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 877 + "__id__": 878 }, "_enabled": true, "__prefab": { - "__id__": 885 + "__id__": 886 }, "_contentSize": { "__type__": "cc.Size", @@ -19386,11 +19399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 877 + "__id__": 878 }, "_enabled": true, "__prefab": { - "__id__": 887 + "__id__": 888 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19444,11 +19457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 855 }, "_enabled": true, "__prefab": { - "__id__": 890 + "__id__": 891 }, "_contentSize": { "__type__": "cc.Size", @@ -19472,11 +19485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 854 + "__id__": 855 }, "_enabled": true, "__prefab": { - "__id__": 892 + "__id__": 893 }, "_alignFlags": 12, "_target": null, @@ -19521,33 +19534,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 773 + "__id__": 774 }, "_children": [ { - "__id__": 895 + "__id__": 896 }, { - "__id__": 901 + "__id__": 902 }, { - "__id__": 907 + "__id__": 908 }, { - "__id__": 917 + "__id__": 918 } ], "_active": false, "_components": [ { - "__id__": 929 + "__id__": 930 }, { - "__id__": 931 + "__id__": 932 } ], "_prefab": { - "__id__": 933 + "__id__": 934 }, "_lpos": { "__type__": "cc.Vec3", @@ -19584,20 +19597,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 894 + "__id__": 895 }, "_children": [], "_active": true, "_components": [ { - "__id__": 896 + "__id__": 897 }, { - "__id__": 898 + "__id__": 899 } ], "_prefab": { - "__id__": 900 + "__id__": 901 }, "_lpos": { "__type__": "cc.Vec3", @@ -19634,11 +19647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 895 + "__id__": 896 }, "_enabled": true, "__prefab": { - "__id__": 897 + "__id__": 898 }, "_contentSize": { "__type__": "cc.Size", @@ -19662,11 +19675,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 895 + "__id__": 896 }, "_enabled": true, "__prefab": { - "__id__": 899 + "__id__": 900 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19720,20 +19733,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 894 + "__id__": 895 }, "_children": [], "_active": true, "_components": [ { - "__id__": 902 + "__id__": 903 }, { - "__id__": 904 + "__id__": 905 } ], "_prefab": { - "__id__": 906 + "__id__": 907 }, "_lpos": { "__type__": "cc.Vec3", @@ -19770,11 +19783,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 901 + "__id__": 902 }, "_enabled": true, "__prefab": { - "__id__": 903 + "__id__": 904 }, "_contentSize": { "__type__": "cc.Size", @@ -19798,11 +19811,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 901 + "__id__": 902 }, "_enabled": true, "__prefab": { - "__id__": 905 + "__id__": 906 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19856,26 +19869,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 894 + "__id__": 895 }, "_children": [], "_active": true, "_components": [ { - "__id__": 908 + "__id__": 909 }, { - "__id__": 910 + "__id__": 911 }, { - "__id__": 912 + "__id__": 913 }, { - "__id__": 914 + "__id__": 915 } ], "_prefab": { - "__id__": 916 + "__id__": 917 }, "_lpos": { "__type__": "cc.Vec3", @@ -19912,11 +19925,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 907 + "__id__": 908 }, "_enabled": true, "__prefab": { - "__id__": 909 + "__id__": 910 }, "_contentSize": { "__type__": "cc.Size", @@ -19940,11 +19953,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 907 + "__id__": 908 }, "_enabled": true, "__prefab": { - "__id__": 911 + "__id__": 912 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20008,11 +20021,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 907 + "__id__": 908 }, "_enabled": true, "__prefab": { - "__id__": 913 + "__id__": 914 }, "_id": "" }, @@ -20026,11 +20039,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 907 + "__id__": 908 }, "_enabled": true, "__prefab": { - "__id__": 915 + "__id__": 916 }, "templateMode": true, "watchPath": "data.role.gold", @@ -20063,24 +20076,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 894 + "__id__": 895 }, "_children": [ { - "__id__": 918 + "__id__": 919 } ], "_active": false, "_components": [ { - "__id__": 924 + "__id__": 925 }, { - "__id__": 926 + "__id__": 927 } ], "_prefab": { - "__id__": 928 + "__id__": 929 }, "_lpos": { "__type__": "cc.Vec3", @@ -20117,20 +20130,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 917 + "__id__": 918 }, "_children": [], "_active": true, "_components": [ { - "__id__": 919 + "__id__": 920 }, { - "__id__": 921 + "__id__": 922 } ], "_prefab": { - "__id__": 923 + "__id__": 924 }, "_lpos": { "__type__": "cc.Vec3", @@ -20167,11 +20180,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 918 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 920 + "__id__": 921 }, "_contentSize": { "__type__": "cc.Size", @@ -20195,11 +20208,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 918 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 922 + "__id__": 923 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20253,11 +20266,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 925 + "__id__": 926 }, "_contentSize": { "__type__": "cc.Size", @@ -20281,11 +20294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 917 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 927 + "__id__": 928 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20339,11 +20352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 894 + "__id__": 895 }, "_enabled": true, "__prefab": { - "__id__": 930 + "__id__": 931 }, "_contentSize": { "__type__": "cc.Size", @@ -20367,11 +20380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 894 + "__id__": 895 }, "_enabled": true, "__prefab": { - "__id__": 932 + "__id__": 933 }, "_alignFlags": 12, "_target": null, @@ -20416,33 +20429,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 773 + "__id__": 774 }, "_children": [ { - "__id__": 935 + "__id__": 936 }, { - "__id__": 941 + "__id__": 942 }, { - "__id__": 947 + "__id__": 948 }, { - "__id__": 957 + "__id__": 958 } ], "_active": false, "_components": [ { - "__id__": 969 + "__id__": 970 }, { - "__id__": 971 + "__id__": 972 } ], "_prefab": { - "__id__": 973 + "__id__": 974 }, "_lpos": { "__type__": "cc.Vec3", @@ -20479,20 +20492,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 934 + "__id__": 935 }, "_children": [], "_active": true, "_components": [ { - "__id__": 936 + "__id__": 937 }, { - "__id__": 938 + "__id__": 939 } ], "_prefab": { - "__id__": 940 + "__id__": 941 }, "_lpos": { "__type__": "cc.Vec3", @@ -20529,11 +20542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 935 + "__id__": 936 }, "_enabled": true, "__prefab": { - "__id__": 937 + "__id__": 938 }, "_contentSize": { "__type__": "cc.Size", @@ -20557,11 +20570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 935 + "__id__": 936 }, "_enabled": true, "__prefab": { - "__id__": 939 + "__id__": 940 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20615,20 +20628,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 934 + "__id__": 935 }, "_children": [], "_active": true, "_components": [ { - "__id__": 942 + "__id__": 943 }, { - "__id__": 944 + "__id__": 945 } ], "_prefab": { - "__id__": 946 + "__id__": 947 }, "_lpos": { "__type__": "cc.Vec3", @@ -20665,11 +20678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 942 }, "_enabled": true, "__prefab": { - "__id__": 943 + "__id__": 944 }, "_contentSize": { "__type__": "cc.Size", @@ -20693,11 +20706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 941 + "__id__": 942 }, "_enabled": true, "__prefab": { - "__id__": 945 + "__id__": 946 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20751,26 +20764,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 934 + "__id__": 935 }, "_children": [], "_active": true, "_components": [ { - "__id__": 948 + "__id__": 949 }, { - "__id__": 950 + "__id__": 951 }, { - "__id__": 952 + "__id__": 953 }, { - "__id__": 954 + "__id__": 955 } ], "_prefab": { - "__id__": 956 + "__id__": 957 }, "_lpos": { "__type__": "cc.Vec3", @@ -20807,11 +20820,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 947 + "__id__": 948 }, "_enabled": true, "__prefab": { - "__id__": 949 + "__id__": 950 }, "_contentSize": { "__type__": "cc.Size", @@ -20835,11 +20848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 947 + "__id__": 948 }, "_enabled": true, "__prefab": { - "__id__": 951 + "__id__": 952 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20903,11 +20916,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 947 + "__id__": 948 }, "_enabled": true, "__prefab": { - "__id__": 953 + "__id__": 954 }, "_id": "" }, @@ -20921,11 +20934,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 947 + "__id__": 948 }, "_enabled": true, "__prefab": { - "__id__": 955 + "__id__": 956 }, "templateMode": true, "watchPath": "data.role.gold", @@ -20958,24 +20971,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 934 + "__id__": 935 }, "_children": [ { - "__id__": 958 + "__id__": 959 } ], "_active": false, "_components": [ { - "__id__": 964 + "__id__": 965 }, { - "__id__": 966 + "__id__": 967 } ], "_prefab": { - "__id__": 968 + "__id__": 969 }, "_lpos": { "__type__": "cc.Vec3", @@ -21012,20 +21025,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 957 + "__id__": 958 }, "_children": [], "_active": true, "_components": [ { - "__id__": 959 + "__id__": 960 }, { - "__id__": 961 + "__id__": 962 } ], "_prefab": { - "__id__": 963 + "__id__": 964 }, "_lpos": { "__type__": "cc.Vec3", @@ -21062,11 +21075,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 958 + "__id__": 959 }, "_enabled": true, "__prefab": { - "__id__": 960 + "__id__": 961 }, "_contentSize": { "__type__": "cc.Size", @@ -21090,11 +21103,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 958 + "__id__": 959 }, "_enabled": true, "__prefab": { - "__id__": 962 + "__id__": 963 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21148,11 +21161,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 957 + "__id__": 958 }, "_enabled": true, "__prefab": { - "__id__": 965 + "__id__": 966 }, "_contentSize": { "__type__": "cc.Size", @@ -21176,11 +21189,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 957 + "__id__": 958 }, "_enabled": true, "__prefab": { - "__id__": 967 + "__id__": 968 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21234,11 +21247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 935 }, "_enabled": true, "__prefab": { - "__id__": 970 + "__id__": 971 }, "_contentSize": { "__type__": "cc.Size", @@ -21262,11 +21275,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 935 }, "_enabled": true, "__prefab": { - "__id__": 972 + "__id__": 973 }, "_alignFlags": 12, "_target": null, @@ -21311,11 +21324,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 975 + "__id__": 976 }, "_contentSize": { "__type__": "cc.Size", @@ -21339,11 +21352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 977 + "__id__": 978 }, "_alignFlags": 41, "_target": null, @@ -21375,11 +21388,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 773 + "__id__": 774 }, "_enabled": true, "__prefab": { - "__id__": 979 + "__id__": 980 }, "_resizeMode": 0, "_layoutType": 1, @@ -21430,7 +21443,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 982 + "__id__": 983 }, "_contentSize": { "__type__": "cc.Size", @@ -21458,7 +21471,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 984 + "__id__": 985 }, "_alignFlags": 45, "_target": null, @@ -21494,7 +21507,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 986 + "__id__": 987 }, "_id": "" }, diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index 05e3698d..70693419 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -159,7 +159,7 @@ export class MissionComp extends CCComp { m_alive=true } } - if (!m_alive||!h_alive) this.mission_end() + // if (!m_alive||!h_alive) this.mission_end() } get_mons(){ diff --git a/excel/heros.xlsx b/excel/heros.xlsx index cc3764ab..6ac0ee76 100644 Binary files a/excel/heros.xlsx and b/excel/heros.xlsx differ