From 8bb494314749a425cf0345ba1f6c827001988e02 Mon Sep 17 00:00:00 2001 From: pan Date: Fri, 4 Sep 2026 09:10:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=B9=E9=87=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=8A=80=E8=83=BDbuff=E4=B8=8E=E8=8B=B1=E9=9B=84=E9=A2=84?= =?UTF-8?q?=E5=88=B6=E4=BD=93=E7=9A=84=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 调整多个plus系列buff预制体的Y轴偏移量 2. 修改maxw/maxb/maxr系列buff的位置与缩放参数 3. 更新shielded预制体的尺寸与Y轴偏移 4. 统一替换所有英雄预制体的依赖prefab与组件ID 5. 清理英雄预制体中冗余的属性覆盖配置 --- assets/resources/game/heros/ha1.prefab | 214 ++------------- assets/resources/game/heros/ha3.prefab | 212 ++------------- assets/resources/game/heros/ha4.prefab | 212 ++------------- assets/resources/game/heros/hc1.prefab | 212 ++------------- assets/resources/game/heros/hc2.prefab | 212 ++------------- assets/resources/game/heros/hh1.prefab | 212 ++------------- assets/resources/game/heros/hh2.prefab | 212 ++------------- assets/resources/game/heros/hk2.prefab | 212 ++------------- assets/resources/game/heros/hk3.prefab | 212 ++------------- assets/resources/game/heros/hk4.prefab | 212 ++------------- assets/resources/game/heros/hk5.prefab | 212 ++------------- assets/resources/game/heros/hm1.prefab | 212 ++------------- assets/resources/game/heros/hm2.prefab | 212 ++------------- assets/resources/game/heros/hm3.prefab | 212 ++------------- assets/resources/game/heros/hm4.prefab | 212 ++------------- assets/resources/game/heros/hm5.prefab | 212 ++------------- assets/resources/game/heros/m1.prefab | 212 ++------------- assets/resources/game/heros/m10.prefab | 236 ++-------------- assets/resources/game/heros/m2.prefab | 212 ++------------- assets/resources/game/heros/m3.prefab | 212 ++------------- assets/resources/game/heros/m4.prefab | 212 ++------------- assets/resources/game/heros/m5.prefab | 212 ++------------- assets/resources/game/heros/m6.prefab | 212 ++------------- assets/resources/game/heros/m7.prefab | 212 ++------------- assets/resources/game/heros/m8.prefab | 212 ++------------- assets/resources/game/heros/m9.prefab | 212 ++------------- assets/resources/game/heros/mb1.prefab | 254 +++-------------- assets/resources/game/heros/mb2.prefab | 255 +++--------------- assets/resources/game/heros/mb3.prefab | 254 +++-------------- assets/resources/game/heros/mb4.prefab | 254 +++-------------- assets/resources/game/heros/mb5.prefab | 254 +++-------------- assets/resources/game/heros/mb6.prefab | 254 +++-------------- assets/resources/game/skill/buff/maxb.prefab | 4 +- assets/resources/game/skill/buff/maxr.prefab | 4 +- assets/resources/game/skill/buff/maxw.prefab | 4 +- assets/resources/game/skill/buff/plus.prefab | 2 +- assets/resources/game/skill/buff/plus2.prefab | 2 +- assets/resources/game/skill/buff/plus3.prefab | 2 +- assets/resources/game/skill/buff/plus4.prefab | 2 +- assets/resources/game/skill/buff/plus5.prefab | 2 +- .../resources/game/skill/buff/shielded.prefab | 6 +- 41 files changed, 783 insertions(+), 6308 deletions(-) diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index cfb36c01..13434dbb 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -26,34 +26,31 @@ }, { "__id__": 23 - }, - { - "__id__": 35 } ], "_active": true, "_components": [ { - "__id__": 44 + "__id__": 32 }, { - "__id__": 46 + "__id__": 34 }, { - "__id__": 48 + "__id__": 36 }, { - "__id__": 50 + "__id__": 38 }, { - "__id__": 52 + "__id__": 40 }, { - "__id__": 54 + "__id__": 42 } ], "_prefab": { - "__id__": 56 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -451,6 +448,8 @@ "__id__": 0 }, "fileId": "4aKyovCOhDJpr23Of35+5a", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -470,10 +469,10 @@ "__id__": 23 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 25 }, @@ -481,7 +480,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -502,12 +501,6 @@ }, { "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 34 } ], "removedComponents": [] @@ -520,166 +513,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 36 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 35 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 37 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, - { - "__id__": 43 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 39 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -691,7 +524,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -706,7 +539,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -722,7 +555,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -737,7 +570,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -759,7 +592,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 33 }, "_contentSize": { "__type__": "cc.Size", @@ -787,7 +620,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 35 }, "anm": { "__id__": 14 @@ -808,7 +641,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 37 }, "debugMode": false, "_id": "" @@ -827,7 +660,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 39 }, "enabledContactListener": true, "bullet": false, @@ -861,7 +694,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 41 }, "tag": 0, "_group": 4, @@ -895,7 +728,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 43 }, "playOnLoad": false, "_clips": [], @@ -918,9 +751,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 35 - }, { "__id__": 23 }, diff --git a/assets/resources/game/heros/ha3.prefab b/assets/resources/game/heros/ha3.prefab index 3f7ee88b..f3a6850b 100644 --- a/assets/resources/game/heros/ha3.prefab +++ b/assets/resources/game/heros/ha3.prefab @@ -26,34 +26,31 @@ }, { "__id__": 23 - }, - { - "__id__": 35 } ], "_active": true, "_components": [ { - "__id__": 44 + "__id__": 32 }, { - "__id__": 46 + "__id__": 34 }, { - "__id__": 48 + "__id__": 36 }, { - "__id__": 50 + "__id__": 38 }, { - "__id__": 52 + "__id__": 40 }, { - "__id__": 54 + "__id__": 42 } ], "_prefab": { - "__id__": 56 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -475,10 +472,10 @@ "__id__": 23 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 25 }, @@ -486,7 +483,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -507,12 +504,6 @@ }, { "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 34 } ], "removedComponents": [] @@ -525,166 +516,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 36 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 35 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 37 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, - { - "__id__": 43 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 39 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -696,7 +527,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -727,7 +558,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -742,7 +573,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -764,7 +595,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 33 }, "_contentSize": { "__type__": "cc.Size", @@ -792,7 +623,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 35 }, "anm": { "__id__": 14 @@ -813,7 +644,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 37 }, "debugMode": false, "_id": "" @@ -832,7 +663,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 39 }, "enabledContactListener": true, "bullet": false, @@ -866,7 +697,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 41 }, "tag": 0, "_group": 4, @@ -900,7 +731,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 43 }, "playOnLoad": false, "_clips": [], @@ -923,9 +754,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 35 - }, { "__id__": 23 }, diff --git a/assets/resources/game/heros/ha4.prefab b/assets/resources/game/heros/ha4.prefab index 66fd0ee2..e88e73e0 100644 --- a/assets/resources/game/heros/ha4.prefab +++ b/assets/resources/game/heros/ha4.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hc1.prefab b/assets/resources/game/heros/hc1.prefab index ee19e01c..3baa230d 100644 --- a/assets/resources/game/heros/hc1.prefab +++ b/assets/resources/game/heros/hc1.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hc2.prefab b/assets/resources/game/heros/hc2.prefab index 9272cdca..ccd06403 100644 --- a/assets/resources/game/heros/hc2.prefab +++ b/assets/resources/game/heros/hc2.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hh1.prefab b/assets/resources/game/heros/hh1.prefab index c3c17ca9..bd637756 100644 --- a/assets/resources/game/heros/hh1.prefab +++ b/assets/resources/game/heros/hh1.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hh2.prefab b/assets/resources/game/heros/hh2.prefab index 3cec6936..fe2ef894 100644 --- a/assets/resources/game/heros/hh2.prefab +++ b/assets/resources/game/heros/hh2.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hk2.prefab b/assets/resources/game/heros/hk2.prefab index 8c4673de..9580c950 100644 --- a/assets/resources/game/heros/hk2.prefab +++ b/assets/resources/game/heros/hk2.prefab @@ -26,34 +26,31 @@ }, { "__id__": 27 - }, - { - "__id__": 39 } ], "_active": true, "_components": [ { - "__id__": 48 + "__id__": 36 }, { - "__id__": 50 + "__id__": 38 }, { - "__id__": 52 + "__id__": 40 }, { - "__id__": 54 + "__id__": 42 }, { - "__id__": 56 + "__id__": 44 }, { - "__id__": 58 + "__id__": 46 } ], "_prefab": { - "__id__": 60 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -496,10 +493,10 @@ "__id__": 27 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 29 }, @@ -507,7 +504,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -528,12 +525,6 @@ }, { "__id__": 35 - }, - { - "__id__": 36 - }, - { - "__id__": 38 } ], "removedComponents": [] @@ -546,166 +537,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 31 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 31 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 31 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 31 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 37 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 31 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 40 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 39 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 41 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 42 - }, - { - "__id__": 44 - }, - { - "__id__": 45 - }, - { - "__id__": 46 - }, - { - "__id__": 47 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 43 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -717,7 +548,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 31 }, "propertyPath": [ "_lpos" @@ -732,7 +563,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 31 }, "propertyPath": [ "_lrot" @@ -748,7 +579,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 31 }, "propertyPath": [ "_euler" @@ -763,7 +594,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 43 + "__id__": 31 }, "propertyPath": [ "_lscale" @@ -785,7 +616,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -813,7 +644,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 39 }, "anm": { "__id__": 18 @@ -834,7 +665,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 41 }, "debugMode": false, "_id": "" @@ -853,7 +684,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 43 }, "enabledContactListener": true, "bullet": false, @@ -887,7 +718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 45 }, "tag": 0, "_group": 4, @@ -921,7 +752,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 47 }, "playOnLoad": false, "_clips": [], @@ -944,9 +775,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 39 - }, { "__id__": 27 }, diff --git a/assets/resources/game/heros/hk3.prefab b/assets/resources/game/heros/hk3.prefab index 7593a429..f5af5fa6 100644 --- a/assets/resources/game/heros/hk3.prefab +++ b/assets/resources/game/heros/hk3.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hk4.prefab b/assets/resources/game/heros/hk4.prefab index df7996cb..f7565535 100644 --- a/assets/resources/game/heros/hk4.prefab +++ b/assets/resources/game/heros/hk4.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hk5.prefab b/assets/resources/game/heros/hk5.prefab index 2410440e..f538f8f5 100644 --- a/assets/resources/game/heros/hk5.prefab +++ b/assets/resources/game/heros/hk5.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hm1.prefab b/assets/resources/game/heros/hm1.prefab index 2482f02c..df51b1a5 100644 --- a/assets/resources/game/heros/hm1.prefab +++ b/assets/resources/game/heros/hm1.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hm2.prefab b/assets/resources/game/heros/hm2.prefab index b3726079..2417efa2 100644 --- a/assets/resources/game/heros/hm2.prefab +++ b/assets/resources/game/heros/hm2.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hm3.prefab b/assets/resources/game/heros/hm3.prefab index c8492b12..c442f8c7 100644 --- a/assets/resources/game/heros/hm3.prefab +++ b/assets/resources/game/heros/hm3.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hm4.prefab b/assets/resources/game/heros/hm4.prefab index 618870f6..9ea21c00 100644 --- a/assets/resources/game/heros/hm4.prefab +++ b/assets/resources/game/heros/hm4.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/hm5.prefab b/assets/resources/game/heros/hm5.prefab index ed55d03a..a3ba458a 100644 --- a/assets/resources/game/heros/hm5.prefab +++ b/assets/resources/game/heros/hm5.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -462,10 +459,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -473,7 +470,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -494,12 +491,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -512,166 +503,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -683,7 +514,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -698,7 +529,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -714,7 +545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -729,7 +560,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -751,7 +582,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -779,7 +610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -800,7 +631,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -819,7 +650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -853,7 +684,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -887,7 +718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -910,9 +741,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/m1.prefab b/assets/resources/game/heros/m1.prefab index 9e4cc4a8..feac315f 100644 --- a/assets/resources/game/heros/m1.prefab +++ b/assets/resources/game/heros/m1.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -462,10 +459,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -473,7 +470,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -494,12 +491,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -512,166 +503,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -683,7 +514,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -698,7 +529,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -714,7 +545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -729,7 +560,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -751,7 +582,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -779,7 +610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -800,7 +631,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -819,7 +650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -853,7 +684,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -887,7 +718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -910,9 +741,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/m10.prefab b/assets/resources/game/heros/m10.prefab index 031fc7b9..10a06042 100644 --- a/assets/resources/game/heros/m10.prefab +++ b/assets/resources/game/heros/m10.prefab @@ -26,34 +26,31 @@ }, { "__id__": 20 - }, - { - "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 29 }, { - "__id__": 45 + "__id__": 31 }, { - "__id__": 47 + "__id__": 33 }, { - "__id__": 49 + "__id__": 35 }, { - "__id__": 51 + "__id__": 37 }, { - "__id__": 53 + "__id__": 39 } ], "_prefab": { - "__id__": 55 + "__id__": 41 }, "_lpos": { "__type__": "cc.Vec3", @@ -414,10 +411,10 @@ "__id__": 20 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 22 }, @@ -425,7 +422,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -446,12 +443,6 @@ }, { "__id__": 28 - }, - { - "__id__": 29 - }, - { - "__id__": 31 } ], "removedComponents": [] @@ -464,169 +455,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 30 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 33 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 32 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 34 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 35 - }, - { - "__id__": 37 - }, - { - "__id__": 38 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 36 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -638,7 +466,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 36 + "__id__": 24 }, "propertyPath": [ "_lpos" @@ -653,7 +481,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 36 + "__id__": 24 }, "propertyPath": [ "_lrot" @@ -669,7 +497,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 36 + "__id__": 24 }, "propertyPath": [ "_euler" @@ -684,28 +512,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 41 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 36 + "__id__": 24 }, "propertyPath": [ "_lscale" @@ -727,7 +534,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 30 }, "_contentSize": { "__type__": "cc.Size", @@ -755,7 +562,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 32 }, "anm": { "__id__": 13 @@ -776,7 +583,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 34 }, "debugMode": false, "_id": "" @@ -795,7 +602,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 36 }, "enabledContactListener": true, "bullet": false, @@ -829,7 +636,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 38 }, "tag": 0, "_group": 4, @@ -863,7 +670,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 40 }, "playOnLoad": false, "_clips": [], @@ -886,9 +693,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 32 - }, { "__id__": 20 }, diff --git a/assets/resources/game/heros/m2.prefab b/assets/resources/game/heros/m2.prefab index e88fa932..d710fdfe 100644 --- a/assets/resources/game/heros/m2.prefab +++ b/assets/resources/game/heros/m2.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -462,10 +459,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -473,7 +470,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -494,12 +491,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -512,166 +503,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -683,7 +514,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -698,7 +529,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -714,7 +545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -729,7 +560,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -751,7 +582,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -779,7 +610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -800,7 +631,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -819,7 +650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -853,7 +684,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -887,7 +718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -910,9 +741,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/m3.prefab b/assets/resources/game/heros/m3.prefab index 68579763..62823db4 100644 --- a/assets/resources/game/heros/m3.prefab +++ b/assets/resources/game/heros/m3.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/m4.prefab b/assets/resources/game/heros/m4.prefab index af1244cf..603fa3a8 100644 --- a/assets/resources/game/heros/m4.prefab +++ b/assets/resources/game/heros/m4.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -462,10 +459,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -473,7 +470,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -494,12 +491,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -512,166 +503,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -683,7 +514,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -698,7 +529,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -714,7 +545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -729,7 +560,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -751,7 +582,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -779,7 +610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -800,7 +631,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -819,7 +650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -853,7 +684,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -887,7 +718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -910,9 +741,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/m5.prefab b/assets/resources/game/heros/m5.prefab index 9e98c050..bac7af60 100644 --- a/assets/resources/game/heros/m5.prefab +++ b/assets/resources/game/heros/m5.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -462,10 +459,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -473,7 +470,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -494,12 +491,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -512,166 +503,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -683,7 +514,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -698,7 +529,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -714,7 +545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -729,7 +560,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -751,7 +582,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -779,7 +610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -800,7 +631,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -819,7 +650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -853,7 +684,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -887,7 +718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -910,9 +741,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/m6.prefab b/assets/resources/game/heros/m6.prefab index 5563fb7a..92762273 100644 --- a/assets/resources/game/heros/m6.prefab +++ b/assets/resources/game/heros/m6.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -462,10 +459,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -473,7 +470,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -494,12 +491,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -512,166 +503,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -683,7 +514,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -698,7 +529,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -714,7 +545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -729,7 +560,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -751,7 +582,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -779,7 +610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -800,7 +631,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -819,7 +650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -853,7 +684,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -887,7 +718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -910,9 +741,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/m7.prefab b/assets/resources/game/heros/m7.prefab index 0c0c4c4d..dd0247aa 100644 --- a/assets/resources/game/heros/m7.prefab +++ b/assets/resources/game/heros/m7.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -459,10 +456,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -470,7 +467,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -491,12 +488,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -509,166 +500,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -680,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -695,7 +526,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -711,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -726,7 +557,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -748,7 +579,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -776,7 +607,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -797,7 +628,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -816,7 +647,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -850,7 +681,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -884,7 +715,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -907,9 +738,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/m8.prefab b/assets/resources/game/heros/m8.prefab index f1690e32..27666ad4 100644 --- a/assets/resources/game/heros/m8.prefab +++ b/assets/resources/game/heros/m8.prefab @@ -26,34 +26,31 @@ }, { "__id__": 22 - }, - { - "__id__": 34 } ], "_active": true, "_components": [ { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 53 + "__id__": 41 } ], "_prefab": { - "__id__": 55 + "__id__": 43 }, "_lpos": { "__type__": "cc.Vec3", @@ -462,10 +459,10 @@ "__id__": 22 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 24 }, @@ -473,7 +470,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -494,12 +491,6 @@ }, { "__id__": 30 - }, - { - "__id__": 31 - }, - { - "__id__": 33 } ], "removedComponents": [] @@ -512,166 +503,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 32 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 26 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 35 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 34 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 36 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 38 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -683,7 +514,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -698,7 +529,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -714,7 +545,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -729,7 +560,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 38 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -751,7 +582,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -779,7 +610,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "anm": { "__id__": 13 @@ -800,7 +631,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "debugMode": false, "_id": "" @@ -819,7 +650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "enabledContactListener": true, "bullet": false, @@ -853,7 +684,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "tag": 0, "_group": 4, @@ -887,7 +718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 42 }, "playOnLoad": false, "_clips": [], @@ -910,9 +741,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 34 - }, { "__id__": 22 }, diff --git a/assets/resources/game/heros/m9.prefab b/assets/resources/game/heros/m9.prefab index ac8b6ff5..02fbadbe 100644 --- a/assets/resources/game/heros/m9.prefab +++ b/assets/resources/game/heros/m9.prefab @@ -26,34 +26,31 @@ }, { "__id__": 20 - }, - { - "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 29 }, { - "__id__": 43 + "__id__": 31 }, { - "__id__": 45 + "__id__": 33 }, { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 51 + "__id__": 39 } ], "_prefab": { - "__id__": 53 + "__id__": 41 }, "_lpos": { "__type__": "cc.Vec3", @@ -414,10 +411,10 @@ "__id__": 20 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 22 }, @@ -425,7 +422,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -446,12 +443,6 @@ }, { "__id__": 28 - }, - { - "__id__": 29 - }, - { - "__id__": 31 } ], "removedComponents": [] @@ -464,166 +455,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 30 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 33 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 32 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 34 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 35 - }, - { - "__id__": 37 - }, - { - "__id__": 38 - }, - { - "__id__": 39 - }, - { - "__id__": 40 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 36 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -635,7 +466,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 36 + "__id__": 24 }, "propertyPath": [ "_lpos" @@ -650,7 +481,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 36 + "__id__": 24 }, "propertyPath": [ "_lrot" @@ -666,7 +497,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 36 + "__id__": 24 }, "propertyPath": [ "_euler" @@ -681,7 +512,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 36 + "__id__": 24 }, "propertyPath": [ "_lscale" @@ -703,7 +534,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 30 }, "_contentSize": { "__type__": "cc.Size", @@ -731,7 +562,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 32 }, "anm": { "__id__": 13 @@ -752,7 +583,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 34 }, "debugMode": false, "_id": "" @@ -771,7 +602,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 36 }, "enabledContactListener": true, "bullet": false, @@ -805,7 +636,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 38 }, "tag": 0, "_group": 4, @@ -839,7 +670,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 40 }, "playOnLoad": false, "_clips": [], @@ -862,9 +693,6 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ - { - "__id__": 32 - }, { "__id__": 20 }, diff --git a/assets/resources/game/heros/mb1.prefab b/assets/resources/game/heros/mb1.prefab index e618d74d..159c8c10 100644 --- a/assets/resources/game/heros/mb1.prefab +++ b/assets/resources/game/heros/mb1.prefab @@ -28,35 +28,32 @@ "__id__": 23 }, { - "__id__": 35 - }, - { - "__id__": 44 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 47 }, { - "__id__": 61 + "__id__": 49 }, { - "__id__": 63 + "__id__": 51 }, { - "__id__": 65 + "__id__": 53 }, { - "__id__": 67 + "__id__": 55 }, { - "__id__": 69 + "__id__": 57 } ], "_prefab": { - "__id__": 71 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -486,10 +483,10 @@ "__id__": 23 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 25 }, @@ -497,7 +494,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -518,12 +515,6 @@ }, { "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 34 } ], "removedComponents": [] @@ -536,166 +527,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 36 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 35 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 37 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, - { - "__id__": 43 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 39 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -707,7 +538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -722,7 +553,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -738,7 +569,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -753,7 +584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -772,14 +603,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 32 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -787,7 +618,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 46 + "__id__": 34 }, "targetOverrides": null }, @@ -801,28 +632,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 50 + "__id__": 38 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 52 + "__id__": 40 }, { - "__id__": 53 + "__id__": 41 }, { - "__id__": 55 + "__id__": 43 }, { - "__id__": 57 + "__id__": 45 } ], "removedComponents": [] @@ -830,7 +661,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_name" @@ -846,7 +677,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -861,7 +692,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -877,7 +708,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -892,7 +723,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lscale" @@ -907,7 +738,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 42 }, "propertyPath": [ "_color" @@ -930,7 +761,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 44 }, "propertyPath": [ "_color" @@ -953,7 +784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 46 }, "propertyPath": [ "_active" @@ -977,7 +808,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1005,7 +836,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 50 }, "anm": { "__id__": 14 @@ -1026,7 +857,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 52 }, "debugMode": false, "_id": "" @@ -1045,7 +876,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 54 }, "enabledContactListener": true, "bullet": false, @@ -1079,7 +910,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 56 }, "tag": 0, "_group": 4, @@ -1113,7 +944,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 58 }, "playOnLoad": false, "_clips": [], @@ -1137,10 +968,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 - }, - { - "__id__": 35 + "__id__": 32 }, { "__id__": 23 diff --git a/assets/resources/game/heros/mb2.prefab b/assets/resources/game/heros/mb2.prefab index 94a2a241..8675dbe9 100644 --- a/assets/resources/game/heros/mb2.prefab +++ b/assets/resources/game/heros/mb2.prefab @@ -28,35 +28,32 @@ "__id__": 23 }, { - "__id__": 35 - }, - { - "__id__": 44 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 47 }, { - "__id__": 61 + "__id__": 49 }, { - "__id__": 63 + "__id__": 51 }, { - "__id__": 65 + "__id__": 53 }, { - "__id__": 67 + "__id__": 55 }, { - "__id__": 69 + "__id__": 57 } ], "_prefab": { - "__id__": 71 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -486,10 +483,10 @@ "__id__": 23 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 25 }, @@ -497,7 +494,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -518,12 +515,6 @@ }, { "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 34 } ], "removedComponents": [] @@ -536,166 +527,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 36 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 35 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 37 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, - { - "__id__": 43 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 39 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -707,7 +538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -722,7 +553,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -738,7 +569,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -753,7 +584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -772,14 +603,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 32 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -787,7 +618,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 46 + "__id__": 34 }, "targetOverrides": null }, @@ -801,28 +632,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 50 + "__id__": 38 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 52 + "__id__": 40 }, { - "__id__": 53 + "__id__": 41 }, { - "__id__": 55 + "__id__": 43 }, { - "__id__": 57 + "__id__": 45 } ], "removedComponents": [] @@ -830,7 +661,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_name" @@ -846,7 +677,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -861,7 +692,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -877,7 +708,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -892,7 +723,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lscale" @@ -907,7 +738,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 42 }, "propertyPath": [ "_color" @@ -930,7 +761,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 44 }, "propertyPath": [ "_color" @@ -953,7 +784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 46 }, "propertyPath": [ "_active" @@ -977,7 +808,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1005,7 +836,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 50 }, "anm": { "__id__": 14 @@ -1026,7 +857,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 52 }, "debugMode": false, "_id": "" @@ -1045,7 +876,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 54 }, "enabledContactListener": true, "bullet": false, @@ -1079,7 +910,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 56 }, "tag": 0, "_group": 4, @@ -1113,7 +944,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 58 }, "playOnLoad": false, "_clips": [], @@ -1134,12 +965,10 @@ }, "fileId": "fdklpBwCBM/qJ4WFlQF3kT", "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 - }, - { - "__id__": 35 + "__id__": 32 }, { "__id__": 23 diff --git a/assets/resources/game/heros/mb3.prefab b/assets/resources/game/heros/mb3.prefab index dc5b4b8b..e0ef2810 100644 --- a/assets/resources/game/heros/mb3.prefab +++ b/assets/resources/game/heros/mb3.prefab @@ -28,35 +28,32 @@ "__id__": 23 }, { - "__id__": 35 - }, - { - "__id__": 44 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 47 }, { - "__id__": 61 + "__id__": 49 }, { - "__id__": 63 + "__id__": 51 }, { - "__id__": 65 + "__id__": 53 }, { - "__id__": 67 + "__id__": 55 }, { - "__id__": 69 + "__id__": 57 } ], "_prefab": { - "__id__": 71 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -483,10 +480,10 @@ "__id__": 23 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 25 }, @@ -494,7 +491,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -515,12 +512,6 @@ }, { "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 34 } ], "removedComponents": [] @@ -533,166 +524,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 36 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 35 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 37 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, - { - "__id__": 43 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 39 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -704,7 +535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -719,7 +550,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -735,7 +566,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -750,7 +581,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -769,14 +600,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 32 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -784,7 +615,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 46 + "__id__": 34 }, "targetOverrides": null }, @@ -798,28 +629,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 50 + "__id__": 38 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 52 + "__id__": 40 }, { - "__id__": 53 + "__id__": 41 }, { - "__id__": 55 + "__id__": 43 }, { - "__id__": 57 + "__id__": 45 } ], "removedComponents": [] @@ -827,7 +658,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_name" @@ -843,7 +674,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -858,7 +689,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -874,7 +705,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -889,7 +720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lscale" @@ -904,7 +735,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 42 }, "propertyPath": [ "_color" @@ -927,7 +758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 44 }, "propertyPath": [ "_color" @@ -950,7 +781,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 46 }, "propertyPath": [ "_active" @@ -974,7 +805,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1002,7 +833,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 50 }, "anm": { "__id__": 14 @@ -1023,7 +854,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 52 }, "debugMode": false, "_id": "" @@ -1042,7 +873,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 54 }, "enabledContactListener": true, "bullet": false, @@ -1076,7 +907,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 56 }, "tag": 0, "_group": 4, @@ -1110,7 +941,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 58 }, "playOnLoad": false, "_clips": [], @@ -1134,10 +965,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 - }, - { - "__id__": 35 + "__id__": 32 }, { "__id__": 23 diff --git a/assets/resources/game/heros/mb4.prefab b/assets/resources/game/heros/mb4.prefab index 8ecb0421..3787408a 100644 --- a/assets/resources/game/heros/mb4.prefab +++ b/assets/resources/game/heros/mb4.prefab @@ -28,35 +28,32 @@ "__id__": 23 }, { - "__id__": 35 - }, - { - "__id__": 44 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 47 }, { - "__id__": 61 + "__id__": 49 }, { - "__id__": 63 + "__id__": 51 }, { - "__id__": 65 + "__id__": 53 }, { - "__id__": 67 + "__id__": 55 }, { - "__id__": 69 + "__id__": 57 } ], "_prefab": { - "__id__": 71 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -486,10 +483,10 @@ "__id__": 23 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 25 }, @@ -497,7 +494,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -518,12 +515,6 @@ }, { "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 34 } ], "removedComponents": [] @@ -536,166 +527,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 36 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 35 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 37 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, - { - "__id__": 43 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 39 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -707,7 +538,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -722,7 +553,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -738,7 +569,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -753,7 +584,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -772,14 +603,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 32 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -787,7 +618,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 46 + "__id__": 34 }, "targetOverrides": null }, @@ -801,28 +632,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 50 + "__id__": 38 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 52 + "__id__": 40 }, { - "__id__": 53 + "__id__": 41 }, { - "__id__": 55 + "__id__": 43 }, { - "__id__": 57 + "__id__": 45 } ], "removedComponents": [] @@ -830,7 +661,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_name" @@ -846,7 +677,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -861,7 +692,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -877,7 +708,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -892,7 +723,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lscale" @@ -907,7 +738,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 42 }, "propertyPath": [ "_color" @@ -930,7 +761,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 44 }, "propertyPath": [ "_color" @@ -953,7 +784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 46 }, "propertyPath": [ "_active" @@ -977,7 +808,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1005,7 +836,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 50 }, "anm": { "__id__": 14 @@ -1026,7 +857,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 52 }, "debugMode": false, "_id": "" @@ -1045,7 +876,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 54 }, "enabledContactListener": true, "bullet": false, @@ -1079,7 +910,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 56 }, "tag": 0, "_group": 4, @@ -1113,7 +944,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 58 }, "playOnLoad": false, "_clips": [], @@ -1137,10 +968,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 - }, - { - "__id__": 35 + "__id__": 32 }, { "__id__": 23 diff --git a/assets/resources/game/heros/mb5.prefab b/assets/resources/game/heros/mb5.prefab index 2c2c30c3..f57ac661 100644 --- a/assets/resources/game/heros/mb5.prefab +++ b/assets/resources/game/heros/mb5.prefab @@ -28,35 +28,32 @@ "__id__": 23 }, { - "__id__": 35 - }, - { - "__id__": 44 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 47 }, { - "__id__": 61 + "__id__": 49 }, { - "__id__": 63 + "__id__": 51 }, { - "__id__": 65 + "__id__": 53 }, { - "__id__": 67 + "__id__": 55 }, { - "__id__": 69 + "__id__": 57 } ], "_prefab": { - "__id__": 71 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -483,10 +480,10 @@ "__id__": 23 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 25 }, @@ -494,7 +491,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -515,12 +512,6 @@ }, { "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 34 } ], "removedComponents": [] @@ -533,166 +524,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 36 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 35 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 37 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, - { - "__id__": 43 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 39 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -704,7 +535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -719,7 +550,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -735,7 +566,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -750,7 +581,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -769,14 +600,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 32 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -784,7 +615,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 46 + "__id__": 34 }, "targetOverrides": null }, @@ -798,28 +629,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 50 + "__id__": 38 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 52 + "__id__": 40 }, { - "__id__": 53 + "__id__": 41 }, { - "__id__": 55 + "__id__": 43 }, { - "__id__": 57 + "__id__": 45 } ], "removedComponents": [] @@ -827,7 +658,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_name" @@ -843,7 +674,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -858,7 +689,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -874,7 +705,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -889,7 +720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lscale" @@ -904,7 +735,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 42 }, "propertyPath": [ "_color" @@ -927,7 +758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 44 }, "propertyPath": [ "_color" @@ -950,7 +781,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 46 }, "propertyPath": [ "_active" @@ -974,7 +805,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1002,7 +833,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 50 }, "anm": { "__id__": 14 @@ -1023,7 +854,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 52 }, "debugMode": false, "_id": "" @@ -1042,7 +873,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 54 }, "enabledContactListener": true, "bullet": false, @@ -1076,7 +907,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 56 }, "tag": 0, "_group": 4, @@ -1110,7 +941,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 58 }, "playOnLoad": false, "_clips": [], @@ -1134,10 +965,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 - }, - { - "__id__": 35 + "__id__": 32 }, { "__id__": 23 diff --git a/assets/resources/game/heros/mb6.prefab b/assets/resources/game/heros/mb6.prefab index 8f96bb18..86f7c8ae 100644 --- a/assets/resources/game/heros/mb6.prefab +++ b/assets/resources/game/heros/mb6.prefab @@ -28,35 +28,32 @@ "__id__": 23 }, { - "__id__": 35 - }, - { - "__id__": 44 + "__id__": 32 } ], "_active": true, "_components": [ { - "__id__": 59 + "__id__": 47 }, { - "__id__": 61 + "__id__": 49 }, { - "__id__": 63 + "__id__": 51 }, { - "__id__": 65 + "__id__": 53 }, { - "__id__": 67 + "__id__": 55 }, { - "__id__": 69 + "__id__": 57 } ], "_prefab": { - "__id__": 71 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -483,10 +480,10 @@ "__id__": 23 }, "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { "__id__": 25 }, @@ -494,7 +491,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", + "fileId": "69IAw7dThHvIlVtTfXOVMZ", "prefabRootNode": { "__id__": 1 }, @@ -515,12 +512,6 @@ }, { "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 34 } ], "removedComponents": [] @@ -533,166 +524,6 @@ "propertyPath": [ "_name" ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 33 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 27 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 36 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 35 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 37 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, - { - "__id__": 43 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 39 - }, - "propertyPath": [ - "_name" - ], "value": "top" }, { @@ -704,7 +535,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lpos" @@ -719,7 +550,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lrot" @@ -735,7 +566,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_euler" @@ -750,7 +581,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 39 + "__id__": 27 }, "propertyPath": [ "_lscale" @@ -769,14 +600,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 45 + "__id__": 33 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 44 + "__id__": 32 }, "asset": { "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", @@ -784,7 +615,7 @@ }, "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { - "__id__": 46 + "__id__": 34 }, "targetOverrides": null }, @@ -798,28 +629,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 47 + "__id__": 35 }, { - "__id__": 49 + "__id__": 37 }, { - "__id__": 50 + "__id__": 38 }, { - "__id__": 51 + "__id__": 39 }, { - "__id__": 52 + "__id__": 40 }, { - "__id__": 53 + "__id__": 41 }, { - "__id__": 55 + "__id__": 43 }, { - "__id__": 57 + "__id__": 45 } ], "removedComponents": [] @@ -827,7 +658,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_name" @@ -843,7 +674,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lpos" @@ -858,7 +689,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lrot" @@ -874,7 +705,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_euler" @@ -889,7 +720,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 48 + "__id__": 36 }, "propertyPath": [ "_lscale" @@ -904,7 +735,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 54 + "__id__": 42 }, "propertyPath": [ "_color" @@ -927,7 +758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 56 + "__id__": 44 }, "propertyPath": [ "_color" @@ -950,7 +781,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 46 }, "propertyPath": [ "_active" @@ -974,7 +805,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1002,7 +833,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 50 }, "anm": { "__id__": 14 @@ -1023,7 +854,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 52 }, "debugMode": false, "_id": "" @@ -1042,7 +873,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 54 }, "enabledContactListener": true, "bullet": false, @@ -1076,7 +907,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 56 }, "tag": 0, "_group": 4, @@ -1110,7 +941,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 58 }, "playOnLoad": false, "_clips": [], @@ -1134,10 +965,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 44 - }, - { - "__id__": 35 + "__id__": 32 }, { "__id__": 23 diff --git a/assets/resources/game/skill/buff/maxb.prefab b/assets/resources/game/skill/buff/maxb.prefab index 8740e773..c3420a54 100644 --- a/assets/resources/game/skill/buff/maxb.prefab +++ b/assets/resources/game/skill/buff/maxb.prefab @@ -87,7 +87,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -37.784, + "y": -64.077, "z": 0 }, "_lrot": { @@ -100,7 +100,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": 1.2, - "y": 1.2, + "y": 2, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/skill/buff/maxr.prefab b/assets/resources/game/skill/buff/maxr.prefab index 0425dc0e..4d512ebf 100644 --- a/assets/resources/game/skill/buff/maxr.prefab +++ b/assets/resources/game/skill/buff/maxr.prefab @@ -87,7 +87,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -36.941, + "y": -63.469, "z": 0 }, "_lrot": { @@ -100,7 +100,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": 1.2, - "y": 1.2, + "y": 2, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/skill/buff/maxw.prefab b/assets/resources/game/skill/buff/maxw.prefab index 00987624..19c2ac87 100644 --- a/assets/resources/game/skill/buff/maxw.prefab +++ b/assets/resources/game/skill/buff/maxw.prefab @@ -87,7 +87,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -37.394, + "y": -63.7, "z": 0 }, "_lrot": { @@ -100,7 +100,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": 1.2, - "y": 1.2, + "y": 2, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/game/skill/buff/plus.prefab b/assets/resources/game/skill/buff/plus.prefab index 26624745..faaaa67b 100644 --- a/assets/resources/game/skill/buff/plus.prefab +++ b/assets/resources/game/skill/buff/plus.prefab @@ -140,7 +140,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -4.416, "z": 0 } }, diff --git a/assets/resources/game/skill/buff/plus2.prefab b/assets/resources/game/skill/buff/plus2.prefab index 8015b7b1..5b1ffac1 100644 --- a/assets/resources/game/skill/buff/plus2.prefab +++ b/assets/resources/game/skill/buff/plus2.prefab @@ -143,7 +143,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -4.784, "z": 0 } }, diff --git a/assets/resources/game/skill/buff/plus3.prefab b/assets/resources/game/skill/buff/plus3.prefab index 4f2a995e..82563282 100644 --- a/assets/resources/game/skill/buff/plus3.prefab +++ b/assets/resources/game/skill/buff/plus3.prefab @@ -143,7 +143,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -5.355, "z": 0 } }, diff --git a/assets/resources/game/skill/buff/plus4.prefab b/assets/resources/game/skill/buff/plus4.prefab index 2d00f2ae..9bea8ed5 100644 --- a/assets/resources/game/skill/buff/plus4.prefab +++ b/assets/resources/game/skill/buff/plus4.prefab @@ -143,7 +143,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -4.416, "z": 0 } }, diff --git a/assets/resources/game/skill/buff/plus5.prefab b/assets/resources/game/skill/buff/plus5.prefab index 56a91b95..82946e51 100644 --- a/assets/resources/game/skill/buff/plus5.prefab +++ b/assets/resources/game/skill/buff/plus5.prefab @@ -143,7 +143,7 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -4.416, "z": 0 } }, diff --git a/assets/resources/game/skill/buff/shielded.prefab b/assets/resources/game/skill/buff/shielded.prefab index 1eac2b6f..e32ff0a6 100644 --- a/assets/resources/game/skill/buff/shielded.prefab +++ b/assets/resources/game/skill/buff/shielded.prefab @@ -87,7 +87,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 35, + "y": 37.427, "z": 0 }, "_lrot": { @@ -127,8 +127,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 90, - "height": 90 + "width": 100, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2",