From 10acb8c068a5e226073eee2863b9c465b4bb9dba Mon Sep 17 00:00:00 2001 From: panw Date: Wed, 1 Apr 2026 17:25:59 +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=E8=BD=AE=E6=92=AD=E5=8A=A8=E7=94=BB=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E4=BB=A5=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增两个英雄图标节点用于扩展轮播视图 - 实现平滑的轮播动画，点击前后按钮时图标会滑动切换 - 添加动画状态锁防止动画冲突 - 重构英雄信息更新逻辑，支持五节点轮播布局 - 使用tween实现位置动画，优化视觉流畅度 --- assets/resources/gui/role_controller.prefab | 1550 ++++++++++++------- assets/script/game/map/HlistComp.ts | 98 +- 2 files changed, 1067 insertions(+), 581 deletions(-) diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index dca7a989..a0796029 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -25,26 +25,26 @@ "__id__": 571 }, { - "__id__": 1077 + "__id__": 1097 }, { - "__id__": 1086 + "__id__": 1106 } ], "_active": true, "_components": [ { - "__id__": 1132 + "__id__": 1152 }, { - "__id__": 1134 + "__id__": 1154 }, { - "__id__": 1136 + "__id__": 1156 } ], "_prefab": { - "__id__": 1138 + "__id__": 1158 }, "_lpos": { "__type__": "cc.Vec3", @@ -11749,23 +11749,23 @@ "__id__": 756 }, { - "__id__": 1056 + "__id__": 1076 } ], "_active": true, "_components": [ { - "__id__": 1070 + "__id__": 1090 }, { - "__id__": 1072 + "__id__": 1092 }, { - "__id__": 1074 + "__id__": 1094 } ], "_prefab": { - "__id__": 1076 + "__id__": 1096 }, "_lpos": { "__type__": "cc.Vec3", @@ -15632,35 +15632,41 @@ "__id__": 795 }, { - "__id__": 823 + "__id__": 805 }, { - "__id__": 851 + "__id__": 815 }, { - "__id__": 865 + "__id__": 843 }, { - "__id__": 1033 + "__id__": 871 }, { - "__id__": 1041 + "__id__": 885 + }, + { + "__id__": 1053 + }, + { + "__id__": 1061 } ], "_active": true, "_components": [ { - "__id__": 1049 + "__id__": 1069 }, { - "__id__": 1051 + "__id__": 1071 }, { - "__id__": 1053 + "__id__": 1073 } ], "_prefab": { - "__id__": 1055 + "__id__": 1075 }, "_lpos": { "__type__": "cc.Vec3", @@ -15868,7 +15874,7 @@ }, { "__type__": "cc.Node", - "_name": "pAnm", + "_name": "pAnm1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -15895,8 +15901,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -185.609, - "y": -377.937, + "x": -510.791, + "y": -377, "z": 0 }, "_lrot": { @@ -15948,7 +15954,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b0SZlArWpB3bzSvOXOjJPd" + "fileId": "caNBXyEgZEkaqqDUqgFmWK" }, { "__type__": "cc.Sprite", @@ -15996,7 +16002,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "28BdNDlQJJWbg0PmHivD43" + "fileId": "98jnOBuAxBk6kYkECVhbvj" }, { "__type__": "cc.Animation", @@ -16025,7 +16031,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0fciCs3adGNLC3pyChj7GC" + "fileId": "2240FlnpFIhJKmh8GsfOGG" }, { "__type__": "cc.Widget", @@ -16044,8 +16050,8 @@ "_left": 295, "_right": 0, "_top": 0, - "_bottom": 134.063, - "_horizontalCenter": -185.609, + "_bottom": 135, + "_horizontalCenter": -510.791, "_verticalCenter": -395.126, "_isAbsLeft": true, "_isAbsRight": true, @@ -16061,7 +16067,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b4ZsIoeUBBxY4ofmGb/rQU" + "fileId": "75CC3mnQNL/4+pqw4qkPXB" }, { "__type__": "cc.PrefabInfo", @@ -16071,14 +16077,14 @@ "asset": { "__id__": 0 }, - "fileId": "8b3z4tVmlKxIFxykamvAqe", + "fileId": "f4roYwbK9Kmo8mLAyV76Ck", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "hAnm", + "_name": "pAnm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -16105,8 +16111,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": -370.375, + "x": -185.609, + "y": -377, "z": 0 }, "_lrot": { @@ -16118,8 +16124,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -2.5, - "y": 2.5, + "x": -2, + "y": 2, "z": 1 }, "_mobility": 0, @@ -16158,7 +16164,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3cLWNVWzJEe4LfnOHF6sHz" + "fileId": "b0SZlArWpB3bzSvOXOjJPd" }, { "__type__": "cc.Sprite", @@ -16206,7 +16212,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "2cMezUYgdE1a+n244zNovg" + "fileId": "28BdNDlQJJWbg0PmHivD43" }, { "__type__": "cc.Animation", @@ -16235,7 +16241,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "66W1OgQ+dAabn8vRMcLrOT" + "fileId": "0fciCs3adGNLC3pyChj7GC" }, { "__type__": "cc.Widget", @@ -16254,8 +16260,8 @@ "_left": 295, "_right": 0, "_top": 0, - "_bottom": 109.62500000000006, - "_horizontalCenter": 0, + "_bottom": 135, + "_horizontalCenter": -185.609, "_verticalCenter": -395.126, "_isAbsLeft": true, "_isAbsRight": true, @@ -16271,7 +16277,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "62XM/6DExMHoXQkjHzhfM/" + "fileId": "b4ZsIoeUBBxY4ofmGb/rQU" }, { "__type__": "cc.PrefabInfo", @@ -16281,14 +16287,14 @@ "asset": { "__id__": 0 }, - "fileId": "93TBSF3cFKKau9Xsyc55my", + "fileId": "8b3z4tVmlKxIFxykamvAqe", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "nAnm", + "_name": "hAnm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -16315,8 +16321,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 197.394, - "y": -377.937, + "x": 0, + "y": -377, "z": 0 }, "_lrot": { @@ -16368,7 +16374,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e2OvbAyehFYJmiRuOewkfr" + "fileId": "3cLWNVWzJEe4LfnOHF6sHz" }, { "__type__": "cc.Sprite", @@ -16416,7 +16422,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6f6Ut62+xANIEigPxxKkQA" + "fileId": "2cMezUYgdE1a+n244zNovg" }, { "__type__": "cc.Animation", @@ -16445,7 +16451,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a149Aecg1Bq5gFUOu/3aZ+" + "fileId": "66W1OgQ+dAabn8vRMcLrOT" }, { "__type__": "cc.Widget", @@ -16464,7 +16470,217 @@ "_left": 295, "_right": 0, "_top": 0, - "_bottom": 134.063, + "_bottom": 135, + "_horizontalCenter": 0, + "_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": "62XM/6DExMHoXQkjHzhfM/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "93TBSF3cFKKau9Xsyc55my", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "nAnm", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 756 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 796 + }, + { + "__id__": 798 + }, + { + "__id__": 800 + }, + { + "__id__": 802 + } + ], + "_prefab": { + "__id__": 804 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 197.394, + "y": -377, + "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__": 795 + }, + "_enabled": true, + "__prefab": { + "__id__": 797 + }, + "_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__": 795 + }, + "_enabled": true, + "__prefab": { + "__id__": 799 + }, + "_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__": 795 + }, + "_enabled": true, + "__prefab": { + "__id__": 801 + }, + "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__": 795 + }, + "_enabled": true, + "__prefab": { + "__id__": 803 + }, + "_alignFlags": 20, + "_target": null, + "_left": 295, + "_right": 0, + "_top": 0, + "_bottom": 135, "_horizontalCenter": 197.394, "_verticalCenter": -395.126, "_isAbsLeft": true, @@ -16496,6 +16712,216 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "nAnm2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 756 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 806 + }, + { + "__id__": 808 + }, + { + "__id__": 810 + }, + { + "__id__": 812 + } + ], + "_prefab": { + "__id__": 814 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 480.983, + "y": -377, + "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__": 805 + }, + "_enabled": true, + "__prefab": { + "__id__": 807 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 128, + "height": 128 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "aeSBCTUZpDqpwyPL6586K7" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 805 + }, + "_enabled": true, + "__prefab": { + "__id__": 809 + }, + "_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": "93SDaeys1FtK36gxPSHNIE" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 805 + }, + "_enabled": true, + "__prefab": { + "__id__": 811 + }, + "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": "4aQ7mnveFJ3LuSbS0mcBUb" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 805 + }, + "_enabled": true, + "__prefab": { + "__id__": 813 + }, + "_alignFlags": 20, + "_target": null, + "_left": 295, + "_right": 0, + "_top": 0, + "_bottom": 135, + "_horizontalCenter": 480.983, + "_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": "41hqZIhgxJ8puKgQzklAed" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "67+fdGjAhItq89gphQ5Dnu", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "ap", @@ -16506,29 +16932,29 @@ }, "_children": [ { - "__id__": 796 + "__id__": 816 }, { - "__id__": 804 + "__id__": 824 }, { - "__id__": 810 + "__id__": 830 } ], "_active": true, "_components": [ { - "__id__": 816 + "__id__": 836 }, { - "__id__": 818 + "__id__": 838 }, { - "__id__": 820 + "__id__": 840 } ], "_prefab": { - "__id__": 822 + "__id__": 842 }, "_lpos": { "__type__": "cc.Vec3", @@ -16565,23 +16991,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 795 + "__id__": 815 }, "_children": [], "_active": true, "_components": [ { - "__id__": 797 + "__id__": 817 }, { - "__id__": 799 + "__id__": 819 }, { - "__id__": 801 + "__id__": 821 } ], "_prefab": { - "__id__": 803 + "__id__": 823 }, "_lpos": { "__type__": "cc.Vec3", @@ -16618,11 +17044,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 796 + "__id__": 816 }, "_enabled": true, "__prefab": { - "__id__": 798 + "__id__": 818 }, "_contentSize": { "__type__": "cc.Size", @@ -16646,11 +17072,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 796 + "__id__": 816 }, "_enabled": true, "__prefab": { - "__id__": 800 + "__id__": 820 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16694,11 +17120,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 796 + "__id__": 816 }, "_enabled": true, "__prefab": { - "__id__": 802 + "__id__": 822 }, "_alignFlags": 45, "_target": null, @@ -16743,20 +17169,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 795 + "__id__": 815 }, "_children": [], "_active": true, "_components": [ { - "__id__": 805 + "__id__": 825 }, { - "__id__": 807 + "__id__": 827 } ], "_prefab": { - "__id__": 809 + "__id__": 829 }, "_lpos": { "__type__": "cc.Vec3", @@ -16793,11 +17219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 804 + "__id__": 824 }, "_enabled": true, "__prefab": { - "__id__": 806 + "__id__": 826 }, "_contentSize": { "__type__": "cc.Size", @@ -16821,11 +17247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 804 + "__id__": 824 }, "_enabled": true, "__prefab": { - "__id__": 808 + "__id__": 828 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16879,20 +17305,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 795 + "__id__": 815 }, "_children": [], "_active": true, "_components": [ { - "__id__": 811 + "__id__": 831 }, { - "__id__": 813 + "__id__": 833 } ], "_prefab": { - "__id__": 815 + "__id__": 835 }, "_lpos": { "__type__": "cc.Vec3", @@ -16929,11 +17355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 810 + "__id__": 830 }, "_enabled": true, "__prefab": { - "__id__": 812 + "__id__": 832 }, "_contentSize": { "__type__": "cc.Size", @@ -16957,11 +17383,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 810 + "__id__": 830 }, "_enabled": true, "__prefab": { - "__id__": 814 + "__id__": 834 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17038,11 +17464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 795 + "__id__": 815 }, "_enabled": true, "__prefab": { - "__id__": 817 + "__id__": 837 }, "_contentSize": { "__type__": "cc.Size", @@ -17066,11 +17492,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 795 + "__id__": 815 }, "_enabled": false, "__prefab": { - "__id__": 819 + "__id__": 839 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17111,11 +17537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 795 + "__id__": 815 }, "_enabled": true, "__prefab": { - "__id__": 821 + "__id__": 841 }, "_alignFlags": 12, "_target": null, @@ -17164,29 +17590,29 @@ }, "_children": [ { - "__id__": 824 + "__id__": 844 }, { - "__id__": 832 + "__id__": 852 }, { - "__id__": 838 + "__id__": 858 } ], "_active": true, "_components": [ { - "__id__": 844 + "__id__": 864 }, { - "__id__": 846 + "__id__": 866 }, { - "__id__": 848 + "__id__": 868 } ], "_prefab": { - "__id__": 850 + "__id__": 870 }, "_lpos": { "__type__": "cc.Vec3", @@ -17223,23 +17649,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 823 + "__id__": 843 }, "_children": [], "_active": true, "_components": [ { - "__id__": 825 + "__id__": 845 }, { - "__id__": 827 + "__id__": 847 }, { - "__id__": 829 + "__id__": 849 } ], "_prefab": { - "__id__": 831 + "__id__": 851 }, "_lpos": { "__type__": "cc.Vec3", @@ -17276,11 +17702,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 824 + "__id__": 844 }, "_enabled": true, "__prefab": { - "__id__": 826 + "__id__": 846 }, "_contentSize": { "__type__": "cc.Size", @@ -17304,11 +17730,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 824 + "__id__": 844 }, "_enabled": true, "__prefab": { - "__id__": 828 + "__id__": 848 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17352,11 +17778,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 824 + "__id__": 844 }, "_enabled": true, "__prefab": { - "__id__": 830 + "__id__": 850 }, "_alignFlags": 45, "_target": null, @@ -17401,20 +17827,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 823 + "__id__": 843 }, "_children": [], "_active": true, "_components": [ { - "__id__": 833 + "__id__": 853 }, { - "__id__": 835 + "__id__": 855 } ], "_prefab": { - "__id__": 837 + "__id__": 857 }, "_lpos": { "__type__": "cc.Vec3", @@ -17451,11 +17877,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 832 + "__id__": 852 }, "_enabled": true, "__prefab": { - "__id__": 834 + "__id__": 854 }, "_contentSize": { "__type__": "cc.Size", @@ -17479,11 +17905,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 832 + "__id__": 852 }, "_enabled": true, "__prefab": { - "__id__": 836 + "__id__": 856 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17537,20 +17963,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 823 + "__id__": 843 }, "_children": [], "_active": true, "_components": [ { - "__id__": 839 + "__id__": 859 }, { - "__id__": 841 + "__id__": 861 } ], "_prefab": { - "__id__": 843 + "__id__": 863 }, "_lpos": { "__type__": "cc.Vec3", @@ -17587,11 +18013,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 858 }, "_enabled": true, "__prefab": { - "__id__": 840 + "__id__": 860 }, "_contentSize": { "__type__": "cc.Size", @@ -17615,11 +18041,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 838 + "__id__": 858 }, "_enabled": true, "__prefab": { - "__id__": 842 + "__id__": 862 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17696,11 +18122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 823 + "__id__": 843 }, "_enabled": true, "__prefab": { - "__id__": 845 + "__id__": 865 }, "_contentSize": { "__type__": "cc.Size", @@ -17724,11 +18150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 823 + "__id__": 843 }, "_enabled": false, "__prefab": { - "__id__": 847 + "__id__": 867 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -17769,11 +18195,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 823 + "__id__": 843 }, "_enabled": true, "__prefab": { - "__id__": 849 + "__id__": 869 }, "_alignFlags": 12, "_target": null, @@ -17822,23 +18248,23 @@ }, "_children": [ { - "__id__": 852 + "__id__": 872 } ], "_active": true, "_components": [ { - "__id__": 858 + "__id__": 878 }, { - "__id__": 860 + "__id__": 880 }, { - "__id__": 862 + "__id__": 882 } ], "_prefab": { - "__id__": 864 + "__id__": 884 }, "_lpos": { "__type__": "cc.Vec3", @@ -17875,20 +18301,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 851 + "__id__": 871 }, "_children": [], "_active": true, "_components": [ { - "__id__": 853 + "__id__": 873 }, { - "__id__": 855 + "__id__": 875 } ], "_prefab": { - "__id__": 857 + "__id__": 877 }, "_lpos": { "__type__": "cc.Vec3", @@ -17925,11 +18351,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 852 + "__id__": 872 }, "_enabled": true, "__prefab": { - "__id__": 854 + "__id__": 874 }, "_contentSize": { "__type__": "cc.Size", @@ -17953,11 +18379,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 852 + "__id__": 872 }, "_enabled": true, "__prefab": { - "__id__": 856 + "__id__": 876 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18034,11 +18460,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 851 + "__id__": 871 }, "_enabled": true, "__prefab": { - "__id__": 859 + "__id__": 879 }, "_contentSize": { "__type__": "cc.Size", @@ -18062,11 +18488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 851 + "__id__": 871 }, "_enabled": true, "__prefab": { - "__id__": 861 + "__id__": 881 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18110,11 +18536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 851 + "__id__": 871 }, "_enabled": true, "__prefab": { - "__id__": 863 + "__id__": 883 }, "_alignFlags": 18, "_target": null, @@ -18163,35 +18589,35 @@ }, "_children": [ { - "__id__": 866 + "__id__": 886 }, { - "__id__": 898 + "__id__": 918 }, { - "__id__": 930 + "__id__": 950 }, { - "__id__": 962 + "__id__": 982 }, { - "__id__": 994 + "__id__": 1014 } ], "_active": true, "_components": [ { - "__id__": 1026 + "__id__": 1046 }, { - "__id__": 1028 + "__id__": 1048 }, { - "__id__": 1030 + "__id__": 1050 } ], "_prefab": { - "__id__": 1032 + "__id__": 1052 }, "_lpos": { "__type__": "cc.Vec3", @@ -18228,33 +18654,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 865 + "__id__": 885 }, "_children": [ { - "__id__": 867 + "__id__": 887 }, { - "__id__": 873 + "__id__": 893 }, { - "__id__": 879 + "__id__": 899 }, { - "__id__": 885 + "__id__": 905 } ], "_active": true, "_components": [ { - "__id__": 893 + "__id__": 913 }, { - "__id__": 895 + "__id__": 915 } ], "_prefab": { - "__id__": 897 + "__id__": 917 }, "_lpos": { "__type__": "cc.Vec3", @@ -18291,20 +18717,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 866 + "__id__": 886 }, "_children": [], "_active": true, "_components": [ { - "__id__": 868 + "__id__": 888 }, { - "__id__": 870 + "__id__": 890 } ], "_prefab": { - "__id__": 872 + "__id__": 892 }, "_lpos": { "__type__": "cc.Vec3", @@ -18341,11 +18767,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 887 }, "_enabled": true, "__prefab": { - "__id__": 869 + "__id__": 889 }, "_contentSize": { "__type__": "cc.Size", @@ -18369,11 +18795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 867 + "__id__": 887 }, "_enabled": true, "__prefab": { - "__id__": 871 + "__id__": 891 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18427,20 +18853,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 866 + "__id__": 886 }, "_children": [], "_active": true, "_components": [ { - "__id__": 874 + "__id__": 894 }, { - "__id__": 876 + "__id__": 896 } ], "_prefab": { - "__id__": 878 + "__id__": 898 }, "_lpos": { "__type__": "cc.Vec3", @@ -18477,11 +18903,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 873 + "__id__": 893 }, "_enabled": true, "__prefab": { - "__id__": 875 + "__id__": 895 }, "_contentSize": { "__type__": "cc.Size", @@ -18505,11 +18931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 873 + "__id__": 893 }, "_enabled": true, "__prefab": { - "__id__": 877 + "__id__": 897 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18566,20 +18992,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 866 + "__id__": 886 }, "_children": [], "_active": true, "_components": [ { - "__id__": 880 + "__id__": 900 }, { - "__id__": 882 + "__id__": 902 } ], "_prefab": { - "__id__": 884 + "__id__": 904 }, "_lpos": { "__type__": "cc.Vec3", @@ -18616,11 +19042,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 879 + "__id__": 899 }, "_enabled": true, "__prefab": { - "__id__": 881 + "__id__": 901 }, "_contentSize": { "__type__": "cc.Size", @@ -18644,11 +19070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 879 + "__id__": 899 }, "_enabled": true, "__prefab": { - "__id__": 883 + "__id__": 903 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18705,23 +19131,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 866 + "__id__": 886 }, "_children": [], "_active": true, "_components": [ { - "__id__": 886 + "__id__": 906 }, { - "__id__": 888 + "__id__": 908 }, { - "__id__": 890 + "__id__": 910 } ], "_prefab": { - "__id__": 892 + "__id__": 912 }, "_lpos": { "__type__": "cc.Vec3", @@ -18758,11 +19184,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 885 + "__id__": 905 }, "_enabled": true, "__prefab": { - "__id__": 887 + "__id__": 907 }, "_contentSize": { "__type__": "cc.Size", @@ -18786,11 +19212,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 885 + "__id__": 905 }, "_enabled": true, "__prefab": { - "__id__": 889 + "__id__": 909 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -18854,11 +19280,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 885 + "__id__": 905 }, "_enabled": true, "__prefab": { - "__id__": 891 + "__id__": 911 }, "_alignFlags": 40, "_target": null, @@ -18903,11 +19329,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 866 + "__id__": 886 }, "_enabled": true, "__prefab": { - "__id__": 894 + "__id__": 914 }, "_contentSize": { "__type__": "cc.Size", @@ -18931,11 +19357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 866 + "__id__": 886 }, "_enabled": true, "__prefab": { - "__id__": 896 + "__id__": 916 }, "_alignFlags": 40, "_target": null, @@ -18980,33 +19406,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 865 + "__id__": 885 }, "_children": [ - { - "__id__": 899 - }, - { - "__id__": 907 - }, - { - "__id__": 913 - }, { "__id__": 919 + }, + { + "__id__": 927 + }, + { + "__id__": 933 + }, + { + "__id__": 939 } ], "_active": true, "_components": [ { - "__id__": 925 + "__id__": 945 }, { - "__id__": 927 + "__id__": 947 } ], "_prefab": { - "__id__": 929 + "__id__": 949 }, "_lpos": { "__type__": "cc.Vec3", @@ -19043,23 +19469,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 898 + "__id__": 918 }, "_children": [], "_active": true, "_components": [ { - "__id__": 900 + "__id__": 920 }, { - "__id__": 902 + "__id__": 922 }, { - "__id__": 904 + "__id__": 924 } ], "_prefab": { - "__id__": 906 + "__id__": 926 }, "_lpos": { "__type__": "cc.Vec3", @@ -19096,11 +19522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 899 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 901 + "__id__": 921 }, "_contentSize": { "__type__": "cc.Size", @@ -19124,11 +19550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 899 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 903 + "__id__": 923 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19192,11 +19618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 899 + "__id__": 919 }, "_enabled": true, "__prefab": { - "__id__": 905 + "__id__": 925 }, "_alignFlags": 40, "_target": null, @@ -19241,20 +19667,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 898 + "__id__": 918 }, "_children": [], "_active": true, "_components": [ { - "__id__": 908 + "__id__": 928 }, { - "__id__": 910 + "__id__": 930 } ], "_prefab": { - "__id__": 912 + "__id__": 932 }, "_lpos": { "__type__": "cc.Vec3", @@ -19291,11 +19717,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 907 + "__id__": 927 }, "_enabled": true, "__prefab": { - "__id__": 909 + "__id__": 929 }, "_contentSize": { "__type__": "cc.Size", @@ -19319,11 +19745,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 907 + "__id__": 927 }, "_enabled": true, "__prefab": { - "__id__": 911 + "__id__": 931 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19377,20 +19803,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 898 + "__id__": 918 }, "_children": [], "_active": true, "_components": [ { - "__id__": 914 + "__id__": 934 }, { - "__id__": 916 + "__id__": 936 } ], "_prefab": { - "__id__": 918 + "__id__": 938 }, "_lpos": { "__type__": "cc.Vec3", @@ -19427,11 +19853,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 913 + "__id__": 933 }, "_enabled": true, "__prefab": { - "__id__": 915 + "__id__": 935 }, "_contentSize": { "__type__": "cc.Size", @@ -19455,11 +19881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 913 + "__id__": 933 }, "_enabled": true, "__prefab": { - "__id__": 917 + "__id__": 937 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19516,20 +19942,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 898 + "__id__": 918 }, "_children": [], "_active": true, "_components": [ { - "__id__": 920 + "__id__": 940 }, { - "__id__": 922 + "__id__": 942 } ], "_prefab": { - "__id__": 924 + "__id__": 944 }, "_lpos": { "__type__": "cc.Vec3", @@ -19566,11 +19992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 919 + "__id__": 939 }, "_enabled": true, "__prefab": { - "__id__": 921 + "__id__": 941 }, "_contentSize": { "__type__": "cc.Size", @@ -19594,11 +20020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 919 + "__id__": 939 }, "_enabled": true, "__prefab": { - "__id__": 923 + "__id__": 943 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19655,11 +20081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 898 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 926 + "__id__": 946 }, "_contentSize": { "__type__": "cc.Size", @@ -19683,11 +20109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 898 + "__id__": 918 }, "_enabled": true, "__prefab": { - "__id__": 928 + "__id__": 948 }, "_alignFlags": 40, "_target": null, @@ -19732,33 +20158,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 865 + "__id__": 885 }, "_children": [ - { - "__id__": 931 - }, - { - "__id__": 939 - }, - { - "__id__": 945 - }, { "__id__": 951 + }, + { + "__id__": 959 + }, + { + "__id__": 965 + }, + { + "__id__": 971 } ], "_active": true, "_components": [ { - "__id__": 957 + "__id__": 977 }, { - "__id__": 959 + "__id__": 979 } ], "_prefab": { - "__id__": 961 + "__id__": 981 }, "_lpos": { "__type__": "cc.Vec3", @@ -19795,23 +20221,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 930 + "__id__": 950 }, "_children": [], "_active": true, "_components": [ { - "__id__": 932 + "__id__": 952 }, { - "__id__": 934 + "__id__": 954 }, { - "__id__": 936 + "__id__": 956 } ], "_prefab": { - "__id__": 938 + "__id__": 958 }, "_lpos": { "__type__": "cc.Vec3", @@ -19848,11 +20274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 931 + "__id__": 951 }, "_enabled": true, "__prefab": { - "__id__": 933 + "__id__": 953 }, "_contentSize": { "__type__": "cc.Size", @@ -19876,11 +20302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 931 + "__id__": 951 }, "_enabled": true, "__prefab": { - "__id__": 935 + "__id__": 955 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -19944,11 +20370,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 931 + "__id__": 951 }, "_enabled": true, "__prefab": { - "__id__": 937 + "__id__": 957 }, "_alignFlags": 40, "_target": null, @@ -19993,20 +20419,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 930 + "__id__": 950 }, "_children": [], "_active": true, "_components": [ { - "__id__": 940 + "__id__": 960 }, { - "__id__": 942 + "__id__": 962 } ], "_prefab": { - "__id__": 944 + "__id__": 964 }, "_lpos": { "__type__": "cc.Vec3", @@ -20043,11 +20469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 939 + "__id__": 959 }, "_enabled": true, "__prefab": { - "__id__": 941 + "__id__": 961 }, "_contentSize": { "__type__": "cc.Size", @@ -20071,11 +20497,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 939 + "__id__": 959 }, "_enabled": true, "__prefab": { - "__id__": 943 + "__id__": 963 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20129,20 +20555,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 930 + "__id__": 950 }, "_children": [], "_active": true, "_components": [ { - "__id__": 946 + "__id__": 966 }, { - "__id__": 948 + "__id__": 968 } ], "_prefab": { - "__id__": 950 + "__id__": 970 }, "_lpos": { "__type__": "cc.Vec3", @@ -20179,11 +20605,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 945 + "__id__": 965 }, "_enabled": true, "__prefab": { - "__id__": 947 + "__id__": 967 }, "_contentSize": { "__type__": "cc.Size", @@ -20207,11 +20633,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 945 + "__id__": 965 }, "_enabled": true, "__prefab": { - "__id__": 949 + "__id__": 969 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20268,20 +20694,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 930 + "__id__": 950 }, "_children": [], "_active": true, "_components": [ { - "__id__": 952 + "__id__": 972 }, { - "__id__": 954 + "__id__": 974 } ], "_prefab": { - "__id__": 956 + "__id__": 976 }, "_lpos": { "__type__": "cc.Vec3", @@ -20318,11 +20744,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 951 + "__id__": 971 }, "_enabled": true, "__prefab": { - "__id__": 953 + "__id__": 973 }, "_contentSize": { "__type__": "cc.Size", @@ -20346,11 +20772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 951 + "__id__": 971 }, "_enabled": true, "__prefab": { - "__id__": 955 + "__id__": 975 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20407,11 +20833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 930 + "__id__": 950 }, "_enabled": true, "__prefab": { - "__id__": 958 + "__id__": 978 }, "_contentSize": { "__type__": "cc.Size", @@ -20435,11 +20861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 930 + "__id__": 950 }, "_enabled": true, "__prefab": { - "__id__": 960 + "__id__": 980 }, "_alignFlags": 40, "_target": null, @@ -20484,33 +20910,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 865 + "__id__": 885 }, "_children": [ - { - "__id__": 963 - }, - { - "__id__": 971 - }, - { - "__id__": 977 - }, { "__id__": 983 + }, + { + "__id__": 991 + }, + { + "__id__": 997 + }, + { + "__id__": 1003 } ], "_active": true, "_components": [ { - "__id__": 989 + "__id__": 1009 }, { - "__id__": 991 + "__id__": 1011 } ], "_prefab": { - "__id__": 993 + "__id__": 1013 }, "_lpos": { "__type__": "cc.Vec3", @@ -20547,23 +20973,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 962 + "__id__": 982 }, "_children": [], "_active": true, "_components": [ { - "__id__": 964 + "__id__": 984 }, { - "__id__": 966 + "__id__": 986 }, { - "__id__": 968 + "__id__": 988 } ], "_prefab": { - "__id__": 970 + "__id__": 990 }, "_lpos": { "__type__": "cc.Vec3", @@ -20600,11 +21026,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 963 + "__id__": 983 }, "_enabled": true, "__prefab": { - "__id__": 965 + "__id__": 985 }, "_contentSize": { "__type__": "cc.Size", @@ -20628,11 +21054,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 963 + "__id__": 983 }, "_enabled": true, "__prefab": { - "__id__": 967 + "__id__": 987 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20696,11 +21122,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 963 + "__id__": 983 }, "_enabled": true, "__prefab": { - "__id__": 969 + "__id__": 989 }, "_alignFlags": 40, "_target": null, @@ -20745,20 +21171,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 962 + "__id__": 982 }, "_children": [], "_active": true, "_components": [ { - "__id__": 972 + "__id__": 992 }, { - "__id__": 974 + "__id__": 994 } ], "_prefab": { - "__id__": 976 + "__id__": 996 }, "_lpos": { "__type__": "cc.Vec3", @@ -20795,11 +21221,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 971 + "__id__": 991 }, "_enabled": true, "__prefab": { - "__id__": 973 + "__id__": 993 }, "_contentSize": { "__type__": "cc.Size", @@ -20823,11 +21249,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 971 + "__id__": 991 }, "_enabled": true, "__prefab": { - "__id__": 975 + "__id__": 995 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -20881,20 +21307,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 962 + "__id__": 982 }, "_children": [], "_active": true, "_components": [ { - "__id__": 978 + "__id__": 998 }, { - "__id__": 980 + "__id__": 1000 } ], "_prefab": { - "__id__": 982 + "__id__": 1002 }, "_lpos": { "__type__": "cc.Vec3", @@ -20931,11 +21357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 977 + "__id__": 997 }, "_enabled": true, "__prefab": { - "__id__": 979 + "__id__": 999 }, "_contentSize": { "__type__": "cc.Size", @@ -20959,11 +21385,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 977 + "__id__": 997 }, "_enabled": true, "__prefab": { - "__id__": 981 + "__id__": 1001 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21020,20 +21446,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 962 + "__id__": 982 }, "_children": [], "_active": true, "_components": [ { - "__id__": 984 + "__id__": 1004 }, { - "__id__": 986 + "__id__": 1006 } ], "_prefab": { - "__id__": 988 + "__id__": 1008 }, "_lpos": { "__type__": "cc.Vec3", @@ -21070,11 +21496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 983 + "__id__": 1003 }, "_enabled": true, "__prefab": { - "__id__": 985 + "__id__": 1005 }, "_contentSize": { "__type__": "cc.Size", @@ -21098,11 +21524,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 983 + "__id__": 1003 }, "_enabled": true, "__prefab": { - "__id__": 987 + "__id__": 1007 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21159,11 +21585,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 962 + "__id__": 982 }, "_enabled": true, "__prefab": { - "__id__": 990 + "__id__": 1010 }, "_contentSize": { "__type__": "cc.Size", @@ -21187,11 +21613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 962 + "__id__": 982 }, "_enabled": true, "__prefab": { - "__id__": 992 + "__id__": 1012 }, "_alignFlags": 40, "_target": null, @@ -21236,33 +21662,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 865 + "__id__": 885 }, "_children": [ - { - "__id__": 995 - }, - { - "__id__": 1003 - }, - { - "__id__": 1009 - }, { "__id__": 1015 + }, + { + "__id__": 1023 + }, + { + "__id__": 1029 + }, + { + "__id__": 1035 } ], "_active": true, "_components": [ { - "__id__": 1021 + "__id__": 1041 }, { - "__id__": 1023 + "__id__": 1043 } ], "_prefab": { - "__id__": 1025 + "__id__": 1045 }, "_lpos": { "__type__": "cc.Vec3", @@ -21299,23 +21725,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 994 + "__id__": 1014 }, "_children": [], "_active": true, "_components": [ { - "__id__": 996 + "__id__": 1016 }, { - "__id__": 998 + "__id__": 1018 }, { - "__id__": 1000 + "__id__": 1020 } ], "_prefab": { - "__id__": 1002 + "__id__": 1022 }, "_lpos": { "__type__": "cc.Vec3", @@ -21352,11 +21778,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 995 + "__id__": 1015 }, "_enabled": true, "__prefab": { - "__id__": 997 + "__id__": 1017 }, "_contentSize": { "__type__": "cc.Size", @@ -21380,11 +21806,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 995 + "__id__": 1015 }, "_enabled": true, "__prefab": { - "__id__": 999 + "__id__": 1019 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21448,11 +21874,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 995 + "__id__": 1015 }, "_enabled": true, "__prefab": { - "__id__": 1001 + "__id__": 1021 }, "_alignFlags": 40, "_target": null, @@ -21497,20 +21923,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 994 + "__id__": 1014 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1004 + "__id__": 1024 }, { - "__id__": 1006 + "__id__": 1026 } ], "_prefab": { - "__id__": 1008 + "__id__": 1028 }, "_lpos": { "__type__": "cc.Vec3", @@ -21547,11 +21973,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1003 + "__id__": 1023 }, "_enabled": true, "__prefab": { - "__id__": 1005 + "__id__": 1025 }, "_contentSize": { "__type__": "cc.Size", @@ -21575,11 +22001,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1003 + "__id__": 1023 }, "_enabled": true, "__prefab": { - "__id__": 1007 + "__id__": 1027 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21633,20 +22059,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 994 + "__id__": 1014 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1010 + "__id__": 1030 }, { - "__id__": 1012 + "__id__": 1032 } ], "_prefab": { - "__id__": 1014 + "__id__": 1034 }, "_lpos": { "__type__": "cc.Vec3", @@ -21683,11 +22109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1009 + "__id__": 1029 }, "_enabled": true, "__prefab": { - "__id__": 1011 + "__id__": 1031 }, "_contentSize": { "__type__": "cc.Size", @@ -21711,11 +22137,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1009 + "__id__": 1029 }, "_enabled": true, "__prefab": { - "__id__": 1013 + "__id__": 1033 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21772,20 +22198,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 994 + "__id__": 1014 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1016 + "__id__": 1036 }, { - "__id__": 1018 + "__id__": 1038 } ], "_prefab": { - "__id__": 1020 + "__id__": 1040 }, "_lpos": { "__type__": "cc.Vec3", @@ -21822,11 +22248,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1015 + "__id__": 1035 }, "_enabled": true, "__prefab": { - "__id__": 1017 + "__id__": 1037 }, "_contentSize": { "__type__": "cc.Size", @@ -21850,11 +22276,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1015 + "__id__": 1035 }, "_enabled": true, "__prefab": { - "__id__": 1019 + "__id__": 1039 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -21911,11 +22337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 994 + "__id__": 1014 }, "_enabled": true, "__prefab": { - "__id__": 1022 + "__id__": 1042 }, "_contentSize": { "__type__": "cc.Size", @@ -21939,11 +22365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 994 + "__id__": 1014 }, "_enabled": true, "__prefab": { - "__id__": 1024 + "__id__": 1044 }, "_alignFlags": 40, "_target": null, @@ -21988,11 +22414,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 865 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 1027 + "__id__": 1047 }, "_contentSize": { "__type__": "cc.Size", @@ -22016,11 +22442,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 865 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 1029 + "__id__": 1049 }, "_alignFlags": 18, "_target": null, @@ -22052,11 +22478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 865 + "__id__": 885 }, "_enabled": true, "__prefab": { - "__id__": 1031 + "__id__": 1051 }, "_resizeMode": 0, "_layoutType": 2, @@ -22109,17 +22535,17 @@ "_active": true, "_components": [ { - "__id__": 1034 + "__id__": 1054 }, { - "__id__": 1036 + "__id__": 1056 }, { - "__id__": 1038 + "__id__": 1058 } ], "_prefab": { - "__id__": 1040 + "__id__": 1060 }, "_lpos": { "__type__": "cc.Vec3", @@ -22156,11 +22582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1033 + "__id__": 1053 }, "_enabled": true, "__prefab": { - "__id__": 1035 + "__id__": 1055 }, "_contentSize": { "__type__": "cc.Size", @@ -22184,11 +22610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1033 + "__id__": 1053 }, "_enabled": true, "__prefab": { - "__id__": 1037 + "__id__": 1057 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22229,11 +22655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1033 + "__id__": 1053 }, "_enabled": true, "__prefab": { - "__id__": 1039 + "__id__": 1059 }, "_alignFlags": 12, "_target": null, @@ -22284,17 +22710,17 @@ "_active": true, "_components": [ { - "__id__": 1042 + "__id__": 1062 }, { - "__id__": 1044 + "__id__": 1064 }, { - "__id__": 1046 + "__id__": 1066 } ], "_prefab": { - "__id__": 1048 + "__id__": 1068 }, "_lpos": { "__type__": "cc.Vec3", @@ -22331,11 +22757,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1041 + "__id__": 1061 }, "_enabled": true, "__prefab": { - "__id__": 1043 + "__id__": 1063 }, "_contentSize": { "__type__": "cc.Size", @@ -22359,11 +22785,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1041 + "__id__": 1061 }, "_enabled": true, "__prefab": { - "__id__": 1045 + "__id__": 1065 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22404,11 +22830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1041 + "__id__": 1061 }, "_enabled": true, "__prefab": { - "__id__": 1047 + "__id__": 1067 }, "_alignFlags": 36, "_target": null, @@ -22457,7 +22883,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1050 + "__id__": 1070 }, "_contentSize": { "__type__": "cc.Size", @@ -22485,7 +22911,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1052 + "__id__": 1072 }, "_alignFlags": 45, "_target": null, @@ -22521,34 +22947,40 @@ }, "_enabled": true, "__prefab": { - "__id__": 1054 + "__id__": 1074 }, "hero_icon": { - "__id__": 775 - }, - "phero_icon": { - "__id__": 765 - }, - "nhero_icon": { "__id__": 785 }, + "phero_icon": { + "__id__": 775 + }, + "nhero_icon": { + "__id__": 795 + }, + "phero1_icon": { + "__id__": 765 + }, + "nhero1_icon": { + "__id__": 805 + }, "ap_node": { - "__id__": 810 + "__id__": 830 }, "hp_node": { - "__id__": 838 + "__id__": 858 }, "info_node": { - "__id__": 865 + "__id__": 885 }, "name_node": { - "__id__": 852 + "__id__": 872 }, "pre_btn": { - "__id__": 1033 + "__id__": 1053 }, "next_btn": { - "__id__": 1041 + "__id__": 1061 }, "_id": "" }, @@ -22579,20 +23011,20 @@ }, "_children": [ { - "__id__": 1057 + "__id__": 1077 } ], "_active": false, "_components": [ { - "__id__": 1065 + "__id__": 1085 }, { - "__id__": 1067 + "__id__": 1087 } ], "_prefab": { - "__id__": 1069 + "__id__": 1089 }, "_lpos": { "__type__": "cc.Vec3", @@ -22629,23 +23061,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1056 + "__id__": 1076 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1058 + "__id__": 1078 }, { - "__id__": 1060 + "__id__": 1080 }, { - "__id__": 1062 + "__id__": 1082 } ], "_prefab": { - "__id__": 1064 + "__id__": 1084 }, "_lpos": { "__type__": "cc.Vec3", @@ -22682,11 +23114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1057 + "__id__": 1077 }, "_enabled": true, "__prefab": { - "__id__": 1059 + "__id__": 1079 }, "_contentSize": { "__type__": "cc.Size", @@ -22710,11 +23142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1057 + "__id__": 1077 }, "_enabled": true, "__prefab": { - "__id__": 1061 + "__id__": 1081 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -22755,11 +23187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1057 + "__id__": 1077 }, "_enabled": true, "__prefab": { - "__id__": 1063 + "__id__": 1083 }, "_alignFlags": 45, "_target": null, @@ -22804,11 +23236,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1056 + "__id__": 1076 }, "_enabled": true, "__prefab": { - "__id__": 1066 + "__id__": 1086 }, "_contentSize": { "__type__": "cc.Size", @@ -22832,11 +23264,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1056 + "__id__": 1076 }, "_enabled": true, "__prefab": { - "__id__": 1068 + "__id__": 1088 }, "_alignFlags": 45, "_target": null, @@ -22885,7 +23317,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1071 + "__id__": 1091 }, "_contentSize": { "__type__": "cc.Size", @@ -22913,7 +23345,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1073 + "__id__": 1093 }, "_alignFlags": 21, "_target": null, @@ -22949,7 +23381,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1075 + "__id__": 1095 }, "heros_page": { "__id__": 756 @@ -22990,14 +23422,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 1078 + "__id__": 1098 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 1077 + "__id__": 1097 }, "asset": { "__uuid__": "26bff847-cd29-48a5-bbfa-c3e2dbda688d", @@ -23005,7 +23437,7 @@ }, "fileId": "5a9CMsVQhKP5Y+UJfTKPbx", "instance": { - "__id__": 1079 + "__id__": 1099 }, "targetOverrides": null }, @@ -23019,19 +23451,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 1080 + "__id__": 1100 }, { - "__id__": 1082 + "__id__": 1102 }, { - "__id__": 1083 + "__id__": 1103 }, { - "__id__": 1084 + "__id__": 1104 }, { - "__id__": 1085 + "__id__": 1105 } ], "removedComponents": [] @@ -23039,7 +23471,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1101 }, "propertyPath": [ "_name" @@ -23055,7 +23487,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1101 }, "propertyPath": [ "_lpos" @@ -23070,7 +23502,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1101 }, "propertyPath": [ "_lrot" @@ -23086,7 +23518,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1101 }, "propertyPath": [ "_euler" @@ -23101,7 +23533,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 1081 + "__id__": 1101 }, "propertyPath": [ "_active" @@ -23118,23 +23550,23 @@ }, "_children": [ { - "__id__": 1087 + "__id__": 1107 } ], "_active": true, "_components": [ { - "__id__": 1125 + "__id__": 1145 }, { - "__id__": 1127 + "__id__": 1147 }, { - "__id__": 1129 + "__id__": 1149 } ], "_prefab": { - "__id__": 1131 + "__id__": 1151 }, "_lpos": { "__type__": "cc.Vec3", @@ -23171,30 +23603,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1086 + "__id__": 1106 }, "_children": [ { - "__id__": 1088 + "__id__": 1108 } ], "_active": true, "_components": [ { - "__id__": 1116 + "__id__": 1136 }, { - "__id__": 1118 + "__id__": 1138 }, { - "__id__": 1120 + "__id__": 1140 }, { - "__id__": 1122 + "__id__": 1142 } ], "_prefab": { - "__id__": 1124 + "__id__": 1144 }, "_lpos": { "__type__": "cc.Vec3", @@ -23231,27 +23663,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1087 + "__id__": 1107 }, "_children": [ { - "__id__": 1089 + "__id__": 1109 }, { - "__id__": 1097 + "__id__": 1117 }, { - "__id__": 1103 + "__id__": 1123 } ], "_active": true, "_components": [ { - "__id__": 1113 + "__id__": 1133 } ], "_prefab": { - "__id__": 1115 + "__id__": 1135 }, "_lpos": { "__type__": "cc.Vec3", @@ -23288,23 +23720,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1088 + "__id__": 1108 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1090 + "__id__": 1110 }, { - "__id__": 1092 + "__id__": 1112 }, { - "__id__": 1094 + "__id__": 1114 } ], "_prefab": { - "__id__": 1096 + "__id__": 1116 }, "_lpos": { "__type__": "cc.Vec3", @@ -23341,11 +23773,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1089 + "__id__": 1109 }, "_enabled": true, "__prefab": { - "__id__": 1091 + "__id__": 1111 }, "_contentSize": { "__type__": "cc.Size", @@ -23369,11 +23801,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1089 + "__id__": 1109 }, "_enabled": true, "__prefab": { - "__id__": 1093 + "__id__": 1113 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23417,11 +23849,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1089 + "__id__": 1109 }, "_enabled": true, "__prefab": { - "__id__": 1095 + "__id__": 1115 }, "_alignFlags": 40, "_target": null, @@ -23466,20 +23898,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1088 + "__id__": 1108 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1098 + "__id__": 1118 }, { - "__id__": 1100 + "__id__": 1120 } ], "_prefab": { - "__id__": 1102 + "__id__": 1122 }, "_lpos": { "__type__": "cc.Vec3", @@ -23516,11 +23948,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1097 + "__id__": 1117 }, "_enabled": true, "__prefab": { - "__id__": 1099 + "__id__": 1119 }, "_contentSize": { "__type__": "cc.Size", @@ -23544,11 +23976,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1097 + "__id__": 1117 }, "_enabled": true, "__prefab": { - "__id__": 1101 + "__id__": 1121 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23605,26 +24037,26 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 1088 + "__id__": 1108 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1104 + "__id__": 1124 }, { - "__id__": 1106 + "__id__": 1126 }, { - "__id__": 1108 + "__id__": 1128 }, { - "__id__": 1110 + "__id__": 1130 } ], "_prefab": { - "__id__": 1112 + "__id__": 1132 }, "_lpos": { "__type__": "cc.Vec3", @@ -23661,11 +24093,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1103 + "__id__": 1123 }, "_enabled": true, "__prefab": { - "__id__": 1105 + "__id__": 1125 }, "_contentSize": { "__type__": "cc.Size", @@ -23689,11 +24121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1103 + "__id__": 1123 }, "_enabled": true, "__prefab": { - "__id__": 1107 + "__id__": 1127 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -23757,11 +24189,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1103 + "__id__": 1123 }, "_enabled": true, "__prefab": { - "__id__": 1109 + "__id__": 1129 }, "_alignFlags": 10, "_target": null, @@ -23793,11 +24225,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1103 + "__id__": 1123 }, "_enabled": true, "__prefab": { - "__id__": 1111 + "__id__": 1131 }, "templateMode": true, "watchPath": "data.data.gold", @@ -23830,11 +24262,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1088 + "__id__": 1108 }, "_enabled": true, "__prefab": { - "__id__": 1114 + "__id__": 1134 }, "_contentSize": { "__type__": "cc.Size", @@ -23871,11 +24303,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1087 + "__id__": 1107 }, "_enabled": true, "__prefab": { - "__id__": 1117 + "__id__": 1137 }, "_contentSize": { "__type__": "cc.Size", @@ -23899,11 +24331,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1087 + "__id__": 1107 }, "_enabled": true, "__prefab": { - "__id__": 1119 + "__id__": 1139 }, "_alignFlags": 8, "_target": null, @@ -23935,11 +24367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1087 + "__id__": 1107 }, "_enabled": true, "__prefab": { - "__id__": 1121 + "__id__": 1141 }, "_resizeMode": 0, "_layoutType": 1, @@ -23973,11 +24405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1087 + "__id__": 1107 }, "_enabled": true, "__prefab": { - "__id__": 1123 + "__id__": 1143 }, "_alignFlags": 40, "_target": null, @@ -24022,11 +24454,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1106 }, "_enabled": true, "__prefab": { - "__id__": 1126 + "__id__": 1146 }, "_contentSize": { "__type__": "cc.Size", @@ -24050,11 +24482,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1106 }, "_enabled": true, "__prefab": { - "__id__": 1128 + "__id__": 1148 }, "_alignFlags": 17, "_target": null, @@ -24086,11 +24518,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1086 + "__id__": 1106 }, "_enabled": true, "__prefab": { - "__id__": 1130 + "__id__": 1150 }, "_id": "" }, @@ -24121,7 +24553,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1133 + "__id__": 1153 }, "_contentSize": { "__type__": "cc.Size", @@ -24149,7 +24581,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1135 + "__id__": 1155 }, "_alignFlags": 45, "_target": null, @@ -24185,7 +24617,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 1137 + "__id__": 1157 }, "debugMode": false, "_id": "" @@ -24207,7 +24639,7 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 1077 + "__id__": 1097 }, { "__id__": 588 diff --git a/assets/script/game/map/HlistComp.ts b/assets/script/game/map/HlistComp.ts index 6d04954d..3823d693 100644 --- a/assets/script/game/map/HlistComp.ts +++ b/assets/script/game/map/HlistComp.ts @@ -1,4 +1,4 @@ -import { _decorator, Animation, AnimationClip, Button, Event, Label, Node, NodeEventType, Sprite, resources } from "cc"; +import { _decorator, Animation, AnimationClip, Button, Event, Label, Node, NodeEventType, Sprite, resources, tween, Vec3 } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { HeroInfo, HeroList } from "../common/config/heroSet"; @@ -19,6 +19,10 @@ export class HListComp extends CCComp { @property(Node) nhero_icon=null! @property(Node) + phero1_icon=null! + @property(Node) + nhero1_icon=null! + @property(Node) ap_node=null! @property(Node) hp_node=null! @@ -35,6 +39,9 @@ export class HListComp extends CCComp { huuid:number=null! private currentIndex: number = 0; private iconVisualTokens: Map = new Map(); + private isAnimating: boolean = false; + private carouselNodes: Node[] = []; + private fixedPositions: Vec3[] = []; debugMode: boolean = false; onLoad() { @@ -43,49 +50,96 @@ export class HListComp extends CCComp { } start() { + if (this.phero1_icon && this.phero_icon && this.hero_icon && this.nhero_icon && this.nhero1_icon) { + this.carouselNodes = [this.phero1_icon, this.phero_icon, this.hero_icon, this.nhero_icon, this.nhero1_icon]; + this.fixedPositions = this.carouselNodes.map(n => n.position.clone()); + } + if (HeroList && HeroList.length > 0) { this.currentIndex = 0; - this.updateHeroView(); + this.initAllNodes(); + this.updateHeroInfo(); } } private onPreClick() { - if (!HeroList || HeroList.length === 0) return; + if (!HeroList || HeroList.length === 0 || this.isAnimating || this.carouselNodes.length < 5) return; + this.isAnimating = true; + this.currentIndex = (this.currentIndex - 1 + HeroList.length) % HeroList.length; - this.updateHeroView(); + + const [n0, n1, n2, n3, n4] = this.carouselNodes; + + // n4 instantly jumps from rightmost to leftmost position to get ready to slide in + n4.setPosition(new Vec3(this.fixedPositions[0].x, n4.position.y, n4.position.z)); + this.updateNodeAnimationByOffset(n4, -2); + this.updateHeroInfo(); + + tween(n0).to(0.2, { position: new Vec3(this.fixedPositions[1].x, n0.position.y, n0.position.z) }).start(); + tween(n1).to(0.2, { position: new Vec3(this.fixedPositions[2].x, n1.position.y, n1.position.z) }).start(); + tween(n2).to(0.2, { position: new Vec3(this.fixedPositions[3].x, n2.position.y, n2.position.z) }).start(); + tween(n3).to(0.2, { position: new Vec3(this.fixedPositions[4].x, n3.position.y, n3.position.z) }) + .call(() => { + this.carouselNodes = [n4, n0, n1, n2, n3]; + this.isAnimating = false; + }) + .start(); } private onNextClick() { - if (!HeroList || HeroList.length === 0) return; + if (!HeroList || HeroList.length === 0 || this.isAnimating || this.carouselNodes.length < 5) return; + this.isAnimating = true; + this.currentIndex = (this.currentIndex + 1) % HeroList.length; - this.updateHeroView(); + + const [n0, n1, n2, n3, n4] = this.carouselNodes; + + // n0 instantly jumps from leftmost to rightmost position to get ready to slide in + n0.setPosition(new Vec3(this.fixedPositions[4].x, n0.position.y, n0.position.z)); + this.updateNodeAnimationByOffset(n0, 2); + this.updateHeroInfo(); + + tween(n1).to(0.2, { position: new Vec3(this.fixedPositions[0].x, n1.position.y, n1.position.z) }).start(); + tween(n2).to(0.2, { position: new Vec3(this.fixedPositions[1].x, n2.position.y, n2.position.z) }).start(); + tween(n3).to(0.2, { position: new Vec3(this.fixedPositions[2].x, n3.position.y, n3.position.z) }).start(); + tween(n4).to(0.2, { position: new Vec3(this.fixedPositions[3].x, n4.position.y, n4.position.z) }) + .call(() => { + this.carouselNodes = [n1, n2, n3, n4, n0]; + this.isAnimating = false; + }) + .start(); } - private updateHeroView() { - this.huuid = HeroList[this.currentIndex]; + private getHeroUuid(offset: number): number { + const len = HeroList.length; + return HeroList[(this.currentIndex + offset + len * 5) % len]; + } + + private updateNodeAnimationByOffset(node: Node, offset: number) { + const uuid = this.getHeroUuid(offset); + this.updateHeroAnimation(node, uuid); + } + + private updateHeroInfo() { + this.huuid = this.getHeroUuid(0); 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}`); this.setLabelText(this.hp_node, `生命值: ${hero.hp}`); - - // 更新动画 - this.updateHeroAnimation(this.hero_icon, this.huuid); - this.updateHeroAnimation(this.phero_icon, pUuid); - this.updateHeroAnimation(this.nhero_icon, nUuid); - - // 更新技能列表 this.updateSkillInfo(hero); } + private initAllNodes() { + if (this.carouselNodes.length < 5) return; + this.updateNodeAnimationByOffset(this.carouselNodes[0], -2); + this.updateNodeAnimationByOffset(this.carouselNodes[1], -1); + this.updateNodeAnimationByOffset(this.carouselNodes[2], 0); + this.updateNodeAnimationByOffset(this.carouselNodes[3], 1); + this.updateNodeAnimationByOffset(this.carouselNodes[4], 2); + } + private setLabelText(node: Node, text: string) { if (!node) return; const label = node.getComponent(Label) || node.getComponentInChildren(Label);