From 24c32549c07a4620f9399b09d7d3956ff653bbbc Mon Sep 17 00:00:00 2001 From: panw Date: Tue, 21 Apr 2026 16:57:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E8=B0=83=E6=95=B4=E5=8D=A1=E7=89=8C?= =?UTF-8?q?=E9=A2=84=E5=88=B6=E4=BD=93=E5=B0=BA=E5=AF=B8=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=BC=80=E5=A7=8B=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正卡牌预制体的局部位置、尺寸模式和内容大小,优化显示效果 - 隐藏预制体中不必要的节点以提升性能 - 重构开始按钮状态控制逻辑,改为根据游戏阶段动态更新按钮的可点击状态 - 移除直接隐藏按钮的代码,确保按钮在准备阶段且未暂停时可点击 --- assets/resources/gui/element/card.prefab | 12 +- assets/resources/gui/role_controller.prefab | 1161 +++++++++++-------- assets/script/game/map/MissionComp.ts | 20 +- 3 files changed, 694 insertions(+), 499 deletions(-) diff --git a/assets/resources/gui/element/card.prefab b/assets/resources/gui/element/card.prefab index 6a121323..b7f783e7 100644 --- a/assets/resources/gui/element/card.prefab +++ b/assets/resources/gui/element/card.prefab @@ -863,7 +863,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0.5, + "y": 0, "z": 0 }, "_lrot": { @@ -995,7 +995,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -1042,8 +1042,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 164, - "height": 223 + "width": 156, + "height": 210 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3243,7 +3243,7 @@ "__id__": 181 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 189 @@ -8440,7 +8440,7 @@ "__id__": 390 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 396 diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 94f98af6..150b5611 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -22,29 +22,29 @@ "__id__": 2 }, { - "__id__": 728 + "__id__": 736 }, { - "__id__": 945 + "__id__": 953 }, { - "__id__": 954 + "__id__": 962 } ], "_active": true, "_components": [ { - "__id__": 1000 + "__id__": 1008 }, { - "__id__": 1002 + "__id__": 1010 }, { - "__id__": 1004 + "__id__": 1012 } ], "_prefab": { - "__id__": 1006 + "__id__": 1014 }, "_lpos": { "__type__": "cc.Vec3", @@ -97,32 +97,32 @@ "__id__": 112 }, { - "__id__": 704 + "__id__": 712 } ], "_active": true, "_components": [ - { - "__id__": 715 - }, - { - "__id__": 717 - }, - { - "__id__": 719 - }, - { - "__id__": 721 - }, { "__id__": 723 }, { "__id__": 725 + }, + { + "__id__": 727 + }, + { + "__id__": 729 + }, + { + "__id__": 731 + }, + { + "__id__": 733 } ], "_prefab": { - "__id__": 727 + "__id__": 735 }, "_lpos": { "__type__": "cc.Vec3", @@ -2737,20 +2737,20 @@ "_active": true, "_components": [ { - "__id__": 695 + "__id__": 703 }, { - "__id__": 697 + "__id__": 705 }, { - "__id__": 699 + "__id__": 707 }, { - "__id__": 701 + "__id__": 709 } ], "_prefab": { - "__id__": 703 + "__id__": 711 }, "_lpos": { "__type__": "cc.Vec3", @@ -10258,17 +10258,17 @@ "_active": true, "_components": [ { - "__id__": 688 + "__id__": 696 }, { - "__id__": 690 + "__id__": 698 }, { - "__id__": 692 + "__id__": 700 } ], "_prefab": { - "__id__": 694 + "__id__": 702 }, "_lpos": { "__type__": "cc.Vec3", @@ -13178,22 +13178,25 @@ }, { "__id__": 673 + }, + { + "__id__": 681 } ], "_active": true, "_components": [ { - "__id__": 681 + "__id__": 689 }, { - "__id__": 683 + "__id__": 691 }, { - "__id__": 685 + "__id__": 693 } ], "_prefab": { - "__id__": 687 + "__id__": 695 }, "_lpos": { "__type__": "cc.Vec3", @@ -13404,14 +13407,14 @@ }, { "__type__": "cc.Node", - "_name": "Label", + "_name": "nobg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 664 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 674 @@ -13429,7 +13432,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 55, + "y": 0, "z": 0 }, "_lrot": { @@ -13467,6 +13470,184 @@ "__prefab": { "__id__": 675 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1c8KUp3nVP/I3MAyJyYMGd" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 673 + }, + "_enabled": true, + "__prefab": { + "__id__": 677 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@4a554", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": { + "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f2X6RcrQ1J27kuAhNrvQHj" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 673 + }, + "_enabled": true, + "__prefab": { + "__id__": 679 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 216, + "_originalHeight": 106, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "40aYzSIxlCCI/94tNYQH5j" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0cUuSy5UxCsLhVap/E/N8X", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 664 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 682 + }, + { + "__id__": 684 + }, + { + "__id__": 686 + } + ], + "_prefab": { + "__id__": 688 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 55, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 681 + }, + "_enabled": true, + "__prefab": { + "__id__": 683 + }, "_contentSize": { "__type__": "cc.Size", "width": 148, @@ -13489,11 +13670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 673 + "__id__": 681 }, "_enabled": true, "__prefab": { - "__id__": 677 + "__id__": 685 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13557,11 +13738,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 673 + "__id__": 681 }, "_enabled": true, "__prefab": { - "__id__": 679 + "__id__": 687 }, "_alignFlags": 16, "_target": null, @@ -13610,7 +13791,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 682 + "__id__": 690 }, "_contentSize": { "__type__": "cc.Size", @@ -13638,7 +13819,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 684 + "__id__": 692 }, "_alignFlags": 33, "_target": null, @@ -13674,7 +13855,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 686 + "__id__": 694 }, "clickEvents": [], "_interactable": true, @@ -13743,7 +13924,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 689 + "__id__": 697 }, "_contentSize": { "__type__": "cc.Size", @@ -13771,7 +13952,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 691 + "__id__": 699 }, "_resizeMode": 1, "_layoutType": 1, @@ -13809,7 +13990,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 693 + "__id__": 701 }, "_alignFlags": 44, "_target": null, @@ -13858,7 +14039,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 696 + "__id__": 704 }, "_contentSize": { "__type__": "cc.Size", @@ -13886,7 +14067,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 698 + "__id__": 706 }, "_alignFlags": 44, "_target": null, @@ -13922,7 +14103,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 700 + "__id__": 708 }, "_resizeMode": 1, "_layoutType": 1, @@ -13960,7 +14141,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 702 + "__id__": 710 }, "_id": "" }, @@ -13988,14 +14169,14 @@ "__id__": 2 }, "_prefab": { - "__id__": 705 + "__id__": 713 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 704 + "__id__": 712 }, "asset": { "__uuid__": "0f2aeee0-d590-4c36-9f20-a93b058d5b91", @@ -14003,7 +14184,7 @@ }, "fileId": "5622mxbS1PNqMFP0FH5Mir", "instance": { - "__id__": 706 + "__id__": 714 }, "targetOverrides": null }, @@ -14017,22 +14198,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 707 + "__id__": 715 }, { - "__id__": 709 + "__id__": 717 }, { - "__id__": 710 + "__id__": 718 }, { - "__id__": 711 + "__id__": 719 }, { - "__id__": 712 + "__id__": 720 }, { - "__id__": 714 + "__id__": 722 } ], "removedComponents": [] @@ -14040,7 +14221,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 708 + "__id__": 716 }, "propertyPath": [ "_name" @@ -14056,7 +14237,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 708 + "__id__": 716 }, "propertyPath": [ "_lpos" @@ -14071,7 +14252,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 708 + "__id__": 716 }, "propertyPath": [ "_lrot" @@ -14087,7 +14268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 708 + "__id__": 716 }, "propertyPath": [ "_euler" @@ -14102,7 +14283,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 713 + "__id__": 721 }, "propertyPath": [ "_left" @@ -14118,7 +14299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 713 + "__id__": 721 }, "propertyPath": [ "_verticalCenter" @@ -14135,7 +14316,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 716 + "__id__": 724 }, "_contentSize": { "__type__": "cc.Size", @@ -14163,7 +14344,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 718 + "__id__": 726 }, "_alignFlags": 21, "_target": null, @@ -14199,7 +14380,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 720 + "__id__": 728 }, "debugMode": false, "showMemoryPanel": true, @@ -14229,7 +14410,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 722 + "__id__": 730 }, "_id": "" }, @@ -14247,7 +14428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 724 + "__id__": 732 }, "debugMode": false, "_id": "" @@ -14266,7 +14447,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 726 + "__id__": 734 }, "cards_node": { "__id__": 112 @@ -14333,30 +14514,30 @@ "__id__": 1 }, "_children": [ - { - "__id__": 729 - }, { "__id__": 737 }, { - "__id__": 921 + "__id__": 745 + }, + { + "__id__": 929 } ], "_active": false, "_components": [ { - "__id__": 938 + "__id__": 946 }, { - "__id__": 940 + "__id__": 948 }, { - "__id__": 942 + "__id__": 950 } ], "_prefab": { - "__id__": 944 + "__id__": 952 }, "_lpos": { "__type__": "cc.Vec3", @@ -14393,23 +14574,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 728 + "__id__": 736 }, "_children": [], "_active": true, "_components": [ { - "__id__": 730 + "__id__": 738 }, { - "__id__": 732 + "__id__": 740 }, { - "__id__": 734 + "__id__": 742 } ], "_prefab": { - "__id__": 736 + "__id__": 744 }, "_lpos": { "__type__": "cc.Vec3", @@ -14446,11 +14627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 737 }, "_enabled": true, "__prefab": { - "__id__": 731 + "__id__": 739 }, "_contentSize": { "__type__": "cc.Size", @@ -14474,11 +14655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 737 }, "_enabled": true, "__prefab": { - "__id__": 733 + "__id__": 741 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14522,11 +14703,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 729 + "__id__": 737 }, "_enabled": true, "__prefab": { - "__id__": 735 + "__id__": 743 }, "_alignFlags": 20, "_target": null, @@ -14571,36 +14752,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 728 + "__id__": 736 }, "_children": [ { - "__id__": 738 + "__id__": 746 }, { - "__id__": 779 + "__id__": 787 }, { - "__id__": 820 + "__id__": 828 }, { - "__id__": 867 + "__id__": 875 } ], "_active": true, "_components": [ { - "__id__": 914 + "__id__": 922 }, { - "__id__": 916 + "__id__": 924 }, { - "__id__": 918 + "__id__": 926 } ], "_prefab": { - "__id__": 920 + "__id__": 928 }, "_lpos": { "__type__": "cc.Vec3", @@ -14637,27 +14818,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 737 + "__id__": 745 }, "_children": [ { - "__id__": 739 + "__id__": 747 }, { - "__id__": 753 + "__id__": 761 } ], "_active": false, "_components": [ { - "__id__": 773 + "__id__": 781 }, { - "__id__": 775 + "__id__": 783 } ], "_prefab": { - "__id__": 778 + "__id__": 786 }, "_lpos": { "__type__": "cc.Vec3", @@ -14694,27 +14875,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 738 + "__id__": 746 }, "_children": [ { - "__id__": 740 + "__id__": 748 } ], "_active": true, "_components": [ { - "__id__": 746 + "__id__": 754 }, { - "__id__": 748 + "__id__": 756 }, { - "__id__": 750 + "__id__": 758 } ], "_prefab": { - "__id__": 752 + "__id__": 760 }, "_lpos": { "__type__": "cc.Vec3", @@ -14751,20 +14932,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 739 + "__id__": 747 }, "_children": [], "_active": true, "_components": [ { - "__id__": 741 + "__id__": 749 }, { - "__id__": 743 + "__id__": 751 } ], "_prefab": { - "__id__": 745 + "__id__": 753 }, "_lpos": { "__type__": "cc.Vec3", @@ -14801,11 +14982,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 740 + "__id__": 748 }, "_enabled": true, "__prefab": { - "__id__": 742 + "__id__": 750 }, "_contentSize": { "__type__": "cc.Size", @@ -14829,11 +15010,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 740 + "__id__": 748 }, "_enabled": true, "__prefab": { - "__id__": 744 + "__id__": 752 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14887,11 +15068,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 739 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 747 + "__id__": 755 }, "_contentSize": { "__type__": "cc.Size", @@ -14915,11 +15096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 739 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 749 + "__id__": 757 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14960,11 +15141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 739 + "__id__": 747 }, "_enabled": true, "__prefab": { - "__id__": 751 + "__id__": 759 }, "_alignFlags": 45, "_target": null, @@ -15009,30 +15190,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 738 + "__id__": 746 }, "_children": [ { - "__id__": 754 + "__id__": 762 }, { - "__id__": 760 + "__id__": 768 } ], "_active": false, "_components": [ { - "__id__": 766 + "__id__": 774 }, { - "__id__": 768 + "__id__": 776 }, { - "__id__": 770 + "__id__": 778 } ], "_prefab": { - "__id__": 772 + "__id__": 780 }, "_lpos": { "__type__": "cc.Vec3", @@ -15069,20 +15250,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 753 + "__id__": 761 }, "_children": [], "_active": true, "_components": [ { - "__id__": 755 + "__id__": 763 }, { - "__id__": 757 + "__id__": 765 } ], "_prefab": { - "__id__": 759 + "__id__": 767 }, "_lpos": { "__type__": "cc.Vec3", @@ -15119,11 +15300,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 754 + "__id__": 762 }, "_enabled": true, "__prefab": { - "__id__": 756 + "__id__": 764 }, "_contentSize": { "__type__": "cc.Size", @@ -15147,11 +15328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 754 + "__id__": 762 }, "_enabled": true, "__prefab": { - "__id__": 758 + "__id__": 766 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15205,20 +15386,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 753 + "__id__": 761 }, "_children": [], "_active": true, "_components": [ { - "__id__": 761 + "__id__": 769 }, { - "__id__": 763 + "__id__": 771 } ], "_prefab": { - "__id__": 765 + "__id__": 773 }, "_lpos": { "__type__": "cc.Vec3", @@ -15255,11 +15436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 760 + "__id__": 768 }, "_enabled": true, "__prefab": { - "__id__": 762 + "__id__": 770 }, "_contentSize": { "__type__": "cc.Size", @@ -15283,11 +15464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 760 + "__id__": 768 }, "_enabled": true, "__prefab": { - "__id__": 764 + "__id__": 772 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15364,11 +15545,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 753 + "__id__": 761 }, "_enabled": true, "__prefab": { - "__id__": 767 + "__id__": 775 }, "_contentSize": { "__type__": "cc.Size", @@ -15392,11 +15573,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 753 + "__id__": 761 }, "_enabled": true, "__prefab": { - "__id__": 769 + "__id__": 777 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15437,11 +15618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 753 + "__id__": 761 }, "_enabled": true, "__prefab": { - "__id__": 771 + "__id__": 779 }, "_alignFlags": 45, "_target": null, @@ -15486,11 +15667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 738 + "__id__": 746 }, "_enabled": true, "__prefab": { - "__id__": 774 + "__id__": 782 }, "_contentSize": { "__type__": "cc.Size", @@ -15514,15 +15695,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 738 + "__id__": 746 }, "_enabled": true, "__prefab": { - "__id__": 776 + "__id__": 784 }, "clickEvents": [ { - "__id__": 777 + "__id__": 785 } ], "_interactable": true, @@ -15571,7 +15752,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 728 + "__id__": 736 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -15597,27 +15778,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 737 + "__id__": 745 }, "_children": [ { - "__id__": 780 + "__id__": 788 }, { - "__id__": 794 + "__id__": 802 } ], "_active": false, "_components": [ { - "__id__": 814 + "__id__": 822 }, { - "__id__": 816 + "__id__": 824 } ], "_prefab": { - "__id__": 819 + "__id__": 827 }, "_lpos": { "__type__": "cc.Vec3", @@ -15654,27 +15835,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 779 + "__id__": 787 }, "_children": [ { - "__id__": 781 + "__id__": 789 } ], "_active": true, "_components": [ { - "__id__": 787 + "__id__": 795 }, { - "__id__": 789 + "__id__": 797 }, { - "__id__": 791 + "__id__": 799 } ], "_prefab": { - "__id__": 793 + "__id__": 801 }, "_lpos": { "__type__": "cc.Vec3", @@ -15711,20 +15892,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 780 + "__id__": 788 }, "_children": [], "_active": true, "_components": [ { - "__id__": 782 + "__id__": 790 }, { - "__id__": 784 + "__id__": 792 } ], "_prefab": { - "__id__": 786 + "__id__": 794 }, "_lpos": { "__type__": "cc.Vec3", @@ -15761,11 +15942,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 789 }, "_enabled": true, "__prefab": { - "__id__": 783 + "__id__": 791 }, "_contentSize": { "__type__": "cc.Size", @@ -15789,11 +15970,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 781 + "__id__": 789 }, "_enabled": true, "__prefab": { - "__id__": 785 + "__id__": 793 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15847,11 +16028,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 788 }, "_enabled": true, "__prefab": { - "__id__": 788 + "__id__": 796 }, "_contentSize": { "__type__": "cc.Size", @@ -15875,11 +16056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 788 }, "_enabled": true, "__prefab": { - "__id__": 790 + "__id__": 798 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15920,11 +16101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 780 + "__id__": 788 }, "_enabled": true, "__prefab": { - "__id__": 792 + "__id__": 800 }, "_alignFlags": 45, "_target": null, @@ -15969,30 +16150,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 779 + "__id__": 787 }, "_children": [ { - "__id__": 795 + "__id__": 803 }, { - "__id__": 801 + "__id__": 809 } ], "_active": false, "_components": [ { - "__id__": 807 + "__id__": 815 }, { - "__id__": 809 + "__id__": 817 }, { - "__id__": 811 + "__id__": 819 } ], "_prefab": { - "__id__": 813 + "__id__": 821 }, "_lpos": { "__type__": "cc.Vec3", @@ -16029,20 +16210,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 794 + "__id__": 802 }, "_children": [], "_active": true, "_components": [ { - "__id__": 796 + "__id__": 804 }, { - "__id__": 798 + "__id__": 806 } ], "_prefab": { - "__id__": 800 + "__id__": 808 }, "_lpos": { "__type__": "cc.Vec3", @@ -16079,11 +16260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 795 + "__id__": 803 }, "_enabled": true, "__prefab": { - "__id__": 797 + "__id__": 805 }, "_contentSize": { "__type__": "cc.Size", @@ -16107,11 +16288,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 795 + "__id__": 803 }, "_enabled": true, "__prefab": { - "__id__": 799 + "__id__": 807 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16165,20 +16346,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 794 + "__id__": 802 }, "_children": [], "_active": true, "_components": [ { - "__id__": 802 + "__id__": 810 }, { - "__id__": 804 + "__id__": 812 } ], "_prefab": { - "__id__": 806 + "__id__": 814 }, "_lpos": { "__type__": "cc.Vec3", @@ -16215,11 +16396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 801 + "__id__": 809 }, "_enabled": true, "__prefab": { - "__id__": 803 + "__id__": 811 }, "_contentSize": { "__type__": "cc.Size", @@ -16243,11 +16424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 801 + "__id__": 809 }, "_enabled": true, "__prefab": { - "__id__": 805 + "__id__": 813 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16324,11 +16505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 794 + "__id__": 802 }, "_enabled": true, "__prefab": { - "__id__": 808 + "__id__": 816 }, "_contentSize": { "__type__": "cc.Size", @@ -16352,11 +16533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 794 + "__id__": 802 }, "_enabled": true, "__prefab": { - "__id__": 810 + "__id__": 818 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16397,11 +16578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 794 + "__id__": 802 }, "_enabled": true, "__prefab": { - "__id__": 812 + "__id__": 820 }, "_alignFlags": 45, "_target": null, @@ -16446,11 +16627,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 787 }, "_enabled": true, "__prefab": { - "__id__": 815 + "__id__": 823 }, "_contentSize": { "__type__": "cc.Size", @@ -16474,15 +16655,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 787 }, "_enabled": true, "__prefab": { - "__id__": 817 + "__id__": 825 }, "clickEvents": [ { - "__id__": 818 + "__id__": 826 } ], "_interactable": true, @@ -16531,7 +16712,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 728 + "__id__": 736 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -16557,30 +16738,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 737 + "__id__": 745 }, "_children": [ - { - "__id__": 821 - }, { "__id__": 829 }, { - "__id__": 849 + "__id__": 837 + }, + { + "__id__": 857 } ], "_active": true, "_components": [ { - "__id__": 861 + "__id__": 869 }, { - "__id__": 863 + "__id__": 871 } ], "_prefab": { - "__id__": 866 + "__id__": 874 }, "_lpos": { "__type__": "cc.Vec3", @@ -16617,23 +16798,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 820 + "__id__": 828 }, "_children": [], "_active": false, "_components": [ { - "__id__": 822 + "__id__": 830 }, { - "__id__": 824 + "__id__": 832 }, { - "__id__": 826 + "__id__": 834 } ], "_prefab": { - "__id__": 828 + "__id__": 836 }, "_lpos": { "__type__": "cc.Vec3", @@ -16670,11 +16851,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 829 }, "_enabled": true, "__prefab": { - "__id__": 823 + "__id__": 831 }, "_contentSize": { "__type__": "cc.Size", @@ -16698,11 +16879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 829 }, "_enabled": true, "__prefab": { - "__id__": 825 + "__id__": 833 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16743,11 +16924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 829 }, "_enabled": true, "__prefab": { - "__id__": 827 + "__id__": 835 }, "_alignFlags": 45, "_target": null, @@ -16792,30 +16973,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 820 + "__id__": 828 }, "_children": [ { - "__id__": 830 + "__id__": 838 }, { - "__id__": 836 + "__id__": 844 } ], "_active": false, "_components": [ { - "__id__": 842 + "__id__": 850 }, { - "__id__": 844 + "__id__": 852 }, { - "__id__": 846 + "__id__": 854 } ], "_prefab": { - "__id__": 848 + "__id__": 856 }, "_lpos": { "__type__": "cc.Vec3", @@ -16852,20 +17033,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 829 + "__id__": 837 }, "_children": [], "_active": true, "_components": [ { - "__id__": 831 + "__id__": 839 }, { - "__id__": 833 + "__id__": 841 } ], "_prefab": { - "__id__": 835 + "__id__": 843 }, "_lpos": { "__type__": "cc.Vec3", @@ -16902,11 +17083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 830 + "__id__": 838 }, "_enabled": true, "__prefab": { - "__id__": 832 + "__id__": 840 }, "_contentSize": { "__type__": "cc.Size", @@ -16930,11 +17111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 830 + "__id__": 838 }, "_enabled": true, "__prefab": { - "__id__": 834 + "__id__": 842 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16988,20 +17169,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 829 + "__id__": 837 }, "_children": [], "_active": true, "_components": [ { - "__id__": 837 + "__id__": 845 }, { - "__id__": 839 + "__id__": 847 } ], "_prefab": { - "__id__": 841 + "__id__": 849 }, "_lpos": { "__type__": "cc.Vec3", @@ -17038,11 +17219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 836 + "__id__": 844 }, "_enabled": true, "__prefab": { - "__id__": 838 + "__id__": 846 }, "_contentSize": { "__type__": "cc.Size", @@ -17066,11 +17247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 836 + "__id__": 844 }, "_enabled": true, "__prefab": { - "__id__": 840 + "__id__": 848 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17147,11 +17328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 829 + "__id__": 837 }, "_enabled": true, "__prefab": { - "__id__": 843 + "__id__": 851 }, "_contentSize": { "__type__": "cc.Size", @@ -17175,11 +17356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 829 + "__id__": 837 }, "_enabled": true, "__prefab": { - "__id__": 845 + "__id__": 853 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17220,11 +17401,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 829 + "__id__": 837 }, "_enabled": true, "__prefab": { - "__id__": 847 + "__id__": 855 }, "_alignFlags": 45, "_target": null, @@ -17269,24 +17450,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 820 + "__id__": 828 }, "_children": [ { - "__id__": 850 + "__id__": 858 } ], "_active": true, "_components": [ { - "__id__": 856 + "__id__": 864 }, { - "__id__": 858 + "__id__": 866 } ], "_prefab": { - "__id__": 860 + "__id__": 868 }, "_lpos": { "__type__": "cc.Vec3", @@ -17323,20 +17504,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 849 + "__id__": 857 }, "_children": [], "_active": true, "_components": [ { - "__id__": 851 + "__id__": 859 }, { - "__id__": 853 + "__id__": 861 } ], "_prefab": { - "__id__": 855 + "__id__": 863 }, "_lpos": { "__type__": "cc.Vec3", @@ -17373,11 +17554,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 850 + "__id__": 858 }, "_enabled": true, "__prefab": { - "__id__": 852 + "__id__": 860 }, "_contentSize": { "__type__": "cc.Size", @@ -17401,11 +17582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 850 + "__id__": 858 }, "_enabled": true, "__prefab": { - "__id__": 854 + "__id__": 862 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17482,11 +17663,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 849 + "__id__": 857 }, "_enabled": true, "__prefab": { - "__id__": 857 + "__id__": 865 }, "_contentSize": { "__type__": "cc.Size", @@ -17510,11 +17691,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 849 + "__id__": 857 }, "_enabled": true, "__prefab": { - "__id__": 859 + "__id__": 867 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17571,11 +17752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 820 + "__id__": 828 }, "_enabled": true, "__prefab": { - "__id__": 862 + "__id__": 870 }, "_contentSize": { "__type__": "cc.Size", @@ -17599,15 +17780,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 820 + "__id__": 828 }, "_enabled": true, "__prefab": { - "__id__": 864 + "__id__": 872 }, "clickEvents": [ { - "__id__": 865 + "__id__": 873 } ], "_interactable": true, @@ -17656,7 +17837,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 728 + "__id__": 736 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -17682,30 +17863,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 737 + "__id__": 745 }, "_children": [ - { - "__id__": 868 - }, { "__id__": 876 }, { - "__id__": 896 + "__id__": 884 + }, + { + "__id__": 904 } ], "_active": true, "_components": [ { - "__id__": 908 + "__id__": 916 }, { - "__id__": 910 + "__id__": 918 } ], "_prefab": { - "__id__": 913 + "__id__": 921 }, "_lpos": { "__type__": "cc.Vec3", @@ -17742,23 +17923,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 867 + "__id__": 875 }, "_children": [], "_active": false, "_components": [ { - "__id__": 869 + "__id__": 877 }, { - "__id__": 871 + "__id__": 879 }, { - "__id__": 873 + "__id__": 881 } ], "_prefab": { - "__id__": 875 + "__id__": 883 }, "_lpos": { "__type__": "cc.Vec3", @@ -17795,11 +17976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 876 }, "_enabled": true, "__prefab": { - "__id__": 870 + "__id__": 878 }, "_contentSize": { "__type__": "cc.Size", @@ -17823,11 +18004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 876 }, "_enabled": true, "__prefab": { - "__id__": 872 + "__id__": 880 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17868,11 +18049,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 876 }, "_enabled": true, "__prefab": { - "__id__": 874 + "__id__": 882 }, "_alignFlags": 45, "_target": null, @@ -17917,30 +18098,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 867 + "__id__": 875 }, "_children": [ { - "__id__": 877 + "__id__": 885 }, { - "__id__": 883 + "__id__": 891 } ], "_active": false, "_components": [ { - "__id__": 889 + "__id__": 897 }, { - "__id__": 891 + "__id__": 899 }, { - "__id__": 893 + "__id__": 901 } ], "_prefab": { - "__id__": 895 + "__id__": 903 }, "_lpos": { "__type__": "cc.Vec3", @@ -17977,20 +18158,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 876 + "__id__": 884 }, "_children": [], "_active": true, "_components": [ { - "__id__": 878 + "__id__": 886 }, { - "__id__": 880 + "__id__": 888 } ], "_prefab": { - "__id__": 882 + "__id__": 890 }, "_lpos": { "__type__": "cc.Vec3", @@ -18027,11 +18208,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 877 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 879 + "__id__": 887 }, "_contentSize": { "__type__": "cc.Size", @@ -18055,11 +18236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 877 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 881 + "__id__": 889 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18113,20 +18294,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 876 + "__id__": 884 }, "_children": [], "_active": true, "_components": [ { - "__id__": 884 + "__id__": 892 }, { - "__id__": 886 + "__id__": 894 } ], "_prefab": { - "__id__": 888 + "__id__": 896 }, "_lpos": { "__type__": "cc.Vec3", @@ -18163,11 +18344,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 883 + "__id__": 891 }, "_enabled": true, "__prefab": { - "__id__": 885 + "__id__": 893 }, "_contentSize": { "__type__": "cc.Size", @@ -18191,11 +18372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 883 + "__id__": 891 }, "_enabled": true, "__prefab": { - "__id__": 887 + "__id__": 895 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18272,11 +18453,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 876 + "__id__": 884 }, "_enabled": true, "__prefab": { - "__id__": 890 + "__id__": 898 }, "_contentSize": { "__type__": "cc.Size", @@ -18300,11 +18481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 876 + "__id__": 884 }, "_enabled": true, "__prefab": { - "__id__": 892 + "__id__": 900 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18345,11 +18526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 876 + "__id__": 884 }, "_enabled": true, "__prefab": { - "__id__": 894 + "__id__": 902 }, "_alignFlags": 45, "_target": null, @@ -18394,24 +18575,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 867 + "__id__": 875 }, "_children": [ { - "__id__": 897 + "__id__": 905 } ], "_active": true, "_components": [ { - "__id__": 903 + "__id__": 911 }, { - "__id__": 905 + "__id__": 913 } ], "_prefab": { - "__id__": 907 + "__id__": 915 }, "_lpos": { "__type__": "cc.Vec3", @@ -18448,20 +18629,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 896 + "__id__": 904 }, "_children": [], "_active": true, "_components": [ { - "__id__": 898 + "__id__": 906 }, { - "__id__": 900 + "__id__": 908 } ], "_prefab": { - "__id__": 902 + "__id__": 910 }, "_lpos": { "__type__": "cc.Vec3", @@ -18498,11 +18679,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 897 + "__id__": 905 }, "_enabled": true, "__prefab": { - "__id__": 899 + "__id__": 907 }, "_contentSize": { "__type__": "cc.Size", @@ -18526,11 +18707,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 897 + "__id__": 905 }, "_enabled": true, "__prefab": { - "__id__": 901 + "__id__": 909 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18607,11 +18788,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 896 + "__id__": 904 }, "_enabled": true, "__prefab": { - "__id__": 904 + "__id__": 912 }, "_contentSize": { "__type__": "cc.Size", @@ -18635,11 +18816,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 896 + "__id__": 904 }, "_enabled": true, "__prefab": { - "__id__": 906 + "__id__": 914 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18693,11 +18874,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 875 }, "_enabled": true, "__prefab": { - "__id__": 909 + "__id__": 917 }, "_contentSize": { "__type__": "cc.Size", @@ -18721,15 +18902,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 875 }, "_enabled": true, "__prefab": { - "__id__": 911 + "__id__": 919 }, "clickEvents": [ { - "__id__": 912 + "__id__": 920 } ], "_interactable": true, @@ -18778,7 +18959,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 728 + "__id__": 736 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -18804,11 +18985,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 737 + "__id__": 745 }, "_enabled": true, "__prefab": { - "__id__": 915 + "__id__": 923 }, "_contentSize": { "__type__": "cc.Size", @@ -18832,11 +19013,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 737 + "__id__": 745 }, "_enabled": true, "__prefab": { - "__id__": 917 + "__id__": 925 }, "_alignFlags": 44, "_target": null, @@ -18868,11 +19049,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 737 + "__id__": 745 }, "_enabled": true, "__prefab": { - "__id__": 919 + "__id__": 927 }, "_resizeMode": 1, "_layoutType": 1, @@ -18919,27 +19100,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 728 + "__id__": 736 }, "_children": [ { - "__id__": 922 + "__id__": 930 } ], "_active": true, "_components": [ { - "__id__": 930 + "__id__": 938 }, { - "__id__": 932 + "__id__": 940 }, { - "__id__": 935 + "__id__": 943 } ], "_prefab": { - "__id__": 937 + "__id__": 945 }, "_lpos": { "__type__": "cc.Vec3", @@ -18976,23 +19157,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 921 + "__id__": 929 }, "_children": [], "_active": true, "_components": [ { - "__id__": 923 + "__id__": 931 }, { - "__id__": 925 + "__id__": 933 }, { - "__id__": 927 + "__id__": 935 } ], "_prefab": { - "__id__": 929 + "__id__": 937 }, "_lpos": { "__type__": "cc.Vec3", @@ -19029,11 +19210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 922 + "__id__": 930 }, "_enabled": true, "__prefab": { - "__id__": 924 + "__id__": 932 }, "_contentSize": { "__type__": "cc.Size", @@ -19057,11 +19238,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 922 + "__id__": 930 }, "_enabled": true, "__prefab": { - "__id__": 926 + "__id__": 934 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19105,11 +19286,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 922 + "__id__": 930 }, "_enabled": true, "__prefab": { - "__id__": 928 + "__id__": 936 }, "_alignFlags": 45, "_target": null, @@ -19154,11 +19335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 921 + "__id__": 929 }, "_enabled": true, "__prefab": { - "__id__": 931 + "__id__": 939 }, "_contentSize": { "__type__": "cc.Size", @@ -19182,15 +19363,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 921 + "__id__": 929 }, "_enabled": true, "__prefab": { - "__id__": 933 + "__id__": 941 }, "clickEvents": [ { - "__id__": 934 + "__id__": 942 } ], "_interactable": true, @@ -19239,7 +19420,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 728 + "__id__": 736 }, "component": "", "_componentId": "11498TbVJpO6qmZ8m9k55Zx", @@ -19252,11 +19433,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 921 + "__id__": 929 }, "_enabled": true, "__prefab": { - "__id__": 936 + "__id__": 944 }, "_alignFlags": 4, "_target": null, @@ -19301,11 +19482,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 728 + "__id__": 736 }, "_enabled": true, "__prefab": { - "__id__": 939 + "__id__": 947 }, "_contentSize": { "__type__": "cc.Size", @@ -19329,11 +19510,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 728 + "__id__": 736 }, "_enabled": true, "__prefab": { - "__id__": 941 + "__id__": 949 }, "_alignFlags": 21, "_target": null, @@ -19365,20 +19546,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 728 + "__id__": 736 }, "_enabled": true, "__prefab": { - "__id__": 943 + "__id__": 951 }, "home_btn": { - "__id__": 779 + "__id__": 787 }, "hero_btn": { - "__id__": 738 + "__id__": 746 }, "rank_btn": { - "__id__": 867 + "__id__": 875 }, "_id": "" }, @@ -19406,14 +19587,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 946 + "__id__": 954 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 945 + "__id__": 953 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -19421,7 +19602,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 947 + "__id__": 955 }, "targetOverrides": null }, @@ -19435,19 +19616,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 948 + "__id__": 956 }, { - "__id__": 950 + "__id__": 958 }, { - "__id__": 951 + "__id__": 959 }, { - "__id__": 952 + "__id__": 960 }, { - "__id__": 953 + "__id__": 961 } ], "removedComponents": [] @@ -19455,7 +19636,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 957 }, "propertyPath": [ "_name" @@ -19471,7 +19652,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 957 }, "propertyPath": [ "_lpos" @@ -19486,7 +19667,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 957 }, "propertyPath": [ "_lrot" @@ -19502,7 +19683,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 957 }, "propertyPath": [ "_euler" @@ -19517,7 +19698,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 949 + "__id__": 957 }, "propertyPath": [ "_active" @@ -19534,23 +19715,23 @@ }, "_children": [ { - "__id__": 955 + "__id__": 963 } ], "_active": true, "_components": [ { - "__id__": 993 + "__id__": 1001 }, { - "__id__": 995 + "__id__": 1003 }, { - "__id__": 997 + "__id__": 1005 } ], "_prefab": { - "__id__": 999 + "__id__": 1007 }, "_lpos": { "__type__": "cc.Vec3", @@ -19587,30 +19768,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 954 + "__id__": 962 }, "_children": [ { - "__id__": 956 + "__id__": 964 } ], "_active": true, "_components": [ { - "__id__": 984 + "__id__": 992 }, { - "__id__": 986 + "__id__": 994 }, { - "__id__": 988 + "__id__": 996 }, { - "__id__": 990 + "__id__": 998 } ], "_prefab": { - "__id__": 992 + "__id__": 1000 }, "_lpos": { "__type__": "cc.Vec3", @@ -19647,27 +19828,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 955 + "__id__": 963 }, "_children": [ - { - "__id__": 957 - }, { "__id__": 965 }, { - "__id__": 971 + "__id__": 973 + }, + { + "__id__": 979 } ], "_active": true, "_components": [ { - "__id__": 981 + "__id__": 989 } ], "_prefab": { - "__id__": 983 + "__id__": 991 }, "_lpos": { "__type__": "cc.Vec3", @@ -19704,23 +19885,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 956 + "__id__": 964 }, "_children": [], "_active": true, "_components": [ { - "__id__": 958 + "__id__": 966 }, { - "__id__": 960 + "__id__": 968 }, { - "__id__": 962 + "__id__": 970 } ], "_prefab": { - "__id__": 964 + "__id__": 972 }, "_lpos": { "__type__": "cc.Vec3", @@ -19757,11 +19938,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 957 + "__id__": 965 }, "_enabled": true, "__prefab": { - "__id__": 959 + "__id__": 967 }, "_contentSize": { "__type__": "cc.Size", @@ -19785,11 +19966,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 957 + "__id__": 965 }, "_enabled": true, "__prefab": { - "__id__": 961 + "__id__": 969 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19833,11 +20014,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 957 + "__id__": 965 }, "_enabled": true, "__prefab": { - "__id__": 963 + "__id__": 971 }, "_alignFlags": 40, "_target": null, @@ -19882,20 +20063,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 956 + "__id__": 964 }, "_children": [], "_active": true, "_components": [ { - "__id__": 966 + "__id__": 974 }, { - "__id__": 968 + "__id__": 976 } ], "_prefab": { - "__id__": 970 + "__id__": 978 }, "_lpos": { "__type__": "cc.Vec3", @@ -19932,11 +20113,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 965 + "__id__": 973 }, "_enabled": true, "__prefab": { - "__id__": 967 + "__id__": 975 }, "_contentSize": { "__type__": "cc.Size", @@ -19960,11 +20141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 965 + "__id__": 973 }, "_enabled": true, "__prefab": { - "__id__": 969 + "__id__": 977 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20021,26 +20202,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 956 + "__id__": 964 }, "_children": [], "_active": true, "_components": [ { - "__id__": 972 + "__id__": 980 }, { - "__id__": 974 + "__id__": 982 }, { - "__id__": 976 + "__id__": 984 }, { - "__id__": 978 + "__id__": 986 } ], "_prefab": { - "__id__": 980 + "__id__": 988 }, "_lpos": { "__type__": "cc.Vec3", @@ -20077,11 +20258,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 971 + "__id__": 979 }, "_enabled": true, "__prefab": { - "__id__": 973 + "__id__": 981 }, "_contentSize": { "__type__": "cc.Size", @@ -20105,11 +20286,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 971 + "__id__": 979 }, "_enabled": true, "__prefab": { - "__id__": 975 + "__id__": 983 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20173,11 +20354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 971 + "__id__": 979 }, "_enabled": true, "__prefab": { - "__id__": 977 + "__id__": 985 }, "_alignFlags": 10, "_target": null, @@ -20209,11 +20390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 971 + "__id__": 979 }, "_enabled": true, "__prefab": { - "__id__": 979 + "__id__": 987 }, "templateMode": true, "watchPath": "data.data.gold", @@ -20246,11 +20427,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 956 + "__id__": 964 }, "_enabled": true, "__prefab": { - "__id__": 982 + "__id__": 990 }, "_contentSize": { "__type__": "cc.Size", @@ -20287,11 +20468,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 955 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 985 + "__id__": 993 }, "_contentSize": { "__type__": "cc.Size", @@ -20315,11 +20496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 955 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 987 + "__id__": 995 }, "_alignFlags": 8, "_target": null, @@ -20351,11 +20532,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 955 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 989 + "__id__": 997 }, "_resizeMode": 0, "_layoutType": 1, @@ -20389,11 +20570,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 955 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 991 + "__id__": 999 }, "_alignFlags": 40, "_target": null, @@ -20438,11 +20619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 954 + "__id__": 962 }, "_enabled": true, "__prefab": { - "__id__": 994 + "__id__": 1002 }, "_contentSize": { "__type__": "cc.Size", @@ -20466,11 +20647,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 954 + "__id__": 962 }, "_enabled": true, "__prefab": { - "__id__": 996 + "__id__": 1004 }, "_alignFlags": 17, "_target": null, @@ -20502,11 +20683,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 954 + "__id__": 962 }, "_enabled": true, "__prefab": { - "__id__": 998 + "__id__": 1006 }, "_id": "" }, @@ -20537,7 +20718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1001 + "__id__": 1009 }, "_contentSize": { "__type__": "cc.Size", @@ -20565,7 +20746,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1003 + "__id__": 1011 }, "_alignFlags": 45, "_target": null, @@ -20601,7 +20782,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1005 + "__id__": 1013 }, "debugMode": false, "_id": "" @@ -20623,10 +20804,10 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 945 + "__id__": 953 }, { - "__id__": 704 + "__id__": 712 }, { "__id__": 502 diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index 8e738a8e..934535f8 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -288,6 +288,17 @@ export class MissionComp extends CCComp { },0.5) } + /** 更新开始按钮的状态显示 */ + private updateStartBtnState() { + if (!this.start_btn || !this.start_btn.isValid) return; + const nobg = this.start_btn.getChildByName("nobg"); + if (nobg) { + // 只有在 Prepare 阶段且未暂停时,按钮才可点击,否则激活 nobg(显示不可点击状态) + const canClick = this.currentPhase === MissionPhase.Prepare && smc.mission.play && !smc.mission.pause; + nobg.active = !canClick; + } + } + /** * 阶段切换核心方法(状态机) * 处理状态流转时所需的事件触发和全局标志位修改。 @@ -330,7 +341,7 @@ export class MissionComp extends CCComp { smc.mission.in_fight = false; smc.vmdata.mission_data.in_fight = false; smc.mission.stop_spawn_mon = true; - if (this.start_btn && this.start_btn.isValid) this.start_btn.active = false; + // 不隐藏开始按钮,点击事件在 onStartFightBtnClick 内部做了阶段拦截 break; case MissionPhase.Prepare: @@ -338,7 +349,7 @@ export class MissionComp extends CCComp { break; case MissionPhase.PrepareEnd: - if (this.start_btn && this.start_btn.isValid) this.start_btn.active = false; + // 不隐藏开始按钮 oops.message.dispatchEvent("PhasePrepareEnd"); break; @@ -366,7 +377,7 @@ export class MissionComp extends CCComp { smc.mission.in_fight = false; smc.vmdata.mission_data.in_fight = false; smc.mission.stop_spawn_mon = true; - if (this.start_btn && this.start_btn.isValid) this.start_btn.active = false; + // 不隐藏开始按钮 break; case MissionPhase.None: @@ -376,6 +387,9 @@ export class MissionComp extends CCComp { if (this.start_btn && this.start_btn.isValid) this.start_btn.active = false; break; } + + // 阶段切换后更新按钮状态 + this.updateStartBtnState(); } /** 自动流转到下一阶段(过渡状态结束时调用) */