From 197e913c5366d3a08dedd0cb235784e8037ceec8 Mon Sep 17 00:00:00 2001 From: panw Date: Wed, 1 Apr 2026 16:54:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=8B=B1=E9=9B=84=E5=88=97=E8=A1=A8):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=8D=E5=90=8E=E8=8B=B1=E9=9B=84=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E5=B9=B6=E6=94=B9=E8=BF=9B=E5=8A=A8=E7=94=BB=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 phero_icon 和 nhero_icon 节点用于显示前后英雄 - 将 iconVisualToken 改为 Map 结构以分别管理多个节点的动画令牌 - 在更新显示时加载并播放当前、前一个及后一个英雄的动画 - 优化动画加载的取消逻辑,避免令牌不匹配导致的动画错误 --- assets/resources/gui/role_controller.prefab | 1563 ++++++++++++------- assets/script/game/map/HlistComp.ts | 20 +- 2 files changed, 980 insertions(+), 603 deletions(-) diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index f0a87c3a..e804ab3e 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -25,26 +25,26 @@ "__id__": 571 }, { - "__id__": 1060 + "__id__": 1077 }, { - "__id__": 1069 + "__id__": 1086 } ], "_active": true, "_components": [ { - "__id__": 1115 + "__id__": 1132 }, { - "__id__": 1117 + "__id__": 1134 }, { - "__id__": 1119 + "__id__": 1136 } ], "_prefab": { - "__id__": 1121 + "__id__": 1138 }, "_lpos": { "__type__": "cc.Vec3", @@ -11749,23 +11749,23 @@ "__id__": 756 }, { - "__id__": 1039 + "__id__": 1056 } ], "_active": true, "_components": [ { - "__id__": 1053 + "__id__": 1070 }, { - "__id__": 1055 + "__id__": 1072 }, { - "__id__": 1057 + "__id__": 1074 } ], "_prefab": { - "__id__": 1059 + "__id__": 1076 }, "_lpos": { "__type__": "cc.Vec3", @@ -15623,38 +15623,44 @@ "__id__": 765 }, { - "__id__": 778 + "__id__": 775 }, { - "__id__": 806 + "__id__": 785 }, { - "__id__": 834 + "__id__": 795 }, { - "__id__": 848 + "__id__": 823 }, { - "__id__": 1016 + "__id__": 851 }, { - "__id__": 1024 + "__id__": 865 + }, + { + "__id__": 1033 + }, + { + "__id__": 1041 } ], "_active": true, "_components": [ { - "__id__": 1032 + "__id__": 1049 }, { - "__id__": 1034 + "__id__": 1051 }, { - "__id__": 1036 + "__id__": 1053 } ], "_prefab": { - "__id__": 1038 + "__id__": 1055 }, "_lpos": { "__type__": "cc.Vec3", @@ -15862,7 +15868,7 @@ }, { "__type__": "cc.Node", - "_name": "hAnm", + "_name": "pAnm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -15882,18 +15888,15 @@ }, { "__id__": 772 - }, - { - "__id__": 775 } ], "_prefab": { - "__id__": 777 + "__id__": 774 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 200, + "x": -185.609, + "y": -377.937, "z": 0 }, "_lrot": { @@ -15905,8 +15908,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -3, - "y": 3, + "x": -2, + "y": 2, "z": 1 }, "_mobility": 0, @@ -15933,8 +15936,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 + "width": 128, + "height": 128 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -15945,7 +15948,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3cLWNVWzJEe4LfnOHF6sHz" + "fileId": "b0SZlArWpB3bzSvOXOjJPd" }, { "__type__": "cc.Sprite", @@ -15969,7 +15972,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85704", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 1, @@ -15982,12 +15988,15 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2cMezUYgdE1a+n244zNovg" + "fileId": "28BdNDlQJJWbg0PmHivD43" }, { "__type__": "cc.Animation", @@ -16016,77 +16025,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "66W1OgQ+dAabn8vRMcLrOT" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 765 - }, - "_enabled": true, - "__prefab": { - "__id__": 773 - }, - "clickEvents": [ - { - "__id__": 774 - } - ], - "_interactable": true, - "_transition": 3, - "_normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_hoverColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_pressedColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_normalSprite": null, - "_hoverSprite": null, - "_pressedSprite": null, - "_disabledSprite": null, - "_duration": 0.1, - "_zoomScale": 1.2, - "_target": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "dejznyQHtMmqDTEYvoyHxP" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 50 - }, - "component": "", - "_componentId": "a832fh9yR9LJK1kR+tZ1lin", - "handler": "onOpenIBox", - "customEventData": "" + "fileId": "0fciCs3adGNLC3pyChj7GC" }, { "__type__": "cc.Widget", @@ -16098,16 +16037,226 @@ }, "_enabled": true, "__prefab": { - "__id__": 776 + "__id__": 773 }, - "_alignFlags": 18, + "_alignFlags": 20, "_target": null, "_left": 295, "_right": 0, "_top": 0, - "_bottom": 691.178, + "_bottom": 134.063, + "_horizontalCenter": -185.609, + "_verticalCenter": -395.126, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b4ZsIoeUBBxY4ofmGb/rQU" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8b3z4tVmlKxIFxykamvAqe", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "hAnm", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 756 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 776 + }, + { + "__id__": 778 + }, + { + "__id__": 780 + }, + { + "__id__": 782 + } + ], + "_prefab": { + "__id__": 784 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -377.937, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": -2, + "y": 2, + "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__": 775 + }, + "_enabled": true, + "__prefab": { + "__id__": 777 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 128, + "height": 128 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3cLWNVWzJEe4LfnOHF6sHz" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 775 + }, + "_enabled": true, + "__prefab": { + "__id__": 779 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85704", + "__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": { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2cMezUYgdE1a+n244zNovg" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 775 + }, + "_enabled": true, + "__prefab": { + "__id__": 781 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "66W1OgQ+dAabn8vRMcLrOT" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 775 + }, + "_enabled": true, + "__prefab": { + "__id__": 783 + }, + "_alignFlags": 20, + "_target": null, + "_left": 295, + "_right": 0, + "_top": 0, + "_bottom": 134.063, "_horizontalCenter": 0, - "_verticalCenter": 200, + "_verticalCenter": -395.126, "_isAbsLeft": true, "_isAbsRight": true, "_isAbsTop": true, @@ -16137,6 +16286,216 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "nAnm", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 756 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 786 + }, + { + "__id__": 788 + }, + { + "__id__": 790 + }, + { + "__id__": 792 + } + ], + "_prefab": { + "__id__": 794 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 197.394, + "y": -377.937, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": -2, + "y": 2, + "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__": 785 + }, + "_enabled": true, + "__prefab": { + "__id__": 787 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 128, + "height": 128 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2OvbAyehFYJmiRuOewkfr" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 785 + }, + "_enabled": true, + "__prefab": { + "__id__": 789 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85704", + "__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": { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6f6Ut62+xANIEigPxxKkQA" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 785 + }, + "_enabled": true, + "__prefab": { + "__id__": 791 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a149Aecg1Bq5gFUOu/3aZ+" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 785 + }, + "_enabled": true, + "__prefab": { + "__id__": 793 + }, + "_alignFlags": 20, + "_target": null, + "_left": 295, + "_right": 0, + "_top": 0, + "_bottom": 134.063, + "_horizontalCenter": 197.394, + "_verticalCenter": -395.126, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdDPKvpy5DkLDx8ExZjmlB" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "04wpCxpThCVrKufc9rJaI7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "ap", @@ -16147,29 +16506,29 @@ }, "_children": [ { - "__id__": 779 + "__id__": 796 }, { - "__id__": 787 + "__id__": 804 }, { - "__id__": 793 + "__id__": 810 } ], "_active": true, "_components": [ { - "__id__": 799 + "__id__": 816 }, { - "__id__": 801 + "__id__": 818 }, { - "__id__": 803 + "__id__": 820 } ], "_prefab": { - "__id__": 805 + "__id__": 822 }, "_lpos": { "__type__": "cc.Vec3", @@ -16206,23 +16565,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 778 + "__id__": 795 }, "_children": [], "_active": true, "_components": [ { - "__id__": 780 + "__id__": 797 }, { - "__id__": 782 + "__id__": 799 }, { - "__id__": 784 + "__id__": 801 } ], "_prefab": { - "__id__": 786 + "__id__": 803 }, "_lpos": { "__type__": "cc.Vec3", @@ -16259,11 +16618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 796 }, "_enabled": true, "__prefab": { - "__id__": 781 + "__id__": 798 }, "_contentSize": { "__type__": "cc.Size", @@ -16287,11 +16646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 796 }, "_enabled": true, "__prefab": { - "__id__": 783 + "__id__": 800 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16335,11 +16694,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 779 + "__id__": 796 }, "_enabled": true, "__prefab": { - "__id__": 785 + "__id__": 802 }, "_alignFlags": 45, "_target": null, @@ -16384,20 +16743,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 778 + "__id__": 795 }, "_children": [], "_active": true, "_components": [ { - "__id__": 788 + "__id__": 805 }, { - "__id__": 790 + "__id__": 807 } ], "_prefab": { - "__id__": 792 + "__id__": 809 }, "_lpos": { "__type__": "cc.Vec3", @@ -16434,11 +16793,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 787 + "__id__": 804 }, "_enabled": true, "__prefab": { - "__id__": 789 + "__id__": 806 }, "_contentSize": { "__type__": "cc.Size", @@ -16462,11 +16821,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 787 + "__id__": 804 }, "_enabled": true, "__prefab": { - "__id__": 791 + "__id__": 808 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16520,20 +16879,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 778 + "__id__": 795 }, "_children": [], "_active": true, "_components": [ { - "__id__": 794 + "__id__": 811 }, { - "__id__": 796 + "__id__": 813 } ], "_prefab": { - "__id__": 798 + "__id__": 815 }, "_lpos": { "__type__": "cc.Vec3", @@ -16570,11 +16929,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 793 + "__id__": 810 }, "_enabled": true, "__prefab": { - "__id__": 795 + "__id__": 812 }, "_contentSize": { "__type__": "cc.Size", @@ -16598,11 +16957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 793 + "__id__": 810 }, "_enabled": true, "__prefab": { - "__id__": 797 + "__id__": 814 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16679,11 +17038,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 778 + "__id__": 795 }, "_enabled": true, "__prefab": { - "__id__": 800 + "__id__": 817 }, "_contentSize": { "__type__": "cc.Size", @@ -16707,11 +17066,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 778 + "__id__": 795 }, "_enabled": false, "__prefab": { - "__id__": 802 + "__id__": 819 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16752,11 +17111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 778 + "__id__": 795 }, "_enabled": true, "__prefab": { - "__id__": 804 + "__id__": 821 }, "_alignFlags": 12, "_target": null, @@ -16805,29 +17164,29 @@ }, "_children": [ { - "__id__": 807 + "__id__": 824 }, { - "__id__": 815 + "__id__": 832 }, { - "__id__": 821 + "__id__": 838 } ], "_active": true, "_components": [ { - "__id__": 827 + "__id__": 844 }, { - "__id__": 829 + "__id__": 846 }, { - "__id__": 831 + "__id__": 848 } ], "_prefab": { - "__id__": 833 + "__id__": 850 }, "_lpos": { "__type__": "cc.Vec3", @@ -16864,23 +17223,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 806 + "__id__": 823 }, "_children": [], "_active": true, "_components": [ { - "__id__": 808 + "__id__": 825 }, { - "__id__": 810 + "__id__": 827 }, { - "__id__": 812 + "__id__": 829 } ], "_prefab": { - "__id__": 814 + "__id__": 831 }, "_lpos": { "__type__": "cc.Vec3", @@ -16917,11 +17276,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 807 + "__id__": 824 }, "_enabled": true, "__prefab": { - "__id__": 809 + "__id__": 826 }, "_contentSize": { "__type__": "cc.Size", @@ -16945,11 +17304,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 807 + "__id__": 824 }, "_enabled": true, "__prefab": { - "__id__": 811 + "__id__": 828 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16993,11 +17352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 807 + "__id__": 824 }, "_enabled": true, "__prefab": { - "__id__": 813 + "__id__": 830 }, "_alignFlags": 45, "_target": null, @@ -17042,20 +17401,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 806 + "__id__": 823 }, "_children": [], "_active": true, "_components": [ { - "__id__": 816 + "__id__": 833 }, { - "__id__": 818 + "__id__": 835 } ], "_prefab": { - "__id__": 820 + "__id__": 837 }, "_lpos": { "__type__": "cc.Vec3", @@ -17092,11 +17451,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 815 + "__id__": 832 }, "_enabled": true, "__prefab": { - "__id__": 817 + "__id__": 834 }, "_contentSize": { "__type__": "cc.Size", @@ -17120,11 +17479,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 815 + "__id__": 832 }, "_enabled": true, "__prefab": { - "__id__": 819 + "__id__": 836 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17178,20 +17537,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 806 + "__id__": 823 }, "_children": [], "_active": true, "_components": [ { - "__id__": 822 + "__id__": 839 }, { - "__id__": 824 + "__id__": 841 } ], "_prefab": { - "__id__": 826 + "__id__": 843 }, "_lpos": { "__type__": "cc.Vec3", @@ -17228,11 +17587,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 838 }, "_enabled": true, "__prefab": { - "__id__": 823 + "__id__": 840 }, "_contentSize": { "__type__": "cc.Size", @@ -17256,11 +17615,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 821 + "__id__": 838 }, "_enabled": true, "__prefab": { - "__id__": 825 + "__id__": 842 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17337,11 +17696,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 823 }, "_enabled": true, "__prefab": { - "__id__": 828 + "__id__": 845 }, "_contentSize": { "__type__": "cc.Size", @@ -17365,11 +17724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 823 }, "_enabled": false, "__prefab": { - "__id__": 830 + "__id__": 847 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17410,11 +17769,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 806 + "__id__": 823 }, "_enabled": true, "__prefab": { - "__id__": 832 + "__id__": 849 }, "_alignFlags": 12, "_target": null, @@ -17463,23 +17822,23 @@ }, "_children": [ { - "__id__": 835 + "__id__": 852 } ], "_active": true, "_components": [ { - "__id__": 841 + "__id__": 858 }, { - "__id__": 843 + "__id__": 860 }, { - "__id__": 845 + "__id__": 862 } ], "_prefab": { - "__id__": 847 + "__id__": 864 }, "_lpos": { "__type__": "cc.Vec3", @@ -17516,20 +17875,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 834 + "__id__": 851 }, "_children": [], "_active": true, "_components": [ { - "__id__": 836 + "__id__": 853 }, { - "__id__": 838 + "__id__": 855 } ], "_prefab": { - "__id__": 840 + "__id__": 857 }, "_lpos": { "__type__": "cc.Vec3", @@ -17566,11 +17925,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 835 + "__id__": 852 }, "_enabled": true, "__prefab": { - "__id__": 837 + "__id__": 854 }, "_contentSize": { "__type__": "cc.Size", @@ -17594,11 +17953,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 835 + "__id__": 852 }, "_enabled": true, "__prefab": { - "__id__": 839 + "__id__": 856 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17675,11 +18034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 834 + "__id__": 851 }, "_enabled": true, "__prefab": { - "__id__": 842 + "__id__": 859 }, "_contentSize": { "__type__": "cc.Size", @@ -17703,11 +18062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 834 + "__id__": 851 }, "_enabled": true, "__prefab": { - "__id__": 844 + "__id__": 861 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17751,11 +18110,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 834 + "__id__": 851 }, "_enabled": true, "__prefab": { - "__id__": 846 + "__id__": 863 }, "_alignFlags": 18, "_target": null, @@ -17804,35 +18163,35 @@ }, "_children": [ { - "__id__": 849 + "__id__": 866 }, { - "__id__": 881 + "__id__": 898 }, { - "__id__": 913 + "__id__": 930 }, { - "__id__": 945 + "__id__": 962 }, { - "__id__": 977 + "__id__": 994 } ], "_active": true, "_components": [ { - "__id__": 1009 + "__id__": 1026 }, { - "__id__": 1011 + "__id__": 1028 }, { - "__id__": 1013 + "__id__": 1030 } ], "_prefab": { - "__id__": 1015 + "__id__": 1032 }, "_lpos": { "__type__": "cc.Vec3", @@ -17869,33 +18228,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 848 + "__id__": 865 }, "_children": [ { - "__id__": 850 + "__id__": 867 }, { - "__id__": 856 + "__id__": 873 }, { - "__id__": 862 + "__id__": 879 }, { - "__id__": 868 + "__id__": 885 } ], "_active": true, "_components": [ { - "__id__": 876 + "__id__": 893 }, { - "__id__": 878 + "__id__": 895 } ], "_prefab": { - "__id__": 880 + "__id__": 897 }, "_lpos": { "__type__": "cc.Vec3", @@ -17932,20 +18291,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 849 + "__id__": 866 }, "_children": [], "_active": true, "_components": [ { - "__id__": 851 + "__id__": 868 }, { - "__id__": 853 + "__id__": 870 } ], "_prefab": { - "__id__": 855 + "__id__": 872 }, "_lpos": { "__type__": "cc.Vec3", @@ -17982,11 +18341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 850 + "__id__": 867 }, "_enabled": true, "__prefab": { - "__id__": 852 + "__id__": 869 }, "_contentSize": { "__type__": "cc.Size", @@ -18010,11 +18369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 850 + "__id__": 867 }, "_enabled": true, "__prefab": { - "__id__": 854 + "__id__": 871 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18068,20 +18427,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 849 + "__id__": 866 }, "_children": [], "_active": true, "_components": [ { - "__id__": 857 + "__id__": 874 }, { - "__id__": 859 + "__id__": 876 } ], "_prefab": { - "__id__": 861 + "__id__": 878 }, "_lpos": { "__type__": "cc.Vec3", @@ -18118,11 +18477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 856 + "__id__": 873 }, "_enabled": true, "__prefab": { - "__id__": 858 + "__id__": 875 }, "_contentSize": { "__type__": "cc.Size", @@ -18146,11 +18505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 856 + "__id__": 873 }, "_enabled": true, "__prefab": { - "__id__": 860 + "__id__": 877 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18207,20 +18566,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 849 + "__id__": 866 }, "_children": [], "_active": true, "_components": [ { - "__id__": 863 + "__id__": 880 }, { - "__id__": 865 + "__id__": 882 } ], "_prefab": { - "__id__": 867 + "__id__": 884 }, "_lpos": { "__type__": "cc.Vec3", @@ -18257,11 +18616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 862 + "__id__": 879 }, "_enabled": true, "__prefab": { - "__id__": 864 + "__id__": 881 }, "_contentSize": { "__type__": "cc.Size", @@ -18285,11 +18644,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 862 + "__id__": 879 }, "_enabled": true, "__prefab": { - "__id__": 866 + "__id__": 883 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18346,23 +18705,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 849 + "__id__": 866 }, "_children": [], "_active": true, "_components": [ { - "__id__": 869 + "__id__": 886 }, { - "__id__": 871 + "__id__": 888 }, { - "__id__": 873 + "__id__": 890 } ], "_prefab": { - "__id__": 875 + "__id__": 892 }, "_lpos": { "__type__": "cc.Vec3", @@ -18399,11 +18758,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 870 + "__id__": 887 }, "_contentSize": { "__type__": "cc.Size", @@ -18427,11 +18786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 872 + "__id__": 889 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18495,11 +18854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 868 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 874 + "__id__": 891 }, "_alignFlags": 40, "_target": null, @@ -18544,11 +18903,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 849 + "__id__": 866 }, "_enabled": true, "__prefab": { - "__id__": 877 + "__id__": 894 }, "_contentSize": { "__type__": "cc.Size", @@ -18572,11 +18931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 849 + "__id__": 866 }, "_enabled": true, "__prefab": { - "__id__": 879 + "__id__": 896 }, "_alignFlags": 40, "_target": null, @@ -18621,33 +18980,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 848 + "__id__": 865 }, "_children": [ { - "__id__": 882 + "__id__": 899 }, { - "__id__": 890 + "__id__": 907 }, { - "__id__": 896 + "__id__": 913 }, { - "__id__": 902 + "__id__": 919 } ], "_active": true, "_components": [ { - "__id__": 908 + "__id__": 925 }, { - "__id__": 910 + "__id__": 927 } ], "_prefab": { - "__id__": 912 + "__id__": 929 }, "_lpos": { "__type__": "cc.Vec3", @@ -18684,23 +19043,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 881 + "__id__": 898 }, "_children": [], "_active": true, "_components": [ { - "__id__": 883 + "__id__": 900 }, { - "__id__": 885 + "__id__": 902 }, { - "__id__": 887 + "__id__": 904 } ], "_prefab": { - "__id__": 889 + "__id__": 906 }, "_lpos": { "__type__": "cc.Vec3", @@ -18737,11 +19096,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 882 + "__id__": 899 }, "_enabled": true, "__prefab": { - "__id__": 884 + "__id__": 901 }, "_contentSize": { "__type__": "cc.Size", @@ -18765,11 +19124,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 882 + "__id__": 899 }, "_enabled": true, "__prefab": { - "__id__": 886 + "__id__": 903 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18833,11 +19192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 882 + "__id__": 899 }, "_enabled": true, "__prefab": { - "__id__": 888 + "__id__": 905 }, "_alignFlags": 40, "_target": null, @@ -18882,20 +19241,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 881 + "__id__": 898 }, "_children": [], "_active": true, "_components": [ { - "__id__": 891 + "__id__": 908 }, { - "__id__": 893 + "__id__": 910 } ], "_prefab": { - "__id__": 895 + "__id__": 912 }, "_lpos": { "__type__": "cc.Vec3", @@ -18932,11 +19291,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 890 + "__id__": 907 }, "_enabled": true, "__prefab": { - "__id__": 892 + "__id__": 909 }, "_contentSize": { "__type__": "cc.Size", @@ -18960,11 +19319,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 890 + "__id__": 907 }, "_enabled": true, "__prefab": { - "__id__": 894 + "__id__": 911 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19018,20 +19377,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 881 + "__id__": 898 }, "_children": [], "_active": true, "_components": [ { - "__id__": 897 + "__id__": 914 }, { - "__id__": 899 + "__id__": 916 } ], "_prefab": { - "__id__": 901 + "__id__": 918 }, "_lpos": { "__type__": "cc.Vec3", @@ -19068,11 +19427,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 896 + "__id__": 913 }, "_enabled": true, "__prefab": { - "__id__": 898 + "__id__": 915 }, "_contentSize": { "__type__": "cc.Size", @@ -19096,11 +19455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 896 + "__id__": 913 }, "_enabled": true, "__prefab": { - "__id__": 900 + "__id__": 917 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19157,20 +19516,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 881 + "__id__": 898 }, "_children": [], "_active": true, "_components": [ { - "__id__": 903 + "__id__": 920 }, { - "__id__": 905 + "__id__": 922 } ], "_prefab": { - "__id__": 907 + "__id__": 924 }, "_lpos": { "__type__": "cc.Vec3", @@ -19207,11 +19566,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 902 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 904 + "__id__": 921 }, "_contentSize": { "__type__": "cc.Size", @@ -19235,11 +19594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 902 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 906 + "__id__": 923 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19296,11 +19655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 881 + "__id__": 898 }, "_enabled": true, "__prefab": { - "__id__": 909 + "__id__": 926 }, "_contentSize": { "__type__": "cc.Size", @@ -19324,11 +19683,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 881 + "__id__": 898 }, "_enabled": true, "__prefab": { - "__id__": 911 + "__id__": 928 }, "_alignFlags": 40, "_target": null, @@ -19373,33 +19732,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 848 + "__id__": 865 }, "_children": [ { - "__id__": 914 + "__id__": 931 }, { - "__id__": 922 + "__id__": 939 }, { - "__id__": 928 + "__id__": 945 }, { - "__id__": 934 + "__id__": 951 } ], "_active": true, "_components": [ { - "__id__": 940 + "__id__": 957 }, { - "__id__": 942 + "__id__": 959 } ], "_prefab": { - "__id__": 944 + "__id__": 961 }, "_lpos": { "__type__": "cc.Vec3", @@ -19436,23 +19795,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 913 + "__id__": 930 }, "_children": [], "_active": true, "_components": [ { - "__id__": 915 + "__id__": 932 }, { - "__id__": 917 + "__id__": 934 }, { - "__id__": 919 + "__id__": 936 } ], "_prefab": { - "__id__": 921 + "__id__": 938 }, "_lpos": { "__type__": "cc.Vec3", @@ -19489,11 +19848,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 914 + "__id__": 931 }, "_enabled": true, "__prefab": { - "__id__": 916 + "__id__": 933 }, "_contentSize": { "__type__": "cc.Size", @@ -19517,11 +19876,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 914 + "__id__": 931 }, "_enabled": true, "__prefab": { - "__id__": 918 + "__id__": 935 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19585,11 +19944,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 914 + "__id__": 931 }, "_enabled": true, "__prefab": { - "__id__": 920 + "__id__": 937 }, "_alignFlags": 40, "_target": null, @@ -19634,20 +19993,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 913 + "__id__": 930 }, "_children": [], "_active": true, "_components": [ { - "__id__": 923 + "__id__": 940 }, { - "__id__": 925 + "__id__": 942 } ], "_prefab": { - "__id__": 927 + "__id__": 944 }, "_lpos": { "__type__": "cc.Vec3", @@ -19684,11 +20043,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 922 + "__id__": 939 }, "_enabled": true, "__prefab": { - "__id__": 924 + "__id__": 941 }, "_contentSize": { "__type__": "cc.Size", @@ -19712,11 +20071,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 922 + "__id__": 939 }, "_enabled": true, "__prefab": { - "__id__": 926 + "__id__": 943 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19770,20 +20129,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 913 + "__id__": 930 }, "_children": [], "_active": true, "_components": [ { - "__id__": 929 + "__id__": 946 }, { - "__id__": 931 + "__id__": 948 } ], "_prefab": { - "__id__": 933 + "__id__": 950 }, "_lpos": { "__type__": "cc.Vec3", @@ -19820,11 +20179,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 928 + "__id__": 945 }, "_enabled": true, "__prefab": { - "__id__": 930 + "__id__": 947 }, "_contentSize": { "__type__": "cc.Size", @@ -19848,11 +20207,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 928 + "__id__": 945 }, "_enabled": true, "__prefab": { - "__id__": 932 + "__id__": 949 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19909,20 +20268,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 913 + "__id__": 930 }, "_children": [], "_active": true, "_components": [ { - "__id__": 935 + "__id__": 952 }, { - "__id__": 937 + "__id__": 954 } ], "_prefab": { - "__id__": 939 + "__id__": 956 }, "_lpos": { "__type__": "cc.Vec3", @@ -19959,11 +20318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 951 }, "_enabled": true, "__prefab": { - "__id__": 936 + "__id__": 953 }, "_contentSize": { "__type__": "cc.Size", @@ -19987,11 +20346,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 934 + "__id__": 951 }, "_enabled": true, "__prefab": { - "__id__": 938 + "__id__": 955 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20048,11 +20407,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 913 + "__id__": 930 }, "_enabled": true, "__prefab": { - "__id__": 941 + "__id__": 958 }, "_contentSize": { "__type__": "cc.Size", @@ -20076,11 +20435,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 913 + "__id__": 930 }, "_enabled": true, "__prefab": { - "__id__": 943 + "__id__": 960 }, "_alignFlags": 40, "_target": null, @@ -20125,33 +20484,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 848 + "__id__": 865 }, "_children": [ { - "__id__": 946 + "__id__": 963 }, { - "__id__": 954 + "__id__": 971 }, { - "__id__": 960 + "__id__": 977 }, { - "__id__": 966 + "__id__": 983 } ], "_active": true, "_components": [ { - "__id__": 972 + "__id__": 989 }, { - "__id__": 974 + "__id__": 991 } ], "_prefab": { - "__id__": 976 + "__id__": 993 }, "_lpos": { "__type__": "cc.Vec3", @@ -20188,23 +20547,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 945 + "__id__": 962 }, "_children": [], "_active": true, "_components": [ { - "__id__": 947 + "__id__": 964 }, { - "__id__": 949 + "__id__": 966 }, { - "__id__": 951 + "__id__": 968 } ], "_prefab": { - "__id__": 953 + "__id__": 970 }, "_lpos": { "__type__": "cc.Vec3", @@ -20241,11 +20600,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 946 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 948 + "__id__": 965 }, "_contentSize": { "__type__": "cc.Size", @@ -20269,11 +20628,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 946 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 950 + "__id__": 967 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20337,11 +20696,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 946 + "__id__": 963 }, "_enabled": true, "__prefab": { - "__id__": 952 + "__id__": 969 }, "_alignFlags": 40, "_target": null, @@ -20386,20 +20745,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 945 + "__id__": 962 }, "_children": [], "_active": true, "_components": [ { - "__id__": 955 + "__id__": 972 }, { - "__id__": 957 + "__id__": 974 } ], "_prefab": { - "__id__": 959 + "__id__": 976 }, "_lpos": { "__type__": "cc.Vec3", @@ -20436,11 +20795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 954 + "__id__": 971 }, "_enabled": true, "__prefab": { - "__id__": 956 + "__id__": 973 }, "_contentSize": { "__type__": "cc.Size", @@ -20464,11 +20823,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 954 + "__id__": 971 }, "_enabled": true, "__prefab": { - "__id__": 958 + "__id__": 975 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20522,20 +20881,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 945 + "__id__": 962 }, "_children": [], "_active": true, "_components": [ { - "__id__": 961 + "__id__": 978 }, { - "__id__": 963 + "__id__": 980 } ], "_prefab": { - "__id__": 965 + "__id__": 982 }, "_lpos": { "__type__": "cc.Vec3", @@ -20572,11 +20931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 960 + "__id__": 977 }, "_enabled": true, "__prefab": { - "__id__": 962 + "__id__": 979 }, "_contentSize": { "__type__": "cc.Size", @@ -20600,11 +20959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 960 + "__id__": 977 }, "_enabled": true, "__prefab": { - "__id__": 964 + "__id__": 981 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20661,20 +21020,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 945 + "__id__": 962 }, "_children": [], "_active": true, "_components": [ { - "__id__": 967 + "__id__": 984 }, { - "__id__": 969 + "__id__": 986 } ], "_prefab": { - "__id__": 971 + "__id__": 988 }, "_lpos": { "__type__": "cc.Vec3", @@ -20711,11 +21070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 966 + "__id__": 983 }, "_enabled": true, "__prefab": { - "__id__": 968 + "__id__": 985 }, "_contentSize": { "__type__": "cc.Size", @@ -20739,11 +21098,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 966 + "__id__": 983 }, "_enabled": true, "__prefab": { - "__id__": 970 + "__id__": 987 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20800,11 +21159,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 945 + "__id__": 962 }, "_enabled": true, "__prefab": { - "__id__": 973 + "__id__": 990 }, "_contentSize": { "__type__": "cc.Size", @@ -20828,11 +21187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 945 + "__id__": 962 }, "_enabled": true, "__prefab": { - "__id__": 975 + "__id__": 992 }, "_alignFlags": 40, "_target": null, @@ -20877,33 +21236,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 848 + "__id__": 865 }, "_children": [ { - "__id__": 978 + "__id__": 995 }, { - "__id__": 986 + "__id__": 1003 }, { - "__id__": 992 + "__id__": 1009 }, { - "__id__": 998 + "__id__": 1015 } ], "_active": true, "_components": [ { - "__id__": 1004 + "__id__": 1021 }, { - "__id__": 1006 + "__id__": 1023 } ], "_prefab": { - "__id__": 1008 + "__id__": 1025 }, "_lpos": { "__type__": "cc.Vec3", @@ -20940,23 +21299,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 977 + "__id__": 994 }, "_children": [], "_active": true, "_components": [ { - "__id__": 979 + "__id__": 996 }, { - "__id__": 981 + "__id__": 998 }, { - "__id__": 983 + "__id__": 1000 } ], "_prefab": { - "__id__": 985 + "__id__": 1002 }, "_lpos": { "__type__": "cc.Vec3", @@ -20993,11 +21352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 978 + "__id__": 995 }, "_enabled": true, "__prefab": { - "__id__": 980 + "__id__": 997 }, "_contentSize": { "__type__": "cc.Size", @@ -21021,11 +21380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 978 + "__id__": 995 }, "_enabled": true, "__prefab": { - "__id__": 982 + "__id__": 999 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21089,11 +21448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 978 + "__id__": 995 }, "_enabled": true, "__prefab": { - "__id__": 984 + "__id__": 1001 }, "_alignFlags": 40, "_target": null, @@ -21138,20 +21497,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 977 + "__id__": 994 }, "_children": [], "_active": true, "_components": [ { - "__id__": 987 + "__id__": 1004 }, { - "__id__": 989 + "__id__": 1006 } ], "_prefab": { - "__id__": 991 + "__id__": 1008 }, "_lpos": { "__type__": "cc.Vec3", @@ -21188,11 +21547,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 986 + "__id__": 1003 }, "_enabled": true, "__prefab": { - "__id__": 988 + "__id__": 1005 }, "_contentSize": { "__type__": "cc.Size", @@ -21216,11 +21575,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 986 + "__id__": 1003 }, "_enabled": true, "__prefab": { - "__id__": 990 + "__id__": 1007 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21274,20 +21633,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 977 + "__id__": 994 }, "_children": [], "_active": true, "_components": [ { - "__id__": 993 + "__id__": 1010 }, { - "__id__": 995 + "__id__": 1012 } ], "_prefab": { - "__id__": 997 + "__id__": 1014 }, "_lpos": { "__type__": "cc.Vec3", @@ -21324,11 +21683,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 992 + "__id__": 1009 }, "_enabled": true, "__prefab": { - "__id__": 994 + "__id__": 1011 }, "_contentSize": { "__type__": "cc.Size", @@ -21352,11 +21711,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 992 + "__id__": 1009 }, "_enabled": true, "__prefab": { - "__id__": 996 + "__id__": 1013 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21413,20 +21772,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 977 + "__id__": 994 }, "_children": [], "_active": true, "_components": [ { - "__id__": 999 + "__id__": 1016 }, { - "__id__": 1001 + "__id__": 1018 } ], "_prefab": { - "__id__": 1003 + "__id__": 1020 }, "_lpos": { "__type__": "cc.Vec3", @@ -21463,11 +21822,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 998 + "__id__": 1015 }, "_enabled": true, "__prefab": { - "__id__": 1000 + "__id__": 1017 }, "_contentSize": { "__type__": "cc.Size", @@ -21491,11 +21850,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 998 + "__id__": 1015 }, "_enabled": true, "__prefab": { - "__id__": 1002 + "__id__": 1019 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21552,11 +21911,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 977 + "__id__": 994 }, "_enabled": true, "__prefab": { - "__id__": 1005 + "__id__": 1022 }, "_contentSize": { "__type__": "cc.Size", @@ -21580,11 +21939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 977 + "__id__": 994 }, "_enabled": true, "__prefab": { - "__id__": 1007 + "__id__": 1024 }, "_alignFlags": 40, "_target": null, @@ -21629,11 +21988,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 848 + "__id__": 865 }, "_enabled": true, "__prefab": { - "__id__": 1010 + "__id__": 1027 }, "_contentSize": { "__type__": "cc.Size", @@ -21657,11 +22016,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 848 + "__id__": 865 }, "_enabled": true, "__prefab": { - "__id__": 1012 + "__id__": 1029 }, "_alignFlags": 18, "_target": null, @@ -21693,11 +22052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 848 + "__id__": 865 }, "_enabled": true, "__prefab": { - "__id__": 1014 + "__id__": 1031 }, "_resizeMode": 0, "_layoutType": 2, @@ -21750,22 +22109,22 @@ "_active": true, "_components": [ { - "__id__": 1017 + "__id__": 1034 }, { - "__id__": 1019 + "__id__": 1036 }, { - "__id__": 1021 + "__id__": 1038 } ], "_prefab": { - "__id__": 1023 + "__id__": 1040 }, "_lpos": { "__type__": "cc.Vec3", "x": -294, - "y": -439, + "y": -393.626, "z": 0 }, "_lrot": { @@ -21797,11 +22156,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1016 + "__id__": 1033 }, "_enabled": true, "__prefab": { - "__id__": 1018 + "__id__": 1035 }, "_contentSize": { "__type__": "cc.Size", @@ -21825,11 +22184,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1016 + "__id__": 1033 }, "_enabled": true, "__prefab": { - "__id__": 1020 + "__id__": 1037 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21870,18 +22229,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1016 + "__id__": 1033 }, "_enabled": true, "__prefab": { - "__id__": 1022 + "__id__": 1039 }, "_alignFlags": 12, "_target": null, "_left": 20, "_right": 0, "_top": 0, - "_bottom": 125, + "_bottom": 170.37400000000002, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -21925,22 +22284,22 @@ "_active": true, "_components": [ { - "__id__": 1025 + "__id__": 1042 }, { - "__id__": 1027 + "__id__": 1044 }, { - "__id__": 1029 + "__id__": 1046 } ], "_prefab": { - "__id__": 1031 + "__id__": 1048 }, "_lpos": { "__type__": "cc.Vec3", "x": 294, - "y": -439, + "y": -393.626, "z": 0 }, "_lrot": { @@ -21972,11 +22331,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1024 + "__id__": 1041 }, "_enabled": true, "__prefab": { - "__id__": 1026 + "__id__": 1043 }, "_contentSize": { "__type__": "cc.Size", @@ -22000,11 +22359,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1024 + "__id__": 1041 }, "_enabled": true, "__prefab": { - "__id__": 1028 + "__id__": 1045 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22045,18 +22404,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1024 + "__id__": 1041 }, "_enabled": true, "__prefab": { - "__id__": 1030 + "__id__": 1047 }, "_alignFlags": 36, "_target": null, "_left": 0, "_right": 20, "_top": 0, - "_bottom": 125, + "_bottom": 170.37400000000002, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -22098,7 +22457,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1033 + "__id__": 1050 }, "_contentSize": { "__type__": "cc.Size", @@ -22126,7 +22485,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1035 + "__id__": 1052 }, "_alignFlags": 45, "_target": null, @@ -22162,28 +22521,34 @@ }, "_enabled": true, "__prefab": { - "__id__": 1037 + "__id__": 1054 }, "hero_icon": { + "__id__": 775 + }, + "phero_icon": { "__id__": 765 }, + "nhero_icon": { + "__id__": 785 + }, "ap_node": { - "__id__": 793 + "__id__": 810 }, "hp_node": { - "__id__": 821 + "__id__": 838 }, "info_node": { - "__id__": 848 + "__id__": 865 }, "name_node": { - "__id__": 835 + "__id__": 852 }, "pre_btn": { - "__id__": 1016 + "__id__": 1033 }, "next_btn": { - "__id__": 1024 + "__id__": 1041 }, "_id": "" }, @@ -22214,20 +22579,20 @@ }, "_children": [ { - "__id__": 1040 + "__id__": 1057 } ], "_active": false, "_components": [ { - "__id__": 1048 + "__id__": 1065 }, { - "__id__": 1050 + "__id__": 1067 } ], "_prefab": { - "__id__": 1052 + "__id__": 1069 }, "_lpos": { "__type__": "cc.Vec3", @@ -22264,23 +22629,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1039 + "__id__": 1056 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1041 + "__id__": 1058 }, { - "__id__": 1043 + "__id__": 1060 }, { - "__id__": 1045 + "__id__": 1062 } ], "_prefab": { - "__id__": 1047 + "__id__": 1064 }, "_lpos": { "__type__": "cc.Vec3", @@ -22317,11 +22682,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1040 + "__id__": 1057 }, "_enabled": true, "__prefab": { - "__id__": 1042 + "__id__": 1059 }, "_contentSize": { "__type__": "cc.Size", @@ -22345,11 +22710,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1040 + "__id__": 1057 }, "_enabled": true, "__prefab": { - "__id__": 1044 + "__id__": 1061 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22390,11 +22755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1040 + "__id__": 1057 }, "_enabled": true, "__prefab": { - "__id__": 1046 + "__id__": 1063 }, "_alignFlags": 45, "_target": null, @@ -22439,11 +22804,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1039 + "__id__": 1056 }, "_enabled": true, "__prefab": { - "__id__": 1049 + "__id__": 1066 }, "_contentSize": { "__type__": "cc.Size", @@ -22467,11 +22832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1039 + "__id__": 1056 }, "_enabled": true, "__prefab": { - "__id__": 1051 + "__id__": 1068 }, "_alignFlags": 45, "_target": null, @@ -22520,7 +22885,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1054 + "__id__": 1071 }, "_contentSize": { "__type__": "cc.Size", @@ -22548,7 +22913,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1056 + "__id__": 1073 }, "_alignFlags": 21, "_target": null, @@ -22584,7 +22949,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1058 + "__id__": 1075 }, "heros_page": { "__id__": 756 @@ -22625,14 +22990,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 1061 + "__id__": 1078 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1060 + "__id__": 1077 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -22640,7 +23005,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 1062 + "__id__": 1079 }, "targetOverrides": null }, @@ -22654,19 +23019,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1063 + "__id__": 1080 }, { - "__id__": 1065 + "__id__": 1082 }, { - "__id__": 1066 + "__id__": 1083 }, { - "__id__": 1067 + "__id__": 1084 }, { - "__id__": 1068 + "__id__": 1085 } ], "removedComponents": [] @@ -22674,7 +23039,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1064 + "__id__": 1081 }, "propertyPath": [ "_name" @@ -22690,7 +23055,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1064 + "__id__": 1081 }, "propertyPath": [ "_lpos" @@ -22705,7 +23070,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1064 + "__id__": 1081 }, "propertyPath": [ "_lrot" @@ -22721,7 +23086,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1064 + "__id__": 1081 }, "propertyPath": [ "_euler" @@ -22736,7 +23101,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1064 + "__id__": 1081 }, "propertyPath": [ "_active" @@ -22753,23 +23118,23 @@ }, "_children": [ { - "__id__": 1070 + "__id__": 1087 } ], "_active": true, "_components": [ { - "__id__": 1108 + "__id__": 1125 }, { - "__id__": 1110 + "__id__": 1127 }, { - "__id__": 1112 + "__id__": 1129 } ], "_prefab": { - "__id__": 1114 + "__id__": 1131 }, "_lpos": { "__type__": "cc.Vec3", @@ -22806,30 +23171,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1069 + "__id__": 1086 }, "_children": [ { - "__id__": 1071 + "__id__": 1088 } ], "_active": true, "_components": [ { - "__id__": 1099 + "__id__": 1116 }, { - "__id__": 1101 + "__id__": 1118 }, { - "__id__": 1103 + "__id__": 1120 }, { - "__id__": 1105 + "__id__": 1122 } ], "_prefab": { - "__id__": 1107 + "__id__": 1124 }, "_lpos": { "__type__": "cc.Vec3", @@ -22866,27 +23231,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1070 + "__id__": 1087 }, "_children": [ { - "__id__": 1072 + "__id__": 1089 }, { - "__id__": 1080 + "__id__": 1097 }, { - "__id__": 1086 + "__id__": 1103 } ], "_active": true, "_components": [ { - "__id__": 1096 + "__id__": 1113 } ], "_prefab": { - "__id__": 1098 + "__id__": 1115 }, "_lpos": { "__type__": "cc.Vec3", @@ -22923,23 +23288,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1071 + "__id__": 1088 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1073 + "__id__": 1090 }, { - "__id__": 1075 + "__id__": 1092 }, { - "__id__": 1077 + "__id__": 1094 } ], "_prefab": { - "__id__": 1079 + "__id__": 1096 }, "_lpos": { "__type__": "cc.Vec3", @@ -22976,11 +23341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1072 + "__id__": 1089 }, "_enabled": true, "__prefab": { - "__id__": 1074 + "__id__": 1091 }, "_contentSize": { "__type__": "cc.Size", @@ -23004,11 +23369,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1072 + "__id__": 1089 }, "_enabled": true, "__prefab": { - "__id__": 1076 + "__id__": 1093 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23052,11 +23417,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1072 + "__id__": 1089 }, "_enabled": true, "__prefab": { - "__id__": 1078 + "__id__": 1095 }, "_alignFlags": 40, "_target": null, @@ -23101,20 +23466,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1071 + "__id__": 1088 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1081 + "__id__": 1098 }, { - "__id__": 1083 + "__id__": 1100 } ], "_prefab": { - "__id__": 1085 + "__id__": 1102 }, "_lpos": { "__type__": "cc.Vec3", @@ -23151,11 +23516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1080 + "__id__": 1097 }, "_enabled": true, "__prefab": { - "__id__": 1082 + "__id__": 1099 }, "_contentSize": { "__type__": "cc.Size", @@ -23179,11 +23544,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1080 + "__id__": 1097 }, "_enabled": true, "__prefab": { - "__id__": 1084 + "__id__": 1101 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23240,26 +23605,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1071 + "__id__": 1088 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1087 + "__id__": 1104 }, { - "__id__": 1089 + "__id__": 1106 }, { - "__id__": 1091 + "__id__": 1108 }, { - "__id__": 1093 + "__id__": 1110 } ], "_prefab": { - "__id__": 1095 + "__id__": 1112 }, "_lpos": { "__type__": "cc.Vec3", @@ -23296,11 +23661,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1103 }, "_enabled": true, "__prefab": { - "__id__": 1088 + "__id__": 1105 }, "_contentSize": { "__type__": "cc.Size", @@ -23324,11 +23689,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1103 }, "_enabled": true, "__prefab": { - "__id__": 1090 + "__id__": 1107 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23392,11 +23757,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1103 }, "_enabled": true, "__prefab": { - "__id__": 1092 + "__id__": 1109 }, "_alignFlags": 10, "_target": null, @@ -23428,11 +23793,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1103 }, "_enabled": true, "__prefab": { - "__id__": 1094 + "__id__": 1111 }, "templateMode": true, "watchPath": "data.data.gold", @@ -23465,11 +23830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1071 + "__id__": 1088 }, "_enabled": true, "__prefab": { - "__id__": 1097 + "__id__": 1114 }, "_contentSize": { "__type__": "cc.Size", @@ -23506,11 +23871,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1070 + "__id__": 1087 }, "_enabled": true, "__prefab": { - "__id__": 1100 + "__id__": 1117 }, "_contentSize": { "__type__": "cc.Size", @@ -23534,11 +23899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1070 + "__id__": 1087 }, "_enabled": true, "__prefab": { - "__id__": 1102 + "__id__": 1119 }, "_alignFlags": 8, "_target": null, @@ -23570,11 +23935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1070 + "__id__": 1087 }, "_enabled": true, "__prefab": { - "__id__": 1104 + "__id__": 1121 }, "_resizeMode": 0, "_layoutType": 1, @@ -23608,11 +23973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1070 + "__id__": 1087 }, "_enabled": true, "__prefab": { - "__id__": 1106 + "__id__": 1123 }, "_alignFlags": 40, "_target": null, @@ -23657,11 +24022,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1069 + "__id__": 1086 }, "_enabled": true, "__prefab": { - "__id__": 1109 + "__id__": 1126 }, "_contentSize": { "__type__": "cc.Size", @@ -23685,11 +24050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1069 + "__id__": 1086 }, "_enabled": true, "__prefab": { - "__id__": 1111 + "__id__": 1128 }, "_alignFlags": 17, "_target": null, @@ -23721,11 +24086,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1069 + "__id__": 1086 }, "_enabled": true, "__prefab": { - "__id__": 1113 + "__id__": 1130 }, "_id": "" }, @@ -23756,7 +24121,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1116 + "__id__": 1133 }, "_contentSize": { "__type__": "cc.Size", @@ -23784,7 +24149,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1118 + "__id__": 1135 }, "_alignFlags": 45, "_target": null, @@ -23820,7 +24185,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1120 + "__id__": 1137 }, "debugMode": false, "_id": "" @@ -23842,7 +24207,7 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 1060 + "__id__": 1077 }, { "__id__": 588 diff --git a/assets/script/game/map/HlistComp.ts b/assets/script/game/map/HlistComp.ts index 92050b9e..6d04954d 100644 --- a/assets/script/game/map/HlistComp.ts +++ b/assets/script/game/map/HlistComp.ts @@ -15,6 +15,10 @@ export class HListComp extends CCComp { @property(Node) hero_icon=null! @property(Node) + phero_icon=null! + @property(Node) + nhero_icon=null! + @property(Node) ap_node=null! @property(Node) hp_node=null! @@ -30,7 +34,7 @@ export class HListComp extends CCComp { huuid:number=null! private currentIndex: number = 0; - private iconVisualToken: number = 0; + private iconVisualTokens: Map = new Map(); debugMode: boolean = false; onLoad() { @@ -62,6 +66,12 @@ export class HListComp extends CCComp { const hero = HeroInfo[this.huuid]; if (!hero) return; + // 获取前后英雄的 uuid + const preIndex = (this.currentIndex - 1 + HeroList.length) % HeroList.length; + const nextIndex = (this.currentIndex + 1) % HeroList.length; + const pUuid = HeroList[preIndex]; + const nUuid = HeroList[nextIndex]; + // 更新基础属性标签 this.setLabelText(this.name_node, hero.name); this.setLabelText(this.ap_node, `攻击力: ${hero.ap}`); @@ -69,6 +79,8 @@ export class HListComp extends CCComp { // 更新动画 this.updateHeroAnimation(this.hero_icon, this.huuid); + this.updateHeroAnimation(this.phero_icon, pUuid); + this.updateHeroAnimation(this.nhero_icon, nUuid); // 更新技能列表 this.updateSkillInfo(hero); @@ -93,8 +105,8 @@ export class HListComp extends CCComp { const anim = node.getComponent(Animation) || node.addComponent(Animation); this.clearAnimationClips(anim); - this.iconVisualToken++; - const token = this.iconVisualToken; + let token = (this.iconVisualTokens.get(node) || 0) + 1; + this.iconVisualTokens.set(node, token); const path = `game/heros/hero/${hero.path}/idle`; resources.load(path, AnimationClip, (err, clip) => { @@ -102,7 +114,7 @@ export class HListComp extends CCComp { mLogger.log(this.debugMode, "HListComp", `load hero animation failed ${uuid}`, err); return; } - if (token !== this.iconVisualToken || this.huuid !== uuid) { + if (token !== this.iconVisualTokens.get(node)) { return; } this.clearAnimationClips(anim);